Modèle: remplacement du champ missionId par operationId dans le message RC-RI

csv_parser/out/RC-RI/RC-RI.example.json

@@ -5,7 +5,7 @@
             "datetime": "2022-09-27T08:23:34+02:00",
             "resourceId": "fr.health.samu770.resource.VLM250\nfr.health.samu440.resource.DRFR15DDXAAJJJ0000.1",
             "requestId": "fr.health.samu770.request.1249875\nfr.health.samu690.request.DRFR15690242370035.3",
-            "missionId": "DRFR15DDXAAJJJ0000.M001",
+            "operationId": "DRFR15DDXAAJJJ0000.M001",
             "orgId": "fr.health.samu440",
             "centerName": "CHU Nantes",
             "vehicleType": "SMUR",

csv_parser/out/RC-RI/RC-RI.input.csv

@@ -17,7 +17,7 @@ fr.health.samu440.resource.DRFR15DDXAAJJJ0000.1",resourceId,1..1,,string,"REGEX:
 OU - si un ID unique de la demande n'était pas disponible : 
 {OrgId émetteur}.request.{senderCaseId}.{numéro d’ordre chronologique}","fr.health.samu770.request.1249875
 fr.health.samu690.request.DRFR15690242370035.3",requestId,0..1,,string,"REGEX: ^([a-zA-Z0-9_-]+\.){3,8}request(\.[a-zA-Z0-9_-]+){1,2}$"
-,ID Mission local,,,,,"A valoriser avec le numéro de mission unique du central d’appel (PSAP, …) qui a déclenché le vecteur",DRFR15DDXAAJJJ0000.M001,missionId,0..1,,string,
+,ID Opération,,,,,"A valoriser avec le numéro d'opération unique du central d’appel (PSAP, …) qui a déclenché le vecteur",DRFR15DDXAAJJJ0000.M001,operationId,0..1,,string,
 ,ID Organisation propriétaire,,,,,"A valoriser avec l'identifiant de l'organisation à laquelle appartient la ressource, normé comme suit : 
 {pays}.{domaine}.{organisation}",fr.health.samu440,orgId,0..1,,string,
 ,Nom du centre d’affectation,,,,,A valoriser avec le lieu de garage principal,CHU Nantes,centerName,0..1,,string,

csv_parser/out/RC-RI/RC-RI.uml_diagram

@@ -42,7 +42,7 @@ strict digraph {
                 <TR>
                 <TD ><B>resource</B></TD>
                 </TR>
-                <TR><TD  BORDER="0"><I>objet resource</I></TD></TR><TR><TD BORDER="0" >datetime <I>date-time</I> : [1..1] </TD></TR><TR><TD BORDER="0" >resourceId <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >requestId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >missionId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >orgId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >centerName <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >vehicleType <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >name <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >centerCity <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >freetext <I>string</I> : [0..*] </TD></TR>
+                <TR><TD  BORDER="0"><I>objet resource</I></TD></TR><TR><TD BORDER="0" >datetime <I>date-time</I> : [1..1] </TD></TR><TR><TD BORDER="0" >resourceId <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >requestId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >operationId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >orgId <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >centerName <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >vehicleType <I>string</I> : [1..1] </TD></TR><TR><TD BORDER="0" >name <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >centerCity <I>string</I> : [0..1] </TD></TR><TR><TD BORDER="0" >freetext <I>string</I> : [0..*] </TD></TR>
                 </TABLE>>]
 	resource -> resourcesInfoCisu [headlabel=1 taillabel="1..*"]
 	resourcesInfoCisu [label=<<TABLE>

generator/input/RC-RI.openapi.yaml

@@ -99,13 +99,13 @@ components:
           - 'fr.health.samu770.request.1249875
 
             fr.health.samu690.request.DRFR15690242370035.3'
-        missionId:
+        operationId:
           type: string
-          title: ID Mission local
+          title: "ID Op\xE9ration"
           x-health-only: false
           x-cols: 6
-          example: example.json#/resource/0/missionId
-          description: "A valoriser avec le num\xE9ro de mission unique du central\
+          example: example.json#/resource/0/operationId
+          description: "A valoriser avec le num\xE9ro d'op\xE9ration unique du central\
             \ d\u2019appel (PSAP, \u2026) qui a d\xE9clench\xE9 le vecteur"
           examples:
           - DRFR15DDXAAJJJ0000.M001

src/main/java/com/hubsante/model/cisu/resources/info/Resource.java

@@ -50,7 +50,7 @@
  */
 @JsonPropertyOrder(
     {Resource.JSON_PROPERTY_DATETIME, Resource.JSON_PROPERTY_RESOURCE_ID,
-     Resource.JSON_PROPERTY_REQUEST_ID, Resource.JSON_PROPERTY_MISSION_ID,
+     Resource.JSON_PROPERTY_REQUEST_ID, Resource.JSON_PROPERTY_OPERATION_ID,
      Resource.JSON_PROPERTY_ORG_ID, Resource.JSON_PROPERTY_CENTER_NAME,
      Resource.JSON_PROPERTY_VEHICLE_TYPE, Resource.JSON_PROPERTY_NAME,
      Resource.JSON_PROPERTY_CENTER_CITY, Resource.JSON_PROPERTY_TEAM,
@@ -69,8 +69,8 @@ public class Resource {
   public static final String JSON_PROPERTY_REQUEST_ID = "requestId";
   private String requestId;
 
-  public static final String JSON_PROPERTY_MISSION_ID = "missionId";
-  private String missionId;
+  public static final String JSON_PROPERTY_OPERATION_ID = "operationId";
+  private String operationId;
 
   public static final String JSON_PROPERTY_ORG_ID = "orgId";
   private String orgId;
@@ -215,28 +215,28 @@ public void setRequestId(String requestId) {
     this.requestId = requestId;
   }
 
-  public Resource missionId(String missionId) {
+  public Resource operationId(String operationId) {
 
-    this.missionId = missionId;
+    this.operationId = operationId;
     return this;
   }
 
   /**
-   * A valoriser avec le numéro de mission unique du central d’appel (PSAP, …)
-   *qui a déclenché le vecteur
-   * @return missionId
+   * A valoriser avec le numéro d'opération unique du central d’appel (PSAP,
+   *…) qui a déclenché le vecteur
+   * @return operationId
    **/
-  @JsonProperty(JSON_PROPERTY_MISSION_ID)
+  @JsonProperty(JSON_PROPERTY_OPERATION_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
 
-  public String getMissionId() {
-    return missionId;
+  public String getOperationId() {
+    return operationId;
   }
 
-  @JsonProperty(JSON_PROPERTY_MISSION_ID)
+  @JsonProperty(JSON_PROPERTY_OPERATION_ID)
   @JsonInclude(value = JsonInclude.Include.USE_DEFAULTS)
-  public void setMissionId(String missionId) {
-    this.missionId = missionId;
+  public void setOperationId(String operationId) {
+    this.operationId = operationId;
   }
 
   public Resource orgId(String orgId) {
@@ -499,7 +499,7 @@ public boolean equals(Object o) {
     return Objects.equals(this.datetime, resource.datetime) &&
         Objects.equals(this.resourceId, resource.resourceId) &&
         Objects.equals(this.requestId, resource.requestId) &&
-        Objects.equals(this.missionId, resource.missionId) &&
+        Objects.equals(this.operationId, resource.operationId) &&
         Objects.equals(this.orgId, resource.orgId) &&
         Objects.equals(this.centerName, resource.centerName) &&
         Objects.equals(this.vehicleType, resource.vehicleType) &&
@@ -514,7 +514,7 @@ public boolean equals(Object o) {
 
   @Override
   public int hashCode() {
-    return Objects.hash(datetime, resourceId, requestId, missionId, orgId,
+    return Objects.hash(datetime, resourceId, requestId, operationId, orgId,
                         centerName, vehicleType, name, centerCity, team, state,
                         position, contact, freetext);
   }
@@ -530,8 +530,8 @@ public String toString() {
     sb.append("    requestId: ")
         .append(toIndentedString(requestId))
         .append("\n");
-    sb.append("    missionId: ")
-        .append(toIndentedString(missionId))
+    sb.append("    operationId: ")
+        .append(toIndentedString(operationId))
         .append("\n");
     sb.append("    orgId: ").append(toIndentedString(orgId)).append("\n");
     sb.append("    centerName: ")

src/main/resources/json-schema/EMSI.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "EMSI.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "emsi",

src/main/resources/json-schema/GEO-POS.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "GEO-POS.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "geoPositionsUpdate",

src/main/resources/json-schema/GEO-REQ.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "GEO-REQ.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "geoResourcesRequest",

src/main/resources/json-schema/GEO-RES.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "GEO-RES.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "geoResourcesDetails",

src/main/resources/json-schema/RC-DE.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-DE.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "distributionElement",

src/main/resources/json-schema/RC-EDA.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-EDA.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "createCase",

src/main/resources/json-schema/RC-REF.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-REF.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "reference",

src/main/resources/json-schema/RC-RI.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RC-RI.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesInfoCisu",
@@ -69,13 +69,13 @@
                     "description": "A valoriser avec l'identifiant unique partagé de la demande de ressource (si la ressource a été engagée suite à une demande de ressource), normé comme suit :\n{orgID}.request.{ID unique de la demande dans le système émetteur}\nOU - si un ID unique de la demande n'était pas disponible : \n{OrgId émetteur}.request.{senderCaseId}.{numéro d’ordre chronologique}",
                     "pattern": "^([a-zA-Z0-9_-]+\\.){3,8}request(\\.[a-zA-Z0-9_-]+){1,2}$"
                 },
-                "missionId": {
+                "operationId": {
                     "type": "string",
-                    "title": "ID Mission local",
+                    "title": "ID Opération",
                     "x-health-only": false,
                     "x-cols": 6,
-                    "example": "example.json#/resource/0/missionId",
-                    "description": "A valoriser avec le numéro de mission unique du central d’appel (PSAP, …) qui a déclenché le vecteur"
+                    "example": "example.json#/resource/0/operationId",
+                    "description": "A valoriser avec le numéro d'opération unique du central d’appel (PSAP, …) qui a déclenché le vecteur"
                 },
                 "orgId": {
                     "type": "string",

src/main/resources/json-schema/RS-BPV.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-BPV.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "interventionReport",

src/main/resources/json-schema/RS-DR.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-DR.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesRequest",

src/main/resources/json-schema/RS-EDA-MAJ.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-EDA-MAJ.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "createCaseHealthUpdate",

src/main/resources/json-schema/RS-EDA.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-EDA.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "createCaseHealth",

src/main/resources/json-schema/RS-ER.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-ER.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesEngagement",

src/main/resources/json-schema/RS-ERROR.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-ERROR.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "error",

src/main/resources/json-schema/RS-RI.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-RI.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesInfo",

src/main/resources/json-schema/RS-RPIS.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-RPIS.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "rpis",

src/main/resources/json-schema/RS-RR.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-RR.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesResponse",

src/main/resources/json-schema/RS-SAS-RDV.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-SAS-RDV.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "appointment",

src/main/resources/json-schema/RS-SR.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-SR.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "resourcesStatus",

src/main/resources/json-schema/RS-URL.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "RS-URL.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "documentLink",

src/main/resources/json-schema/TECHNICAL.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "TECHNICAL.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "technical",

src/main/resources/json-schema/TECHNICAL_NOREQ.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "TECHNICAL_NOREQ.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "technicalNoreq",

src/main/resources/json-schema/customContent.schema.json

@@ -2,7 +2,7 @@
     "$schema": "http://json-schema.org/draft-07/schema#",
     "$id": "classpath:/json-schema/schema#",
     "x-id": "customContent.schema.json#",
-    "version": "26.03.23",
+    "version": "26.04.28",
     "example": "example.json#",
     "type": "object",
     "title": "customContent",

src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.json

@@ -15,7 +15,8 @@
           "status": "DECLENCHE",
           "datetime": "2024-05-18T18:10:00+02:00",
           "availability": false
-        }
+        },
+        "operationId": "DRFR15DDXAAJJJ0000.M001"
       },
       {
         "team": {
@@ -31,7 +32,8 @@
           "status": "DECLENCHE",
           "datetime": "2024-05-18T18:20:00+02:00",
           "availability": false
-        }
+        },
+        "operationId": "DRFR15DDXAAJJJ0000.M001"
       }      
     ],
     "caseId": "fr.health.samu440.DRFR154402413800236"

src/main/resources/sample/examples/RC-RI/RC-RI_FuiteDeGaz_AliceGregoireNORMAND.02.xml

@@ -4,6 +4,7 @@
   <resource>
     <datetime>2024-05-18T18:22:00+02:00</datetime>
     <resourceId>fr.health.samu440.resource.VLM1</resourceId>
+    <operationId>DRFR15DDXAAJJJ0000.M001</operationId>
     <orgId>fr.health.samu440</orgId>
     <vehicleType>SMUR</vehicleType>
     <name>VLM1</name>
@@ -20,6 +21,7 @@
   <resource>
     <datetime>2024-05-18T18:22:00+02:00</datetime>
     <resourceId>fr.health.samu440.resource.VLM2</resourceId>
+    <operationId>DRFR15DDXAAJJJ0000.M001</operationId>
     <orgId>fr.health.samu440</orgId>
     <vehicleType>SMUR</vehicleType>
     <name>VLM2</name>