Places feed and Open Booking API support (#2)

Author: openactive-bot

OpenActive.DatasetSite.NET.Generator/package-lock.json

@@ -11,7 +11,7 @@
   "author": "Nick Evans",
   "license": "MIT",
   "dependencies": {
-    "@openactive/data-models": "^2.0.145",
+    "@openactive/data-models": "^2.0.285",
     "@openactive/dataset-site-template": "^1.0.2",
     "fs-extra": "^7.0.1",
     "sync-request": "^6.0.0"

OpenActive.DatasetSite.NET.Generator/package.json

@@ -130,15 +130,16 @@ public static string RenderSimpleDatasetSiteFromDataDownloads(DatasetSiteGenerat
                 {
                     Name = settings.PlatformName,
                     Url = settings.PlatformUrl,
-                    SoftwareVersion = settings.PlatformVersion
+                    SoftwareVersion = settings.PlatformVersion,
+                    HasCredential = settings.TestSuiteCertificateUrl
                 },
                 AccessService = settings.OpenBookingAPIBaseUrl == null ? null : new WebAPI
                 {
                     Name = "Open Booking API",
                     Description = $"API that allows for seamless booking experiences to be created for {dataFeedHumanisedList.ToLowerInvariant()} available from {settings.OrganisationName}",
                     Documentation = settings.OpenBookingAPIDocumentationUrl ?? new Uri("https://developer.openactive.io/go/open-booking-api"),
                     TermsOfService = settings.OpenBookingAPITermsOfServiceUrl,
-                    EndpointURL = settings.OpenBookingAPIBaseUrl,
+                    EndpointUrl = settings.OpenBookingAPIBaseUrl,
                     AuthenticationAuthority = settings.OpenBookingAPIAuthenticationAuthority,
                     ConformsTo = new List<Uri> { new Uri("https://openactive.io/open-booking-api/EditorsDraft/") },
                     EndpointDescription = new Uri("https://www.openactive.io/open-booking-api/EditorsDraft/swagger.json"),
@@ -176,8 +177,8 @@ public static string RenderDatasetSiteWithTemplate(Dataset dataset, string musta
             JObject jsonObj = JObject.Parse(jsonString);
 
             // Stringify the input JSON using formatting, and place the contents of the string
-            // within the "json" property at the root of the JSON itself.
-            jsonObj.Add("json", jsonObj.ToString(Formatting.Indented));
+            // within the "jsonld" property at the root of the JSON itself.
+            jsonObj.Add("jsonld", jsonObj.ToString(Formatting.Indented));
 
             //Use the resulting JSON with the mustache template to render the dataset site.
             var stubble = new StubbleBuilder().Configure(s => s.AddJsonNet()).Build();

OpenActive.DatasetSite.NET/DatasetSiteGenerator.cs

@@ -29,7 +29,7 @@
       <PrivateAssets>all</PrivateAssets>
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
-    <PackageReference Include="OpenActive.NET" Version="15.2.2" />
+    <PackageReference Include="OpenActive.NET" Version="15.2.17" />
     <PackageReference Include="Stubble.Core" Version="1.7.2" />
     <PackageReference Include="Stubble.Extensions.JsonNet.Net45" Version="1.3.3" />
     <PackageReference Include="Nerdbank.GitVersioning" Version="3.3.37">

OpenActive.DatasetSite.NET/OpenActive.DatasetSite.NET.csproj

@@ -20,7 +20,8 @@ public enum OpportunityType
         HeadlineEventSubEvent,
         Event,
         EventSeries,
-        OnDemandEvent
+        OnDemandEvent,
+        Place
     }
 
     public static class OpportunityTypes
@@ -184,10 +185,21 @@ public static class OpportunityTypes
                     Identifier = "OnDemandEvent",
                     Name = "OnDemandEvent",
                     SameAs = new Uri("https://schema.org/OnDemandEvent"),
-                    DefaultFeedPath = "/on-demand-event",
+                    DefaultFeedPath = "/on-demand-events",
                     Bookable = true,               
                     ThemeDisplayName = "On Demand Events"
                 }
+            },
+            {
+                OpportunityType.Place,
+                new OpportunityTypeConfiguration {
+                    Identifier = "Place",
+                    Name = "Place",
+                    SameAs = new Uri("https://schema.org/Place"),
+                    DefaultFeedPath = "/places",
+                    Bookable = false,               
+                    ThemeDisplayName = "Places"
+                }
             }
         };
     }

OpenActive.DatasetSite.NET/metadata/DatasetSiteMustacheTemplate.cs

@@ -113,5 +113,10 @@ public class DatasetSiteGeneratorSettings
         /// The Issuer URL of the OpenID Provider used to access the Open Booking API
         /// </summary>
         public Uri OpenBookingAPIAuthenticationAuthority { get; set; }
+
+        /// <summary>
+        /// The publicly accessible URL of an up-to-date OpenActive Test Suite Certificate for the implementation 
+        /// </summary>
+        public Uri TestSuiteCertificateUrl { get; set; }
     }
 }

OpenActive.DatasetSite.NET/metadata/OpportunityTypes.cs

@@ -1,6 +1,6 @@
 {
   "$schema": "https://raw.githubusercontent.com/dotnet/Nerdbank.GitVersioning/master/src/NerdBank.GitVersioning/version.schema.json",
-  "version": "4.2",
+  "version": "5.0",
   "publicReleaseRefSpec": [
     "^refs/heads/master$"
   ],