feat: Use env vars to override generated activity / facilityType (#198)

lukehesluke · web-flow · commit 1cbc00fb0526 · 2023-08-02T14:17:28.000+01:00
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/FacilitiesFeeds.cs
@@ -26,6 +26,9 @@ public AcmeFacilityUseRpdeGenerator(AppSettings appSettings, FakeBookingSystem f
 
         protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
             using (var db = _fakeBookingSystem.Database.Mem.Database.Open())
             {
                 var q = db.From<FacilityUseTable>()
@@ -93,8 +96,8 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                             FacilityType = new List<Concept> {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                    PrefLabel = "Squash Court",
+                                    Id = new Uri(facilityTypeId),
+                                    PrefLabel = facilityTypePrefLabel,
                                     InScheme = new Uri("https://openactive.io/facility-types")
                                 }
                             }
diff --git a/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetCore/Feeds/SessionsFeeds.cs
@@ -85,6 +85,9 @@ public AcmeSessionSeriesRpdeGenerator(AppSettings appSettings, FakeBookingSystem
 
         protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
+            var activityId = Environment.GetEnvironmentVariable("ACTIVITY_ID") ?? "https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83";
+            var activityPrefLabel = Environment.GetEnvironmentVariable("ACTIVITY_PREF_LABEL") ?? "Jet Skiing";
+
             using (var db = _fakeBookingSystem.Database.Mem.Database.Open())
             {
                 var q = db.From<ClassTable>()
@@ -178,8 +181,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                             {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83"),
-                                    PrefLabel = "Jet Skiing",
+                                    Id = new Uri(activityId),
+                                    PrefLabel = activityPrefLabel,
                                     InScheme = new Uri("https://openactive.io/activity-list")
                                 }
                             }
diff --git a/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetCore/Stores/FacilityStore.cs
@@ -288,6 +288,9 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
         protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerId (this is not required if using a Single Seller)
 
             // Additionally this method must check that there are enough spaces in each entry
@@ -343,8 +346,8 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                 FacilityType = new List<Concept> {
                                     new Concept
                                     {
-                                        Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                        PrefLabel = "Squash Court",
+                                        Id = new Uri(facilityTypeId),
+                                        PrefLabel = facilityTypePrefLabel,
                                         InScheme = new Uri("https://openactive.io/facility-types")
                                     }
                                 }
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/FacilitiesFeeds.cs
@@ -26,6 +26,9 @@ public AcmeFacilityUseRpdeGenerator(AppSettings appSettings, FakeBookingSystem f
 
         protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
             using (var db = _fakeBookingSystem.Database.Mem.Database.Open())
             {
                 var q = db.From<FacilityUseTable>()
@@ -93,8 +96,8 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af
                             FacilityType = new List<Concept> {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                    PrefLabel = "Squash Court",
+                                    Id = new Uri(facilityTypeId),
+                                    PrefLabel = facilityTypePrefLabel,
                                     InScheme = new Uri("https://openactive.io/facility-types")
                                 }
                             }
diff --git a/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs b/Examples/BookingSystem.AspNetFramework/Feeds/SessionsFeeds.cs
@@ -85,6 +85,9 @@ public AcmeSessionSeriesRpdeGenerator(AppSettings appSettings, FakeBookingSystem
 
         protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)
         {
+            var activityId = Environment.GetEnvironmentVariable("ACTIVITY_ID") ?? "https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83";
+            var activityPrefLabel = Environment.GetEnvironmentVariable("ACTIVITY_PREF_LABEL") ?? "Jet Skiing";
+
             using (var db = _fakeBookingSystem.Database.Mem.Database.Open())
             {
                 var q = db.From<ClassTable>()
@@ -178,8 +181,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?
                             {
                                 new Concept
                                 {
-                                    Id = new Uri("https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83"),
-                                    PrefLabel = "Jet Skiing",
+                                    Id = new Uri(activityId),
+                                    PrefLabel = activityPrefLabel,
                                     InScheme = new Uri("https://openactive.io/activity-list")
                                 }
                             }
diff --git a/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs b/Examples/BookingSystem.AspNetFramework/Stores/FacilityStore.cs
@@ -288,6 +288,9 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula
         // Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs
         protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)
         {
+            var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";
+            var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";
+
             // Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerId (this is not required if using a Single Seller)
 
             // Additionally this method must check that there are enough spaces in each entry
@@ -343,8 +346,8 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport
                                 FacilityType = new List<Concept> {
                                     new Concept
                                     {
-                                        Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),
-                                        PrefLabel = "Squash Court",
+                                        Id = new Uri(facilityTypeId),
+                                        PrefLabel = facilityTypePrefLabel,
                                         InScheme = new Uri("https://openactive.io/facility-types")
                                     }
                                 }

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,9 @@ public AcmeFacilityUseRpdeGenerator(AppSettings appSettings, FakeBookingSystem f`
`26`	`26`
`27`	`27`	`protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? afterTimestamp, long? afterId)`
`28`	`28`	`{`
	`29`	`+ var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";`
	`30`	`+ var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";`
	`31`	`+`
`29`	`32`	`using (var db = _fakeBookingSystem.Database.Mem.Database.Open())`
`30`	`33`	`{`
`31`	`34`	`var q = db.From<FacilityUseTable>()`
`@@ -93,8 +96,8 @@ protected override async Task<List<RpdeItem<FacilityUse>>> GetRpdeItems(long? af`
`93`	`96`	`FacilityType = new List<Concept> {`
`94`	`97`	`new Concept`
`95`	`98`	`{`
`96`		`- Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),`
`97`		`- PrefLabel = "Squash Court",`
	`99`	`+ Id = new Uri(facilityTypeId),`
	`100`	`+ PrefLabel = facilityTypePrefLabel,`
`98`	`101`	`InScheme = new Uri("https://openactive.io/facility-types")`
`99`	`102`	`}`
`100`	`103`	`}`
Original file line number	Diff line number	Diff line change
`@@ -85,6 +85,9 @@ public AcmeSessionSeriesRpdeGenerator(AppSettings appSettings, FakeBookingSystem`
`85`	`85`
`86`	`86`	`protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long? afterTimestamp, long? afterId)`
`87`	`87`	`{`
	`88`	`+ var activityId = Environment.GetEnvironmentVariable("ACTIVITY_ID") ?? "https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83";`
	`89`	`+ var activityPrefLabel = Environment.GetEnvironmentVariable("ACTIVITY_PREF_LABEL") ?? "Jet Skiing";`
	`90`	`+`
`88`	`91`	`using (var db = _fakeBookingSystem.Database.Mem.Database.Open())`
`89`	`92`	`{`
`90`	`93`	`var q = db.From<ClassTable>()`
`@@ -178,8 +181,8 @@ protected override async Task<List<RpdeItem<SessionSeries>>> GetRpdeItems(long?`
`178`	`181`	`{`
`179`	`182`	`new Concept`
`180`	`183`	`{`
`181`		`- Id = new Uri("https://openactive.io/activity-list#c07d63a0-8eb9-4602-8bcc-23be6deb8f83"),`
`182`		`- PrefLabel = "Jet Skiing",`
	`184`	`+ Id = new Uri(activityId),`
	`185`	`+ PrefLabel = activityPrefLabel,`
`183`	`186`	`InScheme = new Uri("https://openactive.io/activity-list")`
`184`	`187`	`}`
`185`	`188`	`}`
Original file line number	Diff line number	Diff line change
`@@ -288,6 +288,9 @@ protected override async Task TriggerTestAction(OpenBookingSimulateAction simula`
`288`	`288`	`// Similar to the RPDE logic, this needs to render and return an new hypothetical OrderItem from the database based on the supplied opportunity IDs`
`289`	`289`	`protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpportunity>> orderItemContexts, StoreBookingFlowContext flowContext, OrderStateContext stateContext)`
`290`	`290`	`{`
	`291`	`+ var facilityTypeId = Environment.GetEnvironmentVariable("FACILITY_TYPE_ID") ?? "https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651";`
	`292`	`+ var facilityTypePrefLabel = Environment.GetEnvironmentVariable("FACILITY_TYPE_PREF_LABEL") ?? "Squash Court";`
	`293`	`+`
`291`	`294`	`// Note the implementation of this method must also check that this OrderItem is from the Seller specified by context.SellerId (this is not required if using a Single Seller)`
`292`	`295`
`293`	`296`	`// Additionally this method must check that there are enough spaces in each entry`
`@@ -343,8 +346,8 @@ protected override async Task GetOrderItems(List<OrderItemContext<FacilityOpport`
`343`	`346`	`FacilityType = new List<Concept> {`
`344`	`347`	`new Concept`
`345`	`348`	`{`
`346`		`- Id = new Uri("https://openactive.io/facility-types#a1f82b7a-1258-4d9a-8dc5-bfc2ae961651"),`
`347`		`- PrefLabel = "Squash Court",`
	`349`	`+ Id = new Uri(facilityTypeId),`
	`350`	`+ PrefLabel = facilityTypePrefLabel,`
`348`	`351`	`InScheme = new Uri("https://openactive.io/facility-types")`
`349`	`352`	`}`
`350`	`353`	`}`