Skip to content

Commit c47f990

Browse files
Better documentation of CourseInstance and allow additionalAdmissionRestriction in Slot (#44)
1 parent 761a6ce commit c47f990

2 files changed

Lines changed: 16 additions & 12 deletions

File tree

OpenActive.NET/models/CourseInstance.cs

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -91,13 +91,20 @@ public override string ToString()
9191
[JsonConverter(typeof(ValuesConverter))]
9292
public new virtual string EndDate { get; set; }
9393

94+
/// <summary>
95+
/// The occurrences of this CourseInstance.
96+
/// </summary>
97+
[DataMember(Name = "subEvent", EmitDefaultValue = false, Order = 10)]
98+
[JsonConverter(typeof(ValuesConverter))]
99+
public override List<Event> SubEvent { get; set; }
100+
94101
/// <summary>
95102
/// [NOTICE: This is a beta property, and is highly likely to change in future versions of this library.]
96103
/// This course for which this is an offering.
97104
///
98105
/// If you are using this property, please join the discussion at proposal [#164](https://github.com/openactive/modelling-opportunity-data/issues/164).
99106
/// </summary>
100-
[DataMember(Name = "beta:course", EmitDefaultValue = false, Order = 1010)]
107+
[DataMember(Name = "beta:course", EmitDefaultValue = false, Order = 1011)]
101108
[JsonConverter(typeof(ValuesConverter))]
102109
public virtual Course Course { get; set; }
103110
}

OpenActive.NET/models/Slot.cs

Lines changed: 8 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -71,9 +71,6 @@ public override string ToString()
7171
[Obsolete("This property is disinherited in this type, and must not be used.", true)]
7272
public override List<Concept> Activity { get; set; }
7373

74-
[Obsolete("This property is disinherited in this type, and must not be used.", true)]
75-
public override List<string> AdditionalAdmissionRestriction { get; set; }
76-
7774
[Obsolete("This property is disinherited in this type, and must not be used.", true)]
7875
public override QuantitativeValue AgeRange { get; set; }
7976

@@ -97,7 +94,7 @@ public override string ToString()
9794
/// "duration": "PT1H"
9895
/// </code>
9996
/// </example>
100-
[DataMember(Name = "duration", EmitDefaultValue = false, Order = 19)]
97+
[DataMember(Name = "duration", EmitDefaultValue = false, Order = 18)]
10198
[JsonConverter(typeof(OpenActiveTimeSpanToISO8601DurationValuesConverter))]
10299
public override TimeSpan? Duration { get; set; }
103100

@@ -115,7 +112,7 @@ public override string ToString()
115112
/// "facilityUse": "https://example.com/facility-use/1"
116113
/// </code>
117114
/// </example>
118-
[DataMember(Name = "facilityUse", EmitDefaultValue = false, Order = 22)]
115+
[DataMember(Name = "facilityUse", EmitDefaultValue = false, Order = 21)]
119116
[JsonConverter(typeof(ValuesConverter))]
120117
public virtual ReferenceValue<FacilityUse> FacilityUse { get; set; }
121118

@@ -151,7 +148,7 @@ public override string ToString()
151148
/// "maximumUses": 16
152149
/// </code>
153150
/// </example>
154-
[DataMember(Name = "maximumUses", EmitDefaultValue = false, Order = 31)]
151+
[DataMember(Name = "maximumUses", EmitDefaultValue = false, Order = 30)]
155152
[JsonConverter(typeof(ValuesConverter))]
156153
public virtual long? MaximumUses { get; set; }
157154

@@ -176,7 +173,7 @@ public override string ToString()
176173
/// }
177174
/// </code>
178175
/// </example>
179-
[DataMember(Name = "offers", EmitDefaultValue = false, Order = 34)]
176+
[DataMember(Name = "offers", EmitDefaultValue = false, Order = 33)]
180177
[JsonConverter(typeof(ValuesConverter))]
181178
public override List<Offer> Offers { get; set; }
182179

@@ -194,7 +191,7 @@ public override string ToString()
194191
/// "remainingUses": 5
195192
/// </code>
196193
/// </example>
197-
[DataMember(Name = "remainingUses", EmitDefaultValue = false, Order = 37)]
194+
[DataMember(Name = "remainingUses", EmitDefaultValue = false, Order = 36)]
198195
[JsonConverter(typeof(ValuesConverter))]
199196
public virtual long? RemainingUses { get; set; }
200197

@@ -209,7 +206,7 @@ public override string ToString()
209206
/// "startDate": "2018-01-27T12:00:00Z"
210207
/// </code>
211208
/// </example>
212-
[DataMember(Name = "startDate", EmitDefaultValue = false, Order = 39)]
209+
[DataMember(Name = "startDate", EmitDefaultValue = false, Order = 38)]
213210
[JsonConverter(typeof(OpenActiveDateTimeOffsetToISO8601DateTimeValuesConverter))]
214211
public new virtual DateTimeOffset? StartDate { get; set; }
215212

@@ -222,7 +219,7 @@ public override string ToString()
222219
/// "endDate": "2018-01-27T12:00:00Z"
223220
/// </code>
224221
/// </example>
225-
[DataMember(Name = "endDate", EmitDefaultValue = false, Order = 40)]
222+
[DataMember(Name = "endDate", EmitDefaultValue = false, Order = 39)]
226223
[JsonConverter(typeof(OpenActiveDateTimeOffsetToISO8601DateTimeValuesConverter))]
227224
public new virtual DateTimeOffset? EndDate { get; set; }
228225

@@ -241,7 +238,7 @@ public override string ToString()
241238
///
242239
/// If you are using this property, please join the discussion at proposal [#110](https://github.com/openactive/modelling-opportunity-data/issues/110).
243240
/// </summary>
244-
[DataMember(Name = "beta:sportsActivityLocation", EmitDefaultValue = false, Order = 1044)]
241+
[DataMember(Name = "beta:sportsActivityLocation", EmitDefaultValue = false, Order = 1043)]
245242
[JsonConverter(typeof(ValuesConverter))]
246243
public override List<Schema.NET.SportsActivityLocation> SportsActivityLocation { get; set; }
247244
}

0 commit comments

Comments
 (0)