From 9c2b1b843d8e1d97c679f70ee9b1cef274a473d7 Mon Sep 17 00:00:00 2001 From: openactive-bot Date: Fri, 18 Aug 2023 15:03:23 +0000 Subject: [PATCH] Update data models --- OpenActive.NET/enums/PropertyEnumeration.cs | 36 +++++++++++++++++---- OpenActive.NET/models/Event.cs | 4 +-- OpenActive.NET/models/Place.cs | 31 ++++++++++++++---- 3 files changed, 57 insertions(+), 14 deletions(-) diff --git a/OpenActive.NET/enums/PropertyEnumeration.cs b/OpenActive.NET/enums/PropertyEnumeration.cs index 63a666a..71692ef 100644 --- a/OpenActive.NET/enums/PropertyEnumeration.cs +++ b/OpenActive.NET/enums/PropertyEnumeration.cs @@ -377,6 +377,8 @@ public enum PropertyEnumeration Artist, [EnumMember(Value = "https://schema.org/artworkSurface")] ArtworkSurface, + [EnumMember(Value = "https://schema.org/asin")] + Asin, [EnumMember(Value = "https://schema.org/aspect")] Aspect, [EnumMember(Value = "https://schema.org/assembly")] @@ -617,6 +619,8 @@ public enum PropertyEnumeration CheatCode, [EnumMember(Value = "https://schema.org/checkinTime")] CheckinTime, + [EnumMember(Value = "https://schema.org/checkoutPageURLTemplate")] + CheckoutPageURLTemplate, [EnumMember(Value = "https://schema.org/checkoutTime")] CheckoutTime, [EnumMember(Value = "https://schema.org/chemicalComposition")] @@ -695,8 +699,8 @@ public enum PropertyEnumeration ConfirmationNumber, [EnumMember(Value = "https://schema.org/connectedTo")] ConnectedTo, - [EnumMember(Value = "https://schema.org/constrainingProperty")] - ConstrainingProperty, + [EnumMember(Value = "https://schema.org/constraintProperty")] + ConstraintProperty, [EnumMember(Value = "https://schema.org/contactOption")] ContactOption, [EnumMember(Value = "https://schema.org/contactPoint")] @@ -771,6 +775,8 @@ public enum PropertyEnumeration CourseMode, [EnumMember(Value = "https://schema.org/coursePrerequisites")] CoursePrerequisites, + [EnumMember(Value = "https://schema.org/courseSchedule")] + CourseSchedule, [EnumMember(Value = "https://schema.org/courseWorkload")] CourseWorkload, [EnumMember(Value = "https://schema.org/coverageEndTime")] @@ -1791,8 +1797,12 @@ public enum PropertyEnumeration MealService, [EnumMember(Value = "https://schema.org/measuredProperty")] MeasuredProperty, - [EnumMember(Value = "https://schema.org/measuredValue")] - MeasuredValue, + [EnumMember(Value = "https://schema.org/measurementDenominator")] + MeasurementDenominator, + [EnumMember(Value = "https://schema.org/measurementMethod")] + MeasurementMethod, + [EnumMember(Value = "https://schema.org/measurementQualifier")] + MeasurementQualifier, [EnumMember(Value = "https://schema.org/measurementTechnique")] MeasurementTechnique, [EnumMember(Value = "https://schema.org/mechanismOfAction")] @@ -1847,6 +1857,8 @@ public enum PropertyEnumeration MinimumPaymentDue, [EnumMember(Value = "https://schema.org/missionCoveragePrioritiesPolicy")] MissionCoveragePrioritiesPolicy, + [EnumMember(Value = "https://schema.org/mobileUrl")] + MobileUrl, [EnumMember(Value = "https://schema.org/model")] Model, [EnumMember(Value = "https://schema.org/modelDate")] @@ -1971,10 +1983,12 @@ public enum PropertyEnumeration Nutrition, [EnumMember(Value = "https://schema.org/object")] Object, + [EnumMember(Value = "https://schema.org/observationAbout")] + ObservationAbout, [EnumMember(Value = "https://schema.org/observationDate")] ObservationDate, - [EnumMember(Value = "https://schema.org/observedNode")] - ObservedNode, + [EnumMember(Value = "https://schema.org/observationPeriod")] + ObservationPeriod, [EnumMember(Value = "https://schema.org/occupancy")] Occupancy, [EnumMember(Value = "https://schema.org/occupationLocation")] @@ -2595,6 +2609,8 @@ public enum PropertyEnumeration ShippingDetails, [EnumMember(Value = "https://schema.org/shippingLabel")] ShippingLabel, + [EnumMember(Value = "https://schema.org/shippingOrigin")] + ShippingOrigin, [EnumMember(Value = "https://schema.org/shippingRate")] ShippingRate, [EnumMember(Value = "https://schema.org/shippingSettingsLink")] @@ -2685,6 +2701,8 @@ public enum PropertyEnumeration StartOffset, [EnumMember(Value = "https://schema.org/startTime")] StartTime, + [EnumMember(Value = "https://schema.org/statType")] + StatType, [EnumMember(Value = "https://schema.org/status")] Status, [EnumMember(Value = "https://schema.org/steeringPosition")] @@ -2763,6 +2781,8 @@ public enum PropertyEnumeration SupportingData, [EnumMember(Value = "https://schema.org/surface")] Surface, + [EnumMember(Value = "https://schema.org/syllabusSections")] + SyllabusSections, [EnumMember(Value = "https://schema.org/target")] Target, [EnumMember(Value = "https://schema.org/targetCollection")] @@ -2843,6 +2863,8 @@ public enum PropertyEnumeration Tool, [EnumMember(Value = "https://schema.org/torque")] Torque, + [EnumMember(Value = "https://schema.org/totalHistoricalEnrollment")] + TotalHistoricalEnrollment, [EnumMember(Value = "https://schema.org/totalJobOpenings")] TotalJobOpenings, [EnumMember(Value = "https://schema.org/totalPaymentDue")] @@ -2893,6 +2915,8 @@ public enum PropertyEnumeration TrialDesign, [EnumMember(Value = "https://schema.org/tributary")] Tributary, + [EnumMember(Value = "https://schema.org/tripOrigin")] + TripOrigin, [EnumMember(Value = "https://schema.org/typeOfBed")] TypeOfBed, [EnumMember(Value = "https://schema.org/typeOfGood")] diff --git a/OpenActive.NET/models/Event.cs b/OpenActive.NET/models/Event.cs index ea71367..af3f520 100644 --- a/OpenActive.NET/models/Event.cs +++ b/OpenActive.NET/models/Event.cs @@ -529,7 +529,7 @@ public override string ToString() public virtual string SchedulingNote { get; set; } /// - /// The start date and time of the event. Can be specified as a schema:Date or schema:DateTime. + /// The start date and time of the event. Can be specified as a schema:DateTime. /// /// /// @@ -541,7 +541,7 @@ public override string ToString() public new virtual DateTimeValue StartDate { get; set; } /// - /// The end date and time of the event. Can be specified as a schema:Date or schema:DateTime + /// The end date and time of the event. Can be specified as a schema:DateTime /// It is recommended that publishers provide either an schema:endDate or a schema:duration for an event. /// /// diff --git a/OpenActive.NET/models/Place.cs b/OpenActive.NET/models/Place.cs index 5da8bb7..104f338 100644 --- a/OpenActive.NET/models/Place.cs +++ b/OpenActive.NET/models/Place.cs @@ -160,15 +160,34 @@ public override string ToString() public new virtual ReferenceValue ContainedInPlace { get; set; } /// - /// Places that exist within this place + /// A specific identifiable facility (`SportsActivityLocation`) or place (`Place`) that exist within this place /// /// /// - /// "containsPlace": { - /// "@type": "Place", - /// "url": "https://www.everyoneactive.com/centres/Center-Parcs-Sports-Plaza", - /// "name": "Center Parcs Sports Plaza" - /// } + /// "containsPlace": [ + /// { + /// "@type": "SportsActivityLocation", + /// "@id": "https://api.example.com/places/1402CBP20150217/sports-activity-locations/3", + /// "url": "https://www.better.org.uk/leisure-centre/manchester/belle-vue-sports-village/facilities", + /// "name": "Studio", + /// "description": "We have a great range of Fitness Classes at Belle Vue Leisure Centre including Group Cycle, Zumba, Pilates and much much more.", + /// "image": [ + /// { + /// "@type": "ImageObject", + /// "url": "https://res-1.cloudinary.com/gll/image/upload/c_fit,f_auto,h_169,w_384/v1592158966/production/0065/7/66/PHOTO-2020-06-09-14-25-53_3.jpg" + /// } + /// ], + /// "specialOpeningHoursSpecification": [ + /// { + /// "@type": "OpeningHoursSpecification", + /// "opens": "00:00", + /// "closes": "00:00", + /// "validFrom": "2022-01-01", + /// "validThrough": "2022-12-31" + /// } + /// ] + /// } + /// ] /// /// [DataMember(Name = "containsPlace", EmitDefaultValue = false, Order = 13)]