[API] Adiciona arquivo da api do competifier

Api/Competifier.openapi.yaml

+openapi: 3.0.0
+info:
+  title: Competifier API
+  description: Competifier API
+  version: 0.1.0
+tags:
+  - name: competifier
+    description: Competifier operations
+  - name: assessments
+    description: Operations involving assessments
+paths:
+  /competifier/messages:
+    get:
+      tags:
+        - competifier
+      summary: Retrieves all messages from the competifier
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Message'
+  '/competifier/messages/{messageId}':
+    get:
+      tags:
+        - competifier
+      summary: Retrieves one message from a competifier
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Message'
+    patch:
+      tags:
+        - competifier
+      summary: Updates the message read state
+      description: The only attribute allowed to be altered is read
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/JsonPatch'
+        required: true
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Message'
+    parameters:
+      - name: messageId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  /preferences: {}
+  /assessments:
+    get:
+      tags:
+        - assessments
+      summary: Retrieves all assessments
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  oneOf:
+                    - $ref: '#/components/schemas/VirtualAssessment'
+                    - $ref: '#/components/schemas/HandmadeAssessment'
+  '/assessments/{assessmentId}':
+    get:
+      tags:
+        - assessments
+      summary: Retrives an Assessment
+      responses:
+        '200':
+          description: Successfully retrieved assessment
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/VirtualAssessment'
+                  - $ref: '#/components/schemas/HandmadeAssessment'
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  '/assessments/{assessmentId}/submissions':
+    get:
+      tags:
+        - assessments
+      summary: Retrives all submissions from an assessment
+      responses:
+        '200':
+          description: Successfully retrieved all submissions from an assessment
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/AssessmentSubmission'
+              examples:
+                Dummy Submissions:
+                  value: |-
+                    [
+                      {
+                        "answers": [
+                          {
+                            "choice": 0,
+                            "freeText": "",
+                            "question": 0
+                          }
+                        ],
+                        "assessment": 0,
+                        "finishedAt": "date-time",
+                        "lastUpdate": "date-time",
+                        "startedAt": "date-time",
+                        "status": 0,
+                        "type": 0,
+                        "uploadUri": ""
+                      }
+                    ]
+    post:
+      tags:
+        - assessments
+      summary: Creates or updates a submission from an assessment
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/AssessmentSubmission'
+            examples:
+              Dummy Submission Post:
+                value:
+                  answers:
+                    - choice: 0
+                      freeText: null
+                      question: 0
+                  assessment: 0
+                  finishedAt: date-time
+                  lastUpdate: date-time
+                  startedAt: date-time
+                  status: 0
+                  type: 0
+                  uploadUri: null
+        required: true
+      responses:
+        '200':
+          description: Successfully created the submission
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AssessmentSubmission'
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  '/assessments/{assessmentId}/submissions/{submissionId}':
+    get:
+      tags:
+        - assessments
+      summary: Retrieves a single submission from an assessment
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/AssessmentSubmission'
+              examples:
+                Dummy Submission:
+                  value:
+                    answers:
+                      - choice: 0
+                        freeText: null
+                        question: 0
+                    assessment: 0
+                    finishedAt: date-time
+                    lastUpdate: date-time
+                    startedAt: date-time
+                    status: 0
+                    type: 0
+                    uploadUri: null
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+      - name: submissionId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  '/assessments/{assessmentId}/questions':
+    get:
+      tags:
+          - assessments
+      summary: Retrives all questions from an assessment
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  oneOf:
+                  - $ref: '#/components/schemas/SubjectiveQuestion'
+                  - $ref: '#/components/schemas/ObjectiveQuestion'
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  '/assessments/{assessmentId}/questions/{questionId}':
+    get:
+      tags:
+        - assessments
+      summary: Retrieves single question from a given assessment
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                oneOf:
+                - $ref: '#/components/schemas/SubjectiveQuestion'
+                - $ref: '#/components/schemas/ObjectiveQuestion'
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+      - name: questionId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  '/assessments/{assessmentId}/drafts':
+    get:
+      tags:
+        - assessments
+      summary: Retrieves all drafts
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  oneOf:
+                    - $ref: '#/components/schemas/HandmadeAssessmentSubmission'
+                    - $ref: '#/components/schemas/VirtualAssessmentSubmission'
+    post:
+      tags:
+        - assessments
+      summary: Creates or overrides an existing draft
+      requestBody:
+        content:
+          application/json:
+            schema:
+              oneOf:
+                - $ref: '#/components/schemas/HandmadeAssessmentSubmission'
+                - $ref: '#/components/schemas/VirtualAssessmentSubmission'
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/HandmadeAssessmentSubmission'
+                  - $ref: '#/components/schemas/VirtualAssessmentSubmission'
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+  '/assessments/{assessmentId}/drafts/{draftId}':
+    parameters:
+      - name: assessmentId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+      - name: draftId
+        in: path
+        required: true
+        schema:
+          format: int32
+          type: integer
+    get:
+      tags:
+        - assessments
+      summary: Retrieves a draft
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/HandmadeAssessmentSubmission'
+                  - $ref: '#/components/schemas/VirtualAssessmentSubmission'
+  /competifier:
+    get:
+      tags:
+        - competifier
+      summary: Retrives competifier
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/SoloCompetifier'
+                  - $ref: '#/components/schemas/TeamCompetifier'
+    patch:
+      tags:
+        - competifier
+      summary: Updates competifier
+      description: All except password
+      requestBody:
+        content:
+          application/json:
+            schema:
+              $ref: '#/components/schemas/JsonPatch'
+        required: true
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                oneOf:
+                  - $ref: '#/components/schemas/SoloCompetifier'
+                  - $ref: '#/components/schemas/TeamCompetifier'
+  /competifier/participants:
+    get:
+      tags:
+        - competifier
+      summary: Retrives all participants from a competifier
+      description: only valid if the competifier is of type TEAM
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                type: array
+                items:
+                  $ref: '#/components/schemas/Participant'
+  '/competifier/participants/{participantId}':
+    get:
+      tags:
+        - competifier
+      summary: Retrieves a single participant from a competifier
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Participant'
+    patch:
+      tags:
+        - competifier
+      summary: Updates participant
+      requestBody:
+        content:
+          application/json:
+            schema:
+              type: array
+              items:
+                $ref: '#/components/schemas/JsonPatch'
+      responses:
+        '200':
+          description: ''
+          content:
+            application/json:
+              schema:
+                $ref: '#/components/schemas/Participant'
+    parameters:
+      - name: participantId
+        in: path
+        required: true
+        schema:
+          type: integer
+components:
+  schemas:
+    ScheduledEvent:
+      type: object
+      properties:
+        oid:
+          description: The object identification
+          type: integer
+        startsAt:
+          format: date-time
+          description: The time of the begining of the assessment
+          type: string
+        endsAt:
+          format: date-time
+          description: The time of the ending of the assessment
+          type: string
+    Assessment:
+      type: object
+      required:
+        - status
+        - type
+        - oid
+        - resultAvailable
+        - answerKeyAvailable
+        - locationType
+        - exam
+        - schedule
+      properties:
+        status:
+          description: '[PREP, SUBMISSION, EVALUATION]'
+          type: integer
+        type:
+          description: '[VIRTUAL, HANDMADE]'
+          type: integer
+        schedule:
+          $ref: '#/components/schemas/ScheduledEvent'
+        location:
+          description: Why the fuck is this a string?
+          type: string
+        exam:
+          $ref: '#/components/schemas/Exam'
+        oid:
+          description: Object identifier
+          type: integer
+        locationType:
+          type: integer
+          description: '[ONLINE, ON_SITE]'
+        resultAvailable:
+          description:
+            Boolean indicating if the result is already avialable to exhibition
+          type: boolean
+        answerKeyAvailable:
+          description:
+            Boolean indicating if the answerKey is already available to exhibition
+          type: boolean
+      discriminator:
+        propertyName: type
+        mapping:
+          0: '#/components/schemas/VirtualAssessment'
+          1: '#/components/schemas/HandmadeAssessment'
+    VirtualAssessment:
+      required:
+        - enforceSequence
+      allOf:
+        - $ref: '#/components/schemas/Assessment'
+        - type: object
+          properties:
+            enforceSequence:
+              type: boolean
+              description:
+                Boolean indicating if the assessment must be done in order
+    HandmadeAssessment:
+      required:
+      - submitterType
+      allOf:
+        - $ref: '#/components/schemas/Assessment'
+        - type: object
+          properties:
+            submitterType:
+              type: integer
+              description: '[ADMIN, ADMIN_OR_COMPETIFIER]'
+    QuestionGroup:
+      required:
+        - oid
+        - label
+        - weight
+      properties:
+        oid:
+          type: integer
+        label:
+          type: string
+        weight:
+          format: float
+          type: number
+    QuestionStatement:
+      required:
+        - oid
+        - content
+      properties:
+        oid:
+          type: integer
+        content:
+          type: string
+    Question:
+      required:
+        - type
+        - oid
+        - group
+        - order
+        - weight
+        - status
+      properties:
+        type:
+          description: Inheritance type identifcation
+          type: integer
+        statement:
+          $ref: '#/components/schemas/QuestionStatement'
+        oid:
+          description: object identifier of this Question
+          type: integer
+        group:
+          description: Group for which this given Question belongs in this Exam
+          type: integer
+        order:
+          description: Position of this Question in this Exam
+          type: integer
+        weight:
+          format: float
+          description: Weight associated with this Question
+          type: number
+        status:
+          description: '{ACTIVE, CANCELED}'
+          type: integer
+      discriminator:
+        propertyName: type
+        mapping:
+          0: '#/components/schemas/SubjectiveQuestion'
+          1: '#/components/schemas/ObjectiveQuestion'
+    SubjectiveQuestion:
+      required:
+        - answerKey
+      allOf:
+      - $ref: '#/components/schemas/Question'
+      - type: object
+        properties:
+          answerKey:
+            format: string
+            type: string
+    ObjectiveQuestion:
+      required:
+        - answerKey
+      allOf:
+      - $ref: '#/components/schemas/Question'
+      - type: object
+        properties:
+          alternatives:
+            type: array
+            items:
+              $ref: '#/components/schemas/Alternative'
+          answerKey:
+            format: int32
+            type: integer
+    Exam:
+      properties:
+        type:
+          description: '{SUBJECTIVE, OBJECTIVE}'
+          type: integer
+        label:
+          description: A name to the exam
+          type: string
+        cover:
+          description: An html to be embedded as cover
+          type: string
+        groups:
+          description: The possible QuestionGroup of this Exam
+          type: array
+          items:
+            $ref: '#/components/schemas/QuestionGroup'
+        questions:
+          description: All the ExamQuestions of this Exam
+          type: array
+          items:
+            $ref: '#/components/schemas/Question'
+        oid:
+          description: Object identifier
+          type: integer
+    Alternative:
+      title: Alternative
+      description: Alternative for a *ObjectiveQuestion*
+      type: object
+      properties:
+        order:
+          format: int32
+          title: order
+          description: position of this alternative to it's question
+          type: integer
+        statement:
+          title: statement
+          description: the alternative statement
+          type: string
+        oid:
+          format: int32
+          description: Object identifier
+          type: integer
+    AssessmentSubmission:
+      properties:
+        assessment:
+          description: The oid assessment that this submission refers to
+          type: integer
+        type:
+          description: '{VIRTUAL, HANDMADE}'
+          type: integer
+        lastUpdate:
+          format: date-time
+          description: Last time this submission was modified
+          type: string
+        competifier:
+          oneOf:
+            - $ref: '#/components/schemas/SoloCompetifier'
+            - $ref: '#/components/schemas/TeamCompetifier'
+      discriminator:
+        propertyName: type
+    HandmadeAssessmentSubmission:
+      allOf:
+        - $ref: '#/components/schemas/AssessmentSubmission'
+        - type: object
+          properties:
+            oloadUri:
+              type: string
+    VirtualAssessmentSubmission:
+      allOf:
+        - $ref: '#/components/schemas/AssessmentSubmission'
+        - type: object
+          properties:
+            startedAt:
+              type: string
+              format: date-time
+            finishedAt:
+              type: string
+              format: date-time
+            answers:
+              type: array
+              items:
+                $ref: '#/components/schemas/Answer'
+    Answer:
+      properties:
+        type:
+          type: integer
+        freeText:
+          type: string
+        choice:
+          type: integer
+        question:
+          type: integer
+    AssessmentSubmissionEvaluation:
+      properties:
+        timestamp:
+          type: integer
+        grades:
+          type: array
+          items:
+            $ref: '#/components/schemas/AnswerGrade'
+    AnswerGrade:
+      properties:
+        grade:
+          format: float
+          type: number
+        question:
+          $ref: '#/components/schemas/Question'
+    Competifier:
+      properties:
+        tags:
+          type: array
+          items:
+            $ref: '#/components/schemas/Tag'
+        type:
+          description: '[SOLO, TEAM]'
+          type: integer
+          enum:
+           - 0
+           - 1
+      discriminator:
+        propertyName: type
+    SoloCompetifier:
+      allOf:
+        - $ref: '#/components/schemas/Competifier'
+        - type: object
+          properties:
+            firstName:
+              type: string
+            lastName:
+              type: string
+    TeamCompetifier:
+      allOf:
+        - $ref: '#/components/schemas/Competifier'
+        - type: object
+          properties:
+            name:
+              type: string
+            leader:
+              $ref: '#/components/schemas/Participant'
+            participants:
+              type: array
+              items:
+                $ref: '#/components/schemas/Participant'
+    Tag:
+      properties:
+        label:
+          type: string
+        value:
+          type: string
+    Participant:
+      properties:
+        firstName:
+          type: string
+        lastName:
+          type: string
+        tags:
+          type: array
+          items:
+            $ref: '#/components/schemas/Tag'
+    JsonPatch:
+      title: Root Type for JsonPatch
+      description: The root of the JsonPatch type's schema.
+      required:
+        - op
+        - path
+      type: object
+      properties:
+        op:
+          description: >-
+            The PATCH operation to be performed. Available operations: "add",
+            "remove", "move", "copy", "replace", "test"
+          type: string
+        path:
+          description: The target location in the JSON
+          type: string
+        value:
+          description: The new value to be added or to replace the old value at the target
+        from:
+          description: The source to be copied/moved
+          type: string
+    VirtualAssessmentSubmissionDraft:
+      properties:
+        createdAt:
+          format: date-time
+          type: string
+        updatedAt:
+          format: date-time
+          type: string
+        content:
+          type: string
+        assessment:
+          format: int32
+          type: integer
+    Message:
+      properties:
+        timestamp:
+          format: date-time
+          type: string
+        title:
+          type: string
+        body:
+          type: string
+        read:
+          type: boolean
+    ExamQuestionComplaint:
+      properties:
+        timestamp:
+          format: date-time
+          type: string
+        text:
+          type: string
+        question:
+          $ref: '#/components/schemas/Question'
+    Competition:
+      properties:
+        name:
+          type: string
+        description:
+          type: string
+    Phase:
+      properties:
+        type:
+          description: '{CLASSIFICATORY, FINAL}'
+          type: integer
+          enum:
+            - 0
+            - 1
+        status:
+          description: '{PREP, ONGOING, EVALUATION, CLOSED}'
+          type: integer
+        assessment:
+          $ref: '#/components/schemas/Assessment'

uml/Competify.mdj

@@ -5498,7 +5498,7 @@
 											"containerChangeable": false,
 											"containerExtending": false,
 											"left": 149,
-											"top": 541,
+											"top": 493,
 											"width": 191,
 											"height": 13,
 											"autoResize": false,
@@ -5524,7 +5524,7 @@
 											"containerChangeable": false,
 											"containerExtending": false,
 											"left": 149,
-											"top": 556,
+											"top": 508,
 											"width": 191,
 											"height": 13,
 											"autoResize": false,
@@ -5550,7 +5550,7 @@
 											"containerChangeable": false,
 											"containerExtending": false,
 											"left": -192,
-											"top": -16,
+											"top": -112,
 											"width": 72,
 											"height": 13,
 											"autoResize": false,
@@ -5576,7 +5576,7 @@
 											"containerChangeable": false,
 											"containerExtending": false,
 											"left": 117,
-											"top": 571,
+											"top": 475,
 											"width": 191,
 											"height": 13,
 											"autoResize": false,
@@ -5596,7 +5596,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 144,
-									"top": 536,
+									"top": 488,
 									"width": 201,
 									"height": 38,
 									"autoResize": false,
@@ -5642,7 +5642,7 @@
 											"containerChangeable": false,
 											"containerExtending": false,
 											"left": 149,
-											"top": 579,
+											"top": 531,
 											"width": 191,
 											"height": 13,
 											"autoResize": false,
@@ -5663,7 +5663,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 144,
-									"top": 574,
+									"top": 526,
 									"width": 201,
 									"height": 23,
 									"autoResize": false
@@ -5687,7 +5687,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 144,
-									"top": 597,
+									"top": 549,
 									"width": 201,
 									"height": 10,
 									"autoResize": false
@@ -5711,7 +5711,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": -96,
-									"top": -8,
+									"top": -56,
 									"width": 10,
 									"height": 10,
 									"autoResize": false
@@ -5735,7 +5735,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": -96,
-									"top": -8,
+									"top": -56,
 									"width": 10,
 									"height": 10,
 									"autoResize": false
@@ -5751,7 +5751,7 @@
 							"containerChangeable": true,
 							"containerExtending": false,
 							"left": 144,
-							"top": 536,
+							"top": 488,
 							"width": 201,
 							"height": 71,
 							"autoResize": false,
@@ -5798,7 +5798,7 @@
 							"containerChangeable": false,
 							"containerExtending": false,
 							"left": 168,
-							"top": 608,
+							"top": 560,
 							"width": 145,
 							"height": 25,
 							"autoResize": false,
@@ -7346,7 +7346,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 81,
-									"top": 765,
+									"top": 749,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -7380,7 +7380,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 66,
-									"top": 765,
+									"top": 749,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -7414,7 +7414,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 111,
-									"top": 766,
+									"top": 750,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -7448,7 +7448,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 80,
-									"top": 776,
+									"top": 760,
 									"width": 67,
 									"height": 13,
 									"autoResize": false,
@@ -7483,7 +7483,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 131,
-									"top": 794,
+									"top": 778,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -7517,7 +7517,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 136,
-									"top": 753,
+									"top": 737,
 									"width": 5,
 									"height": 13,
 									"autoResize": false,
@@ -7656,7 +7656,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 0,
-									"top": 0,
+									"top": -16,
 									"width": 10,
 									"height": 10,
 									"autoResize": false
@@ -7680,7 +7680,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 0,
-									"top": 0,
+									"top": -16,
 									"width": 10,
 									"height": 10,
 									"autoResize": false
@@ -7702,7 +7702,7 @@
 								"$ref": "AAAAAAFjJ2eyuGypJss="
 							},
 							"lineStyle": 0,
-							"points": "160:772;96:772;96:221",
+							"points": "160:756;96:756;96:221",
 							"stereotypeDisplay": "label",
 							"showVisibility": true,
 							"showProperty": true,
@@ -8505,7 +8505,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 0,
-									"top": 0,
+									"top": 48,
 									"width": 10,
 									"height": 10,
 									"autoResize": false
@@ -8529,7 +8529,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 0,
-									"top": 0,
+									"top": 48,
 									"width": 10,
 									"height": 10,
 									"autoResize": false
@@ -8620,7 +8620,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 435,
-									"top": 417,
+									"top": 401,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -8654,7 +8654,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 435,
-									"top": 432,
+									"top": 416,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -8688,7 +8688,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 436,
-									"top": 387,
+									"top": 371,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -8722,7 +8722,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 590,
-									"top": 416,
+									"top": 400,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -8756,7 +8756,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 587,
-									"top": 430,
+									"top": 414,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -8790,7 +8790,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 592,
-									"top": 389,
+									"top": 373,
 									"width": 5,
 									"height": 13,
 									"autoResize": false,
@@ -8825,7 +8825,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 261,
-									"top": 416,
+									"top": 400,
 									"width": 40,
 									"height": 13,
 									"autoResize": false,
@@ -8860,7 +8860,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 284,
-									"top": 430,
+									"top": 414,
 									"width": 0,
 									"height": 13,
 									"autoResize": false,
@@ -8894,7 +8894,7 @@
 									"containerChangeable": false,
 									"containerExtending": false,
 									"left": 274,
-									"top": 389,
+									"top": 373,
 									"width": 7,
 									"height": 13,
 									"autoResize": false,
@@ -8975,7 +8975,7 @@
 								"$ref": "AAAAAAFjAgVLtICcfNY="
 							},
 							"lineStyle": 0,
-							"points": "616:408;256:408",
+							"points": "616:392;256:392",
 							"stereotypeDisplay": "label",
 							"showVisibility": true,
 							"showProperty": true,
@@ -9523,7 +9523,7 @@
 									"model": {
 										"$ref": "AAAAAAFjK2taCRxNiO0="
 									},
-									"visible": false,
+									"visible": true,
 									"enabled": true,
 									"lineColor": "#000000",
 									"fillColor": "#ffffff",
@@ -9532,9 +9532,9 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 525,
+									"left": 522,
 									"top": 238,
-									"width": 0,
+									"width": 7,
 									"height": 13,
 									"autoResize": false,
 									"alpha": -0.5235987755982988,
@@ -9544,6 +9544,7 @@
 									},
 									"edgePosition": 2,
 									"underline": false,
+									"text": "1",
 									"horizontalAlignment": 2,
 									"verticalAlignment": 5,
 									"wordWrap": false
@@ -9557,7 +9558,7 @@
 									"model": {
 										"$ref": "AAAAAAFjK2taChxObUw="
 									},
-									"visible": false,
+									"visible": true,
 									"enabled": true,
 									"lineColor": "#000000",
 									"fillColor": "#ffffff",
@@ -9566,18 +9567,19 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 786,
-									"top": 212,
-									"width": 0,
+									"left": 750,
+									"top": 207,
+									"width": 40,
 									"height": 13,
 									"autoResize": false,
-									"alpha": -0.5235987755982988,
-									"distance": 30,
+									"alpha": -0.9600704622163565,
+									"distance": 36.61966684720111,
 									"hostEdge": {
 										"$ref": "AAAAAAFjK2taCxxQDEA="
 									},
 									"edgePosition": 0,
 									"underline": false,
+									"text": "+cover",
 									"horizontalAlignment": 2,
 									"verticalAlignment": 5,
 									"wordWrap": false
@@ -9625,7 +9627,7 @@
 									"model": {
 										"$ref": "AAAAAAFjK2taChxObUw="
 									},
-									"visible": false,
+									"visible": true,
 									"enabled": true,
 									"lineColor": "#000000",
 									"fillColor": "#ffffff",
@@ -9634,9 +9636,9 @@
 									"showShadow": true,
 									"containerChangeable": false,
 									"containerExtending": false,
-									"left": 813,
+									"left": 810,
 									"top": 208,
-									"width": 0,
+									"width": 7,
 									"height": 13,
 									"autoResize": false,
 									"alpha": 0.5235987755982988,
@@ -9646,6 +9648,7 @@
 									},
 									"edgePosition": 0,
 									"underline": false,
+									"text": "1",
 									"horizontalAlignment": 2,
 									"verticalAlignment": 5,
 									"wordWrap": false
@@ -9939,7 +9942,7 @@
 											"height": 13,
 											"autoResize": false,
 											"underline": false,
-											"text": "+content",
+											"text": "+statement",
 											"horizontalAlignment": 0,
 											"verticalAlignment": 5,
 											"wordWrap": false
@@ -10498,6 +10501,430 @@
 							"headQualifiersCompartment": {
 								"$ref": "AAAAAAFjK7lt+DXCdOw="
 							}
+						},
+						{
+							"_type": "UMLAssociationView",
+							"_id": "AAAAAAFjLAB3jHRDc4Y=",
+							"_parent": {
+								"$ref": "AAAAAAFF+qBtyKM79qY="
+							},
+							"model": {
+								"$ref": "AAAAAAFjLAB3iHQ/EGo="
+							},
+							"subViews": [
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jXRE+1k=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHQ/EGo="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 438,
+									"top": 457,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 1.5707963267948966,
+									"distance": 15,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 1,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jXRFzwU=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHQ/EGo="
+									},
+									"visible": null,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 453,
+									"top": 457,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 1.5707963267948966,
+									"distance": 30,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 1,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jXRG7ug=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHQ/EGo="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 409,
+									"top": 458,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": -1.5707963267948966,
+									"distance": 15,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 1,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jXRHIho=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRA/Ic="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 590,
+									"top": 416,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 0.5235987755982988,
+									"distance": 30,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 2,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jnRIjlY=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRA/Ic="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 587,
+									"top": 430,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 0.7853981633974483,
+									"distance": 40,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 2,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jnRJsYA=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRA/Ic="
+									},
+									"visible": true,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 591,
+									"top": 389,
+									"width": 7,
+									"height": 13,
+									"autoResize": false,
+									"alpha": -0.5235987755982988,
+									"distance": 25,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 2,
+									"underline": false,
+									"text": "*",
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jnRKgTY=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRBiG0="
+									},
+									"visible": true,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 347,
+									"top": 528,
+									"width": 44,
+									"height": 13,
+									"autoResize": false,
+									"alpha": -0.5235987755982988,
+									"distance": 30,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 0,
+									"underline": false,
+									"text": "+status",
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jnRL3Kk=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRBiG0="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 372,
+									"top": 542,
+									"width": 0,
+									"height": 13,
+									"autoResize": false,
+									"alpha": -0.7853981633974483,
+									"distance": 40,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 0,
+									"underline": false,
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "EdgeLabelView",
+									"_id": "AAAAAAFjLAB3jnRMhdg=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRBiG0="
+									},
+									"visible": true,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 362,
+									"top": 501,
+									"width": 7,
+									"height": 13,
+									"autoResize": false,
+									"alpha": 0.5235987755982988,
+									"distance": 25,
+									"hostEdge": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"edgePosition": 0,
+									"underline": false,
+									"text": "1",
+									"horizontalAlignment": 2,
+									"verticalAlignment": 5,
+									"wordWrap": false
+								},
+								{
+									"_type": "UMLQualifierCompartmentView",
+									"_id": "AAAAAAFjLAB3jnRNmBU=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRA/Ic="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 0,
+									"top": 48,
+									"width": 10,
+									"height": 10,
+									"autoResize": false
+								},
+								{
+									"_type": "UMLQualifierCompartmentView",
+									"_id": "AAAAAAFjLAB3j3ROiYU=",
+									"_parent": {
+										"$ref": "AAAAAAFjLAB3jHRDc4Y="
+									},
+									"model": {
+										"$ref": "AAAAAAFjLAB3iHRBiG0="
+									},
+									"visible": false,
+									"enabled": true,
+									"lineColor": "#000000",
+									"fillColor": "#ffffff",
+									"fontColor": "#000000",
+									"font": "Arial;13;0",
+									"showShadow": true,
+									"containerChangeable": false,
+									"containerExtending": false,
+									"left": 0,
+									"top": 48,
+									"width": 10,
+									"height": 10,
+									"autoResize": false
+								}
+							],
+							"visible": true,
+							"enabled": true,
+							"lineColor": "#000000",
+							"fillColor": "#ffffff",
+							"fontColor": "#000000",
+							"font": "Arial;13;0",
+							"showShadow": true,
+							"containerChangeable": false,
+							"containerExtending": false,
+							"head": {
+								"$ref": "AAAAAAFjBIO2SxrbT0A="
+							},
+							"tail": {
+								"$ref": "AAAAAAFjAgVLtICcfNY="
+							},
+							"lineStyle": 0,
+							"points": "616:408;424:408;424:520;344:520",
+							"stereotypeDisplay": "label",
+							"showVisibility": true,
+							"showProperty": true,
+							"nameLabel": {
+								"$ref": "AAAAAAFjLAB3jXRE+1k="
+							},
+							"stereotypeLabel": {
+								"$ref": "AAAAAAFjLAB3jXRFzwU="
+							},
+							"propertyLabel": {
+								"$ref": "AAAAAAFjLAB3jXRG7ug="
+							},
+							"showMultiplicity": true,
+							"showType": true,
+							"tailRoleNameLabel": {
+								"$ref": "AAAAAAFjLAB3jXRHIho="
+							},
+							"tailPropertyLabel": {
+								"$ref": "AAAAAAFjLAB3jnRIjlY="
+							},
+							"tailMultiplicityLabel": {
+								"$ref": "AAAAAAFjLAB3jnRJsYA="
+							},
+							"headRoleNameLabel": {
+								"$ref": "AAAAAAFjLAB3jnRKgTY="
+							},
+							"headPropertyLabel": {
+								"$ref": "AAAAAAFjLAB3jnRL3Kk="
+							},
+							"headMultiplicityLabel": {
+								"$ref": "AAAAAAFjLAB3jnRMhdg="
+							},
+							"tailQualifiersCompartment": {
+								"$ref": "AAAAAAFjLAB3jnRNmBU="
+							},
+							"headQualifiersCompartment": {
+								"$ref": "AAAAAAFjLAB3j3ROiYU="
+							}
 						}
 					]
 				},
@@ -10671,6 +11098,7 @@
 								"visibility": "public",
 								"navigable": false,
 								"aggregation": "composite",
+								"multiplicity": "1",
 								"isReadOnly": false,
 								"isOrdered": false,
 								"isUnique": false,
@@ -10683,12 +11111,14 @@
 								"_parent": {
 									"$ref": "AAAAAAFjK2taCRxMSok="
 								},
+								"name": "cover",
 								"reference": {
 									"$ref": "AAAAAAFjK2sO8Bd2K+0="
 								},
 								"visibility": "public",
 								"navigable": true,
 								"aggregation": "none",
+								"multiplicity": "1",
 								"isReadOnly": false,
 								"isOrdered": false,
 								"isUnique": false,
@@ -10924,6 +11354,54 @@
 							},
 							"visibility": "public",
 							"isDerived": false
+						},
+						{
+							"_type": "UMLAssociation",
+							"_id": "AAAAAAFjLAB3iHQ/EGo=",
+							"_parent": {
+								"$ref": "AAAAAAFjAgVLs4CaxxE="
+							},
+							"end1": {
+								"_type": "UMLAssociationEnd",
+								"_id": "AAAAAAFjLAB3iHRA/Ic=",
+								"_parent": {
+									"$ref": "AAAAAAFjLAB3iHQ/EGo="
+								},
+								"reference": {
+									"$ref": "AAAAAAFjAgVLs4CaxxE="
+								},
+								"visibility": "public",
+								"navigable": false,
+								"aggregation": "none",
+								"multiplicity": "*",
+								"isReadOnly": false,
+								"isOrdered": false,
+								"isUnique": false,
+								"isDerived": false,
+								"isID": false
+							},
+							"end2": {
+								"_type": "UMLAssociationEnd",
+								"_id": "AAAAAAFjLAB3iHRBiG0=",
+								"_parent": {
+									"$ref": "AAAAAAFjLAB3iHQ/EGo="
+								},
+								"name": "status",
+								"reference": {
+									"$ref": "AAAAAAFjBIO2SBrZt0I="
+								},
+								"visibility": "public",
+								"navigable": true,
+								"aggregation": "none",
+								"multiplicity": "1",
+								"isReadOnly": false,
+								"isOrdered": false,
+								"isUnique": false,
+								"isDerived": false,
+								"isID": false
+							},
+							"visibility": "public",
+							"isDerived": false
 						}
 					],
 					"visibility": "public",