feat(model) : add regulator details in sas appointment message

csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.example.json

@@ -18,5 +18,11 @@
     "organization": {
         "organizationId": "334173748400020",
         "name": "SOS Médecins de Rennes"
+    },
+    "regulator": {
+        "regulatorId": "3620100057/70326SR",
+        "regulatorName": "Ricart",
+        "regulatorFirstname": "Pauline",
+        "regulatorEmail": "[email protected]"
     }
 }

csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.input.csv

@@ -20,3 +20,8 @@ Professionnel de santé,,,,,,Représente le professionnel de santé associé au
 Structure,,,,,,Représente la structure du PS ou la structure associée au rendez-vous si le PS n'est pas connu,,organization,0..1,X,organization,
 ,Identifiant national de la structure,,,,,Indique l'identifiant national de la structure,334173748400020,organizationId,1..1,,string,
 ,Nom de la structure,,,,,Indique le nom de la structure,SOS Médecins de Rennes,name,1..1,,string,
+Régulateur,,,,,,Représente le régulateur ayant pris le RDV,,regulator,1..1,X,regulator,
+,Identifiant régulateur,,,,,Identifiant du régulateur ayant pris le RDV,3620100057/70326SR,regulatorId,0..1,,string,
+,Nom du régulateur,,,,,Nom du régulateur ayant pris le RDV,Ricart,regulatorName,1..1,,string,
+,Prénom du régulateur,,,,,Prénom du régulateur ayant pris le RDV,Pauline,regulatorFirstname,1..1,,string,
+,Email du régulateur,,,,,Adresse mail du régulateur ayant pris le RDV,[email protected],regulatorEmail,1..1,,string,

csv_parser/out/RS-SAS-RDV/RS-SAS-RDV.uml_diagram

@@ -17,6 +17,13 @@ strict digraph {
                 <TR><TD  BORDER="0"><I>objet organization</I></TD></TR><TR><TD BORDER="0" >organizationId <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >name <I>string</I> : [1..1] </TD></TR>
                 </TABLE>>]
 	organization -> appointment [headlabel=1 taillabel="0..1"]
+	regulator [label=<<TABLE>
+                <TR>
+                <TD ><B>regulator</B></TD>
+                </TR>
+                <TR><TD  BORDER="0"><I>objet regulator</I></TD></TR><TR><TD BORDER="0" >regulatorId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >regulatorName <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >regulatorFirstname <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >regulatorEmail <I>string</I> : [1..1] </TD></TR>
+                </TABLE>>]
+	regulator -> appointment [headlabel=1 taillabel=1]
 	appointment [label=<<TABLE>
                 <TR>
                 <TD ><B>appointment</B></TD>

csv_parser/out/hubsante.asyncapi.yaml

@@ -7238,6 +7238,7 @@ components:
       - created
       - start
       - status
+      - regulator
       properties:
         appointmentId:
           type: string
@@ -7332,6 +7333,8 @@ components:
           $ref: '#/components/schemas/practitioner'
         organization:
           $ref: '#/components/schemas/organization'
+        regulator:
+          $ref: '#/components/schemas/regulator'
       additionalProperties: false
     practitioner:
       type: object
@@ -7449,6 +7452,59 @@ components:
       examples:
       - organizationId: '334173748400020'
         name: "SOS M\xE9decins de Rennes"
+    regulator:
+      type: object
+      title: "R\xE9gulateur"
+      x-display: expansion-panels
+      x-health-only: false
+      required:
+      - regulatorName
+      - regulatorFirstname
+      - regulatorEmail
+      properties:
+        regulatorId:
+          type: string
+          title: "Identifiant r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorId
+          description: "Identifiant du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - 3620100057/70326SR
+        regulatorName:
+          type: string
+          title: "Nom du r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorName
+          description: "Nom du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - Ricart
+        regulatorFirstname:
+          type: string
+          title: "Pr\xE9nom du r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorFirstname
+          description: "Pr\xE9nom du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - Pauline
+        regulatorEmail:
+          type: string
+          title: "Email du r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorEmail
+          description: "Adresse mail du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - [email protected]
+      additionalProperties: false
+      example: example.json#/regulator
+      examples:
+      - regulatorId: 3620100057/70326SR
+        regulatorName: Ricart
+        regulatorFirstname: Pauline
+        regulatorEmail: [email protected]
     error:
       $id: classpath:/json-schema/schema#
       x-id: RS-ERROR.schema.json#

generator/input/RS-SAS-RDV.openapi.yaml

@@ -20,6 +20,7 @@ components:
       - created
       - start
       - status
+      - regulator
       properties:
         appointmentId:
           type: string
@@ -114,6 +115,8 @@ components:
           $ref: '#/components/schemas/practitioner'
         organization:
           $ref: '#/components/schemas/organization'
+        regulator:
+          $ref: '#/components/schemas/regulator'
       additionalProperties: false
     practitioner:
       type: object
@@ -231,3 +234,56 @@ components:
       examples:
       - organizationId: '334173748400020'
         name: "SOS M\xE9decins de Rennes"
+    regulator:
+      type: object
+      title: "R\xE9gulateur"
+      x-display: expansion-panels
+      x-health-only: false
+      required:
+      - regulatorName
+      - regulatorFirstname
+      - regulatorEmail
+      properties:
+        regulatorId:
+          type: string
+          title: "Identifiant r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorId
+          description: "Identifiant du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - 3620100057/70326SR
+        regulatorName:
+          type: string
+          title: "Nom du r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorName
+          description: "Nom du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - Ricart
+        regulatorFirstname:
+          type: string
+          title: "Pr\xE9nom du r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorFirstname
+          description: "Pr\xE9nom du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - Pauline
+        regulatorEmail:
+          type: string
+          title: "Email du r\xE9gulateur"
+          x-health-only: false
+          x-cols: 6
+          example: example.json#/regulator/regulatorEmail
+          description: "Adresse mail du r\xE9gulateur ayant pris le RDV"
+          examples:
+          - [email protected]
+      additionalProperties: false
+      example: example.json#/regulator
+      examples:
+      - regulatorId: 3620100057/70326SR
+        regulatorName: Ricart
+        regulatorFirstname: Pauline
+        regulatorEmail: [email protected]

src/main/java/com/hubsante/model/sas/Appointment.java

@@ -36,6 +36,7 @@
 import com.fasterxml.jackson.dataformat.xml.annotation.*;
 import com.hubsante.model.sas.Organization;
 import com.hubsante.model.sas.Practitioner;
+import com.hubsante.model.sas.Regulator;
 import java.time.OffsetDateTime;
 import java.util.Arrays;
 import java.util.Arrays;
@@ -50,7 +51,8 @@
      Appointment.JSON_PROPERTY_END, Appointment.JSON_PROPERTY_STATUS,
      Appointment.JSON_PROPERTY_ORIENTATION_CATEGORY,
      Appointment.JSON_PROPERTY_PRACTITIONER,
-     Appointment.JSON_PROPERTY_ORGANIZATION})
+     Appointment.JSON_PROPERTY_ORGANIZATION,
+     Appointment.JSON_PROPERTY_REGULATOR})
 @JsonTypeName("appointment")
 @JsonInclude(JsonInclude.Include.NON_EMPTY)
 
@@ -198,6 +200,9 @@ public static OrientationCategoryEnum fromValue(String value) {
   public static final String JSON_PROPERTY_ORGANIZATION = "organization";
   private Organization organization;
 
+  public static final String JSON_PROPERTY_REGULATOR = "regulator";
+  private Regulator regulator;
+
   public Appointment() {}
 
   public Appointment appointmentId(String appointmentId) {
@@ -412,6 +417,29 @@ public void setOrganization(Organization organization) {
     this.organization = organization;
   }
 
+  public Appointment regulator(Regulator regulator) {
+
+    this.regulator = regulator;
+    return this;
+  }
+
+  /**
+   * Get regulator
+   * @return regulator
+   **/
+  @JsonProperty(JSON_PROPERTY_REGULATOR)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+
+  public Regulator getRegulator() {
+    return regulator;
+  }
+
+  @JsonProperty(JSON_PROPERTY_REGULATOR)
+  @JsonInclude(value = JsonInclude.Include.ALWAYS)
+  public void setRegulator(Regulator regulator) {
+    this.regulator = regulator;
+  }
+
   @Override
   public boolean equals(Object o) {
     if (this == o) {
@@ -430,13 +458,15 @@ public boolean equals(Object o) {
         Objects.equals(this.orientationCategory,
                        appointment.orientationCategory) &&
         Objects.equals(this.practitioner, appointment.practitioner) &&
-        Objects.equals(this.organization, appointment.organization);
+        Objects.equals(this.organization, appointment.organization) &&
+        Objects.equals(this.regulator, appointment.regulator);
   }
 
   @Override
   public int hashCode() {
     return Objects.hash(appointmentId, method, created, start, end, status,
-                        orientationCategory, practitioner, organization);
+                        orientationCategory, practitioner, organization,
+                        regulator);
   }
 
   @Override
@@ -460,6 +490,9 @@ public String toString() {
     sb.append("    organization: ")
         .append(toIndentedString(organization))
         .append("\n");
+    sb.append("    regulator: ")
+        .append(toIndentedString(regulator))
+        .append("\n");
     sb.append("}");
     return sb.toString();
   }