Merge pull request #48 from Clever/SYNC-2075-more-edits

SYNC-2075 More edits

Author: clever-saylor

full-v3.yml

@@ -321,7 +321,7 @@ paths:
   /resources/{id}/users:
     get:
       tags: ["Resources"]
-      description: Returns the contact, staff, student and/or teacher users for a resource
+      description: Returns the student and/or teacher users for a resource
       operationId: getUsersForResource
       parameters:
       - in: path
@@ -331,8 +331,6 @@ paths:
       - in: query
         name: role
         enum:
-        - "contact"
-        - "staff"
         - "student"
         - "teacher"
       - in: query
@@ -923,7 +921,7 @@ paths:
   /users/{id}/mystudents:
     get:
       tags: ["Users"]
-      description: Returns the student users for a teacher user
+      description: Returns the student users for a teacher or contact user
       operationId: getStudentsForUser
       parameters:
       - in: path
@@ -1270,16 +1268,6 @@ definitions:
       data:
         $ref: "#/definitions/User"
 
-  AdminName:
-    type: object
-    properties:
-      first:
-        type: string
-        x-nullable: true
-      last:
-        type: string
-        x-nullable: true
-
   Course:
     type: object
     properties:
@@ -1359,8 +1347,7 @@ definitions:
         items:
           type: string
       district_contact:
-        $ref: "#/definitions/DistrictAdmin"
-        x-nullable: true
+        type: string
         x-validation: true
 
   Location:
@@ -1701,7 +1688,7 @@ definitions:
   Contact:
     type: object
     properties:
-      id:
+      legacy_id:
         type: string
         x-validation: true
       phone:
@@ -1717,18 +1704,6 @@ definitions:
         - Work
         - Other
         - ""
-      relationship:
-        type: string
-        x-nullable: true
-        x-validation: true
-        enum:
-        - "Parent"
-        - "Grandparent"
-        - "Self"
-        - "Aunt/Uncle"
-        - "Sibling"
-        - "Other"
-        - ""
       sis_id:
         type: string
         x-nullable: true
@@ -1737,28 +1712,11 @@ definitions:
         x-validation: true
         items:
           $ref: "#/definitions/StudentRelationship"
-      students:
-        type: array
-        x-validation: true
-        items:
-          type: string
-      type:
-        type: string
-        x-nullable: true
-        x-validation: true
-        enum:
-        - "Parent/Guardian"
-        - "Emergency"
-        - "Primary"
-        - "Secondary"
-        - "Family"
-        - "Other"
-        - ""
 
   DistrictAdmin:
     type: object
     properties:
-      id:
+      legacy_id:
         type: string
         x-validation: true
       title:
@@ -1768,7 +1726,7 @@ definitions:
   Staff:
     type: object
     properties:
-      id:
+      legacy_id:
         type: string
         x-validation: true
       credentials:
@@ -1797,7 +1755,7 @@ definitions:
   Student:
     type: object
     properties:
-      id:
+      legacy_id:
         type: string
         x-validation: true
       created:
@@ -1976,7 +1934,7 @@ definitions:
   Teacher:
     type: object
     properties:
-      id:
+      legacy_id:
         type: string
         x-validation: true
       created:
@@ -1989,9 +1947,6 @@ definitions:
       district:
         type: string
         x-validation: true
-      email:
-        type: string
-        x-nullable: true
       last_modified:
         type: string
         format: datetime
@@ -2042,21 +1997,24 @@ definitions:
         x-validation: true
       name:
         $ref: "#/definitions/Name"
-      contact:
-        $ref: "#/definitions/Contact"
-        x-nullable: true
-      district_admin:
-        $ref: "#/definitions/DistrictAdmin"
-        x-nullable: true
-      staff:
-        $ref: "#/definitions/Staff"
-        x-nullable: true
-      student:
-        $ref: "#/definitions/Student"
-        x-nullable: true
-      teacher:
-        $ref: "#/definitions/Teacher"
-        x-nullable: true
+      roles:
+        type: object
+        additionalProperties:
+          contact:
+            $ref: '#/definitions/Contact'
+            x-nullable: true
+          district_admin:
+            $ref: '#/definitions/DistrictAdmin'
+            x-nullable: true
+          staff:
+            $ref: '#/definitions/Staff'
+            x-nullable: true
+          student:
+            $ref: '#/definitions/Student'
+            x-nullable: true
+          teacher:
+            $ref: '#/definitions/Teacher'
+            x-nullable: true
 
   CourseObject:
     type: object