diff --git a/OpenActive.NET.Generator/package-lock.json b/OpenActive.NET.Generator/package-lock.json index 5e03a65..a19dd36 100644 --- a/OpenActive.NET.Generator/package-lock.json +++ b/OpenActive.NET.Generator/package-lock.json @@ -5,9 +5,9 @@ "requires": true, "dependencies": { "@openactive/data-models": { - "version": "2.0.170", - "resolved": "https://registry.npmjs.org/@openactive/data-models/-/data-models-2.0.170.tgz", - "integrity": "sha512-cnQ/KxZssKCS8s7j40P+hqUu7ugkj4nR2cIVGEMd7mCKM9u4LeFxKuz/lZUlXjE8UBtxR95TEGHP1FdKYO3D8A==" + "version": "2.0.174", + "resolved": "https://registry.npmjs.org/@openactive/data-models/-/data-models-2.0.174.tgz", + "integrity": "sha512-Qs4dDJEja8lfvE/CrECf9IroGrqbhotoqitvOUdJZlS6/AixguN23xlAZQS1R4JAiSQMtbCLAib3m5s39DqGsw==" }, "@types/concat-stream": { "version": "1.6.0", diff --git a/OpenActive.NET.Generator/package.json b/OpenActive.NET.Generator/package.json index e979563..11a72fa 100644 --- a/OpenActive.NET.Generator/package.json +++ b/OpenActive.NET.Generator/package.json @@ -11,7 +11,7 @@ "author": "Nick Evans", "license": "MIT", "dependencies": { - "@openactive/data-models": "^2.0.170", + "@openactive/data-models": "^2.0.174", "fs-extra": "^7.0.1", "sync-request": "^6.0.0" } diff --git a/OpenActive.NET/models/Course.cs b/OpenActive.NET/models/Course.cs index a8a2fe5..7193855 100644 --- a/OpenActive.NET/models/Course.cs +++ b/OpenActive.NET/models/Course.cs @@ -116,8 +116,8 @@ public override string ToString() /// /// /// "author": { - /// "name": "Central Speedball Association", /// "@type": "Organization", + /// "name": "Central Speedball Association", /// "url": "http://www.speedball-world.com" /// } /// diff --git a/OpenActive.NET/models/DataCatalog.cs b/OpenActive.NET/models/DataCatalog.cs index 52107a5..876e32e 100644 --- a/OpenActive.NET/models/DataCatalog.cs +++ b/OpenActive.NET/models/DataCatalog.cs @@ -134,8 +134,8 @@ public override string ToString() /// /// /// "publisher": { + /// "@type": "Organization", /// "name": "Central Speedball Association", - /// "type": "Organization", /// "url": "http://www.speedball-world.com" /// } /// diff --git a/OpenActive.NET/models/Dataset.cs b/OpenActive.NET/models/Dataset.cs index 932d9e3..2d14c80 100644 --- a/OpenActive.NET/models/Dataset.cs +++ b/OpenActive.NET/models/Dataset.cs @@ -229,8 +229,8 @@ public override string ToString() /// /// /// "publisher": { + /// "@type": "Organization", /// "name": "Central Speedball Association", - /// "type": "Organization", /// "url": "http://www.speedball-world.com" /// } /// diff --git a/OpenActive.NET/models/Event.cs b/OpenActive.NET/models/Event.cs index 0f4913e..c592db4 100644 --- a/OpenActive.NET/models/Event.cs +++ b/OpenActive.NET/models/Event.cs @@ -479,8 +479,8 @@ public override string ToString() /// /// /// "organizer": { - /// "name": "Central Speedball Association", /// "@type": "Organization", + /// "name": "Central Speedball Association", /// "url": "http://www.speedball-world.com" /// } /// diff --git a/OpenActive.NET/models/FacilityUse.cs b/OpenActive.NET/models/FacilityUse.cs index 8382b4c..ffca61f 100644 --- a/OpenActive.NET/models/FacilityUse.cs +++ b/OpenActive.NET/models/FacilityUse.cs @@ -315,8 +315,8 @@ public override string ToString() /// /// /// "provider": { - /// "name": "Central Speedball Association", /// "@type": "Organization", + /// "name": "Central Speedball Association", /// "url": "http://www.speedball-world.com" /// } /// diff --git a/OpenActive.NET/models/OrderItem.cs b/OpenActive.NET/models/OrderItem.cs index 01586ef..f35318b 100644 --- a/OpenActive.NET/models/OrderItem.cs +++ b/OpenActive.NET/models/OrderItem.cs @@ -55,10 +55,18 @@ public override string ToString() public new virtual Offer AcceptedOffer { get; set; } + /// + /// Channel through which the user can participate in the Opportunity. Not applicable for an OrderQuote. + /// + [DataMember(Name = "accessChannel", EmitDefaultValue = false, Order = 8)] + [JsonConverter(typeof(ValuesConverter))] + public virtual VirtualLocation AccessChannel { get; set; } + + /// /// PropertyValue that contains a text value usable for entrance. Not applicable for an OrderQuote. /// - [DataMember(Name = "accessCode", EmitDefaultValue = false, Order = 8)] + [DataMember(Name = "accessCode", EmitDefaultValue = false, Order = 9)] [JsonConverter(typeof(ValuesConverter))] public new virtual List AccessCode { get; set; } @@ -66,7 +74,7 @@ public override string ToString() /// /// ImageObject or Barcode that contains reference to an asset (e.g. Barcode, QR code image or PDF) usable for entrance. Not applicable for an OrderQuote. /// - [DataMember(Name = "accessPass", EmitDefaultValue = false, Order = 9)] + [DataMember(Name = "accessPass", EmitDefaultValue = false, Order = 10)] [JsonConverter(typeof(ValuesConverter))] public virtual List AccessPass { get; set; } @@ -74,39 +82,39 @@ public override string ToString() /// /// Whether the event can be cancelled. /// - [DataMember(Name = "allowCustomerCancellationFullRefund", EmitDefaultValue = false, Order = 10)] + [DataMember(Name = "allowCustomerCancellationFullRefund", EmitDefaultValue = false, Order = 11)] [JsonConverter(typeof(ValuesConverter))] public virtual bool? AllowCustomerCancellationFullRefund { get; set; } /// - /// + /// The person attending the Opportunity related to the OrderItem. /// - [DataMember(Name = "attendee", EmitDefaultValue = false, Order = 11)] + [DataMember(Name = "attendee", EmitDefaultValue = false, Order = 12)] [JsonConverter(typeof(ValuesConverter))] public new virtual Person Attendee { get; set; } /// - /// + /// The properties of `schema:Person` that are required to describe an `attendee` for this `OrderItem`. /// - [DataMember(Name = "attendeeDetailsRequired", EmitDefaultValue = false, Order = 12)] + [DataMember(Name = "attendeeDetailsRequired", EmitDefaultValue = false, Order = 13)] [JsonConverter(typeof(ValuesConverter))] public virtual List AttendeeDetailsRequired { get; set; } /// - /// A message set by the Seller in the event of Opportunity cancellation, only applicable for an Order and where the OrderItem has orderItemStatus set to https://openactive.io/SellerCancelled + /// A message set by the Seller in the event of Opportunity cancellation, only applicable for an `Order` and where the `OrderItem` has `orderItemStatus` set to `https://openactive.io/SellerCancelled` /// - [DataMember(Name = "cancellationMessage", EmitDefaultValue = false, Order = 13)] + [DataMember(Name = "cancellationMessage", EmitDefaultValue = false, Order = 14)] [JsonConverter(typeof(ValuesConverter))] public virtual string CancellationMessage { get; set; } /// - /// A message set by the Seller to trigger a notification to the Customer, only applicable for an Order and where the OrderItem has orderItemStatus set to https://openactive.io/OrderItemConfirmed or https://openactive.io/CustomerAttended + /// A message set by the Seller to trigger a notification to the Customer, only applicable for an `Order` and where the `OrderItem` has `orderItemStatus` set to `https://openactive.io/OrderItemConfirmed` or `https://openactive.io/CustomerAttended` /// - [DataMember(Name = "customerNotice", EmitDefaultValue = false, Order = 14)] + [DataMember(Name = "customerNotice", EmitDefaultValue = false, Order = 15)] [JsonConverter(typeof(ValuesConverter))] public virtual string CustomerNotice { get; set; } @@ -114,7 +122,7 @@ public override string ToString() /// /// Array of errors related to the OrderItem being included in the Order, only applicable for an OrderQuote. /// - [DataMember(Name = "error", EmitDefaultValue = false, Order = 15)] + [DataMember(Name = "error", EmitDefaultValue = false, Order = 16)] [JsonConverter(typeof(ValuesConverter))] public new virtual List Error { get; set; } @@ -122,7 +130,7 @@ public override string ToString() /// /// The specific bookable Thing that has been selected by the Customer. See the [Modelling-Opportunity-Data] for more information on these types. Note that the Broker Request and Orders feed only require id within these objects to be included; in these contexts, all other properties are ignored. /// - [DataMember(Name = "orderedItem", EmitDefaultValue = false, Order = 16)] + [DataMember(Name = "orderedItem", EmitDefaultValue = false, Order = 17)] [JsonConverter(typeof(ValuesConverter))] public new virtual Event OrderedItem { get; set; } @@ -130,7 +138,7 @@ public override string ToString() /// /// PropertyValueSpecifications that describe fields in the orderItemIntakeForm. /// - [DataMember(Name = "orderItemIntakeForm", EmitDefaultValue = false, Order = 17)] + [DataMember(Name = "orderItemIntakeForm", EmitDefaultValue = false, Order = 18)] [JsonConverter(typeof(ValuesConverter))] public virtual List OrderItemIntakeForm { get; set; } @@ -138,7 +146,7 @@ public override string ToString() /// /// PropertyValues that contains a text value responses to the orderItemIntakeForm. /// - [DataMember(Name = "orderItemIntakeFormResponse", EmitDefaultValue = false, Order = 18)] + [DataMember(Name = "orderItemIntakeFormResponse", EmitDefaultValue = false, Order = 19)] [JsonConverter(typeof(ValuesConverter))] public virtual List OrderItemIntakeFormResponse { get; set; } @@ -146,7 +154,7 @@ public override string ToString() /// /// /// - [DataMember(Name = "orderItemStatus", EmitDefaultValue = false, Order = 19)] + [DataMember(Name = "orderItemStatus", EmitDefaultValue = false, Order = 20)] [JsonConverter(typeof(ValuesConverter))] public new virtual OrderItemStatus? OrderItemStatus { get; set; } @@ -154,7 +162,7 @@ public override string ToString() /// /// An integer representing the order of OrderItems within the array. /// - [DataMember(Name = "position", EmitDefaultValue = false, Order = 20)] + [DataMember(Name = "position", EmitDefaultValue = false, Order = 21)] [JsonConverter(typeof(ValuesConverter))] public new virtual long? Position { get; set; } @@ -162,7 +170,7 @@ public override string ToString() /// /// Breakdown of tax payable for the OrderItem. /// - [DataMember(Name = "unitTaxSpecification", EmitDefaultValue = false, Order = 21)] + [DataMember(Name = "unitTaxSpecification", EmitDefaultValue = false, Order = 22)] [JsonConverter(typeof(ValuesConverter))] public virtual List UnitTaxSpecification { get; set; } diff --git a/OpenActive.NET/models/VirtualLocation.cs b/OpenActive.NET/models/VirtualLocation.cs index 2fdbd97..b7849eb 100644 --- a/OpenActive.NET/models/VirtualLocation.cs +++ b/OpenActive.NET/models/VirtualLocation.cs @@ -48,11 +48,11 @@ public override string ToString() /// - /// The name of the livestream. + /// The name of the service that is providing remote access to the Opportunity. /// /// /// - /// "name": "Zoom Room" + /// "name": "Zoom" /// /// [DataMember(Name = "name", EmitDefaultValue = false, Order = 7)] @@ -74,14 +74,40 @@ public override string ToString() /// - /// The URL for the livestream. + /// The password or pin required to access the `VirtualLocation` from any device, without requiring the URL, e.g. the meeting password. + /// + /// + /// + /// "accessCode": "211277" + /// + /// + [DataMember(Name = "accessCode", EmitDefaultValue = false, Order = 9)] + [JsonConverter(typeof(ValuesConverter))] + public virtual string AccessCode { get; set; } + + + /// + /// The identifier required to access the `VirtualLocation` from any device, without requiring the URL, e.g. the meeting ID. + /// + /// + /// + /// "accessId": "123456789" + /// + /// + [DataMember(Name = "accessId", EmitDefaultValue = false, Order = 10)] + [JsonConverter(typeof(ValuesConverter))] + public virtual string AccessId { get; set; } + + + /// + /// The URL that enables remote access to the Opportunity, which should include encoded access credentials where possible. /// /// /// /// "url": "https://zoom.us/room/3fbCs0GVjgQ" /// /// - [DataMember(Name = "url", EmitDefaultValue = false, Order = 9)] + [DataMember(Name = "url", EmitDefaultValue = false, Order = 11)] [JsonConverter(typeof(ValuesConverter))] public virtual Uri Url { get; set; }