feat: Fake places and simulation of a custom built system (#202)

nickevansuk · web-flow · commit 6564d5e3ad71 · 2023-08-02T08:56:05.000+01:00
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
@@ -88,23 +88,7 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                                 },
                                 IsOpenBookingAllowed = true,
                             },
-                            Location = new Place
-                            {
-                                Name = "Fake Pond",
-                                Address = new PostalAddress
-                                {
-                                    StreetAddress = "1 Fake Park",
-                                    AddressLocality = "Another town",
-                                    AddressRegion = "Oxfordshire",
-                                    PostalCode = "OX1 1AA",
-                                    AddressCountry = "GB"
-                                },
-                                Geo = new GeoCoordinates
-                                {
-                                    Latitude = result.Item1.LocationLat,
-                                    Longitude = result.Item1.LocationLng
-                                }
-                            },
+                            Location = _fakeBookingSystem.Database.GetPlaceById(result.Item1.PlaceId),
                             Url = new Uri("https://www.example.com/a-session-age"),
                             FacilityType = new List<Concept> {
                                 new Concept
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
@@ -171,40 +171,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                                     AllowCustomerCancellationFullRefund = result.Item1.AllowCustomerCancellationFullRefund
                                 }
                             },
-                            Location = result.Item1.AttendanceMode == AttendanceMode.Online ? null : new Place
-                            {
-                                Name = "Fake Pond",
-                                Address = new PostalAddress
-                                {
-                                    StreetAddress = "1 Fake Park",
-                                    AddressLocality = "Another town",
-                                    AddressRegion = "Oxfordshire",
-                                    PostalCode = "OX1 1AA",
-                                    AddressCountry = "GB"
-                                },
-                                Geo = new GeoCoordinates
-                                {
-                                    Latitude = result.Item1.LocationLat,
-                                    Longitude = result.Item1.LocationLng,
-                                }
-                            },
-                            AffiliatedLocation = result.Item1.AttendanceMode == AttendanceMode.Offline ? null : new Place
-                            {
-                                Name = "Fake Pond",
-                                Address = new PostalAddress
-                                {
-                                    StreetAddress = "1 Fake Park",
-                                    AddressLocality = "Another town",
-                                    AddressRegion = "Oxfordshire",
-                                    PostalCode = "OX1 1AA",
-                                    AddressCountry = "GB"
-                                },
-                                Geo = new GeoCoordinates
-                                {
-                                    Latitude = result.Item1.LocationLat,
-                                    Longitude = result.Item1.LocationLng,
-                                }
-                            },
+                            Location = result.Item1.AttendanceMode == AttendanceMode.Online ? null : _fakeBookingSystem.Database.GetPlaceById(result.Item1.PlaceId),
+                            AffiliatedLocation = result.Item1.AttendanceMode == AttendanceMode.Offline ? null : _fakeBookingSystem.Database.GetPlaceById(result.Item1.PlaceId),
                             Url = new Uri("https://www.example.com/a-session-age"),
                             Activity = new List<Concept>
                             {
diff --git a/Examples/BookingSystem.AspNetCore/Settings/AppSettings.cs b/Examples/BookingSystem.AspNetCore/Settings/AppSettings.cs
@@ -15,6 +15,7 @@ public class FeatureSettings
     {
         public bool EnableTokenAuth { get; set; } = true;
         public bool SingleSeller { get; set; } = false;
+        public bool CustomBuiltSystem { get; set; } = false;
         public bool PaymentReconciliationDetailValidation { get; set; } = true;
         public bool OnlyFreeOpportunities { get; set; } = false;
         public bool PrepaymentAlwaysRequired { get; set; } = false;
diff --git a/Examples/BookingSystem.AspNetCore/Settings/EngineConfig.cs b/Examples/BookingSystem.AspNetCore/Settings/EngineConfig.cs
@@ -176,9 +176,9 @@ public static StoreBookingEngine CreateStoreBookingEngine(AppSettings appSetting
                     OrganisationPlainTextDescription = "The Reference Implementation provides an example of an full conformant implementation of the OpenActive specifications.",
                     OrganisationLogoUrl = $"{appSettings.ApplicationHostBaseUrl}/images/placeholder-logo.png".ParseUrlOrNull(),
                     OrganisationEmail = "hello@example.com",
-                    PlatformName = "OpenActive Reference Implementation",
-                    PlatformUrl = "https://tutorials.openactive.io/open-booking-sdk/".ParseUrlOrNull(),
-                    PlatformVersion = "1.0",
+                    PlatformName = appSettings.FeatureFlags.CustomBuiltSystem ? null : "OpenActive Reference Implementation",
+                    PlatformUrl = appSettings.FeatureFlags.CustomBuiltSystem ? null : "https://tutorials.openactive.io/open-booking-sdk/".ParseUrlOrNull(),
+                    PlatformVersion = appSettings.FeatureFlags.CustomBuiltSystem ? null : "1.0",
                     BackgroundImageUrl = $"{appSettings.ApplicationHostBaseUrl}/images/placeholder-dataset-site-background.jpg".ParseUrlOrNull(),
                     DateFirstPublished = new DateTimeOffset(new DateTime(2019, 01, 14)),
                     OpenBookingAPIBaseUrl = $"{appSettings.ApplicationHostBaseUrl}/api/openbooking".ParseUrlOrNull(),
diff --git a/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
@@ -274,7 +274,7 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await _fakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
+                    if (!await _fakeBookingSystem.Database.UpdateFacilityUseLocationPlaceId(idComponents.SlotId.Value))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -339,15 +339,7 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                 }),
                                 Name = facility.Name,
                                 Url = new Uri("https://example.com/events/" + slot.FacilityUseId),
-                                Location = new Place
-                                {
-                                    Name = "Fake fitness studio",
-                                    Geo = new GeoCoordinates
-                                    {
-                                        Latitude = facility.LocationLat,
-                                        Longitude = facility.LocationLng,
-                                    }
-                                },
+                                Location = _fakeBookingSystem.Database.GetPlaceById(facility.PlaceId),
                                 FacilityType = new List<Concept> {
                                     new Concept
                                     {
diff --git a/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetCore/Stores/SessionStore.cs
@@ -295,7 +295,7 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await _fakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
+                    if (!await _fakeBookingSystem.Database.UpdateSessionSeriesLocationPlaceId(idComponents.ScheduledSessionId.Value))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
diff --git a/Examples/BookingSystem.AspNetCore/appsettings.single-seller.json b/Examples/BookingSystem.AspNetCore/appsettings.single-seller.json
@@ -1,6 +1,7 @@
 {
   "FeatureFlags": {
     "SingleSeller": true,
+    "CustomBuiltSystem": true,
     "EnableTokenAuth": false
   }
 }
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
@@ -88,23 +88,7 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                                 },
                                 IsOpenBookingAllowed = true,
                             },
-                            Location = new Place
-                            {
-                                Name = "Fake Pond",
-                                Address = new PostalAddress
-                                {
-                                    StreetAddress = "1 Fake Park",
-                                    AddressLocality = "Another town",
-                                    AddressRegion = "Oxfordshire",
-                                    PostalCode = "OX1 1AA",
-                                    AddressCountry = "GB"
-                                },
-                                Geo = new GeoCoordinates
-                                {
-                                    Latitude = result.Item1.LocationLat,
-                                    Longitude = result.Item1.LocationLng
-                                }
-                            },
+                            Location = _fakeBookingSystem.Database.GetPlaceById(result.Item1.PlaceId),
                             Url = new Uri("https://www.example.com/a-session-age"),
                             FacilityType = new List<Concept> {
                                 new Concept
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
@@ -171,40 +171,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                                     AllowCustomerCancellationFullRefund = result.Item1.AllowCustomerCancellationFullRefund
                                 }
                             },
-                            Location = result.Item1.AttendanceMode == AttendanceMode.Online ? null : new Place
-                            {
-                                Name = "Fake Pond",
-                                Address = new PostalAddress
-                                {
-                                    StreetAddress = "1 Fake Park",
-                                    AddressLocality = "Another town",
-                                    AddressRegion = "Oxfordshire",
-                                    PostalCode = "OX1 1AA",
-                                    AddressCountry = "GB"
-                                },
-                                Geo = new GeoCoordinates
-                                {
-                                    Latitude = result.Item1.LocationLat,
-                                    Longitude = result.Item1.LocationLng,
-                                }
-                            },
-                            AffiliatedLocation = result.Item1.AttendanceMode == AttendanceMode.Offline ? null : new Place
-                            {
-                                Name = "Fake Pond",
-                                Address = new PostalAddress
-                                {
-                                    StreetAddress = "1 Fake Park",
-                                    AddressLocality = "Another town",
-                                    AddressRegion = "Oxfordshire",
-                                    PostalCode = "OX1 1AA",
-                                    AddressCountry = "GB"
-                                },
-                                Geo = new GeoCoordinates
-                                {
-                                    Latitude = result.Item1.LocationLat,
-                                    Longitude = result.Item1.LocationLng,
-                                }
-                            },
+                            Location = result.Item1.AttendanceMode == AttendanceMode.Online ? null : _fakeBookingSystem.Database.GetPlaceById(result.Item1.PlaceId),
+                            AffiliatedLocation = result.Item1.AttendanceMode == AttendanceMode.Offline ? null : _fakeBookingSystem.Database.GetPlaceById(result.Item1.PlaceId),
                             Url = new Uri("https://www.example.com/a-session-age"),
                             Activity = new List<Concept>
                             {
diff --git a/Examples/BookingSystem.AspNetFramework/Settings/AppSettings.cs b/Examples/BookingSystem.AspNetFramework/Settings/AppSettings.cs
@@ -15,6 +15,7 @@ public class FeatureSettings
     {
         public bool EnableTokenAuth { get; set; } = true;
         public bool SingleSeller { get; set; } = false;
+        public bool CustomBuiltSystem { get; set; } = false;
         public bool PaymentReconciliationDetailValidation { get; set; } = true;
         public bool OnlyFreeOpportunities { get; set; } = false;
         public bool PrepaymentAlwaysRequired { get; set; } = false;
diff --git a/Examples/BookingSystem.AspNetFramework/Settings/EngineConfig.cs b/Examples/BookingSystem.AspNetFramework/Settings/EngineConfig.cs
@@ -176,9 +176,9 @@ public static StoreBookingEngine CreateStoreBookingEngine(AppSettings appSetting
                     OrganisationPlainTextDescription = "The Reference Implementation provides an example of an full conformant implementation of the OpenActive specifications.",
                     OrganisationLogoUrl = $"{appSettings.ApplicationHostBaseUrl}/images/placeholder-logo.png".ParseUrlOrNull(),
                     OrganisationEmail = "hello@example.com",
-                    PlatformName = "OpenActive Reference Implementation",
-                    PlatformUrl = "https://tutorials.openactive.io/open-booking-sdk/".ParseUrlOrNull(),
-                    PlatformVersion = "1.0",
+                    PlatformName = appSettings.FeatureFlags.CustomBuiltSystem ? null : "OpenActive Reference Implementation",
+                    PlatformUrl = appSettings.FeatureFlags.CustomBuiltSystem ? null : "https://tutorials.openactive.io/open-booking-sdk/".ParseUrlOrNull(),
+                    PlatformVersion = appSettings.FeatureFlags.CustomBuiltSystem ? null : "1.0",
                     BackgroundImageUrl = $"{appSettings.ApplicationHostBaseUrl}/images/placeholder-dataset-site-background.jpg".ParseUrlOrNull(),
                     DateFirstPublished = new DateTimeOffset(new DateTime(2019, 01, 14)),
                     OpenBookingAPIBaseUrl = $"{appSettings.ApplicationHostBaseUrl}/api/openbooking".ParseUrlOrNull(),
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
@@ -274,7 +274,7 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await _fakeBookingSystem.Database.UpdateFacilityUseLocationLatLng(idComponents.SlotId.Value, 0.2m, 0.3m))
+                    if (!await _fakeBookingSystem.Database.UpdateFacilityUseLocationPlaceId(idComponents.SlotId.Value))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
@@ -339,15 +339,7 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                 }),
                                 Name = facility.Name,
                                 Url = new Uri("https://example.com/events/" + slot.FacilityUseId),
-                                Location = new Place
-                                {
-                                    Name = "Fake fitness studio",
-                                    Geo = new GeoCoordinates
-                                    {
-                                        Latitude = facility.LocationLat,
-                                        Longitude = facility.LocationLng,
-                                    }
-                                },
+                                Location = _fakeBookingSystem.Database.GetPlaceById(facility.PlaceId),
                                 FacilityType = new List<Concept> {
                                     new Concept
                                     {
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/SessionStore.cs
@@ -295,7 +295,7 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
                     }
                     return;
                 case ChangeOfLogisticsLocationSimulateAction _:
-                    if (!await _fakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))
+                    if (!await _fakeBookingSystem.Database.UpdateSessionSeriesLocationPlaceId(idComponents.ScheduledSessionId.Value))
                     {
                         throw new OpenBookingException(new UnknownOpportunityError());
                     }
diff --git a/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs b/Fakes/OpenActive.FakeDatabase.NET/FakeBookingSystem.cs
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/ClassTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/ClassTable.cs
diff --git a/Fakes/OpenActive.FakeDatabase.NET/Models/FacilityUseTable.cs b/Fakes/OpenActive.FakeDatabase.NET/Models/FacilityUseTable.cs

Original file line number	Diff line number	Diff line change
`@@ -15,6 +15,7 @@ public class FeatureSettings`
`15`	`15`	`{`
`16`	`16`	`public bool EnableTokenAuth { get; set; } = true;`
`17`	`17`	`public bool SingleSeller { get; set; } = false;`
	`18`	`+ public bool CustomBuiltSystem { get; set; } = false;`
`18`	`19`	`public bool PaymentReconciliationDetailValidation { get; set; } = true;`
`19`	`20`	`public bool OnlyFreeOpportunities { get; set; } = false;`
`20`	`21`	`public bool PrepaymentAlwaysRequired { get; set; } = false;`
Original file line number	Diff line number	Diff line change
`@@ -295,7 +295,7 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula`
`295`	`295`	`}`
`296`	`296`	`return;`
`297`	`297`	`case ChangeOfLogisticsLocationSimulateAction _:`
`298`		`- if (!await _fakeBookingSystem.Database.UpdateSessionSeriesLocationLatLng(idComponents.ScheduledSessionId.Value, 0.2m, 0.3m))`
	`298`	`+ if (!await _fakeBookingSystem.Database.UpdateSessionSeriesLocationPlaceId(idComponents.ScheduledSessionId.Value))`
`299`	`299`	`{`
`300`	`300`	`throw new OpenBookingException(new UnknownOpportunityError());`
`301`	`301`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`{`
`2`	`2`	`"FeatureFlags": {`
`3`	`3`	`"SingleSeller": true,`
	`4`	`+ "CustomBuiltSystem": true,`
`4`	`5`	`"EnableTokenAuth": false`
`5`	`6`	`}`
`6`	`7`	`}`