Improve offerings

v5/schemas/ComponentOffering.yaml

@@ -1,10 +1,14 @@
 allOf:
-  - $ref: './Offering.yaml'
+  - $ref: './OfferingId.yaml'
   - type: object
     required:
       - startDateTime
       - endDateTime
     properties:
+      offeringType:
+        const: component
+        description: The type of this offering
+        example: component
       startDateTime:
         type: string
         description: The moment on which this offering starts, RFC3339 (date-time)
@@ -68,3 +72,4 @@ allOf:
             title: organizationId
           - $ref: './Organization.yaml'
             title: Organization object
+  - $ref: './OfferingProperties.yaml' 

v5/schemas/CourseOffering.yaml

@@ -1,10 +1,14 @@
 allOf:
-  - $ref: './Offering.yaml'
+  - $ref: './OfferingId.yaml'
   - type: object
     required:
       - startDate
       - endDate
     properties:
+      offeringType:
+        const: course
+        description: The type of this offering
+        example: course
       startDate:
         type: string
         description: The moment on which this offering starts, RFC3339 (full-date)
@@ -69,7 +73,8 @@ allOf:
           - $ref: './Identifier.yaml'
             title: organizationId
           - $ref: './Organization.yaml'
-            title: Organization object     
+            title: Organization object 
+  - $ref: './OfferingProperties.yaml'    
 
 
 

v5/schemas/OfferingProperties.yaml

@@ -15,14 +15,6 @@ properties:
       codeType: offeringCode
       code: INFOMQNM-20FS
     readOnly: true
-  offeringType:
-    type: string
-    description: The type of this offering
-    enum:
-      - program
-      - course
-      - component
-    example: component
   academicSession:
     description: |
       The academicsession during which this courseoffering takes place. [`expandable`](#tag/academic_session_model)

v5/schemas/ProgramOffering.yaml

@@ -1,10 +1,14 @@
 allOf:
-  - $ref: './Offering.yaml'
+  - $ref: './OfferingId.yaml'
   - type: object
     required:
       - startDate
       - endDate
     properties:
+      offeringType:
+        const: program
+        description: The type of this offering
+        example: program
       startDate:
         type: string
         description: The moment on which this offering starts, RFC3339 (full-date)
@@ -62,3 +66,4 @@ allOf:
             title: organizationId
           - $ref: './Organization.yaml'
             title: Organization object
+  - $ref: './OfferingProperties.yaml'

v5/spec.yaml

@@ -1,4 +1,4 @@
-openapi: "3.0.3"
+openapi: "3.1.0"
 info:
   version: "5.0.0"
   title: Open Education API