Merge pull request #241 from ansforge/fix/cleaner_nomenc_valus

fix: cleaner nomenclature values, update upload-artifact action and fix example with space in nomenclature value

.github/workflows/converter-tests.yml

@@ -41,7 +41,7 @@ jobs:
           pytest --cov=converter --cov-report=html --cov-report=xml --cov-config=pytest.ini -rP
 
       - name: Upload HTML coverage report
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: coverage-report
           path: tools/converter/htmlcov

.github/workflows/generate-libs.yaml

@@ -133,7 +133,7 @@ jobs:
           python -m build
 
       - name: Python - Upload package as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: python-package-artifact
           path: ./generator_python/package/dist/
@@ -186,7 +186,7 @@ jobs:
           gem build hubsante_model.gemspec
 
       - name: Ruby - Upload Gem as artifact
-        uses: actions/upload-artifact@v3
+        uses: actions/upload-artifact@v4
         with:
           name: ruby-gem-artifact
           path: ./generator_ruby/gem/hubsante_model-*.gem
@@ -229,7 +229,7 @@ jobs:
     #       dotnet pack --configuration Release -p:Version=${{ env.RELEASE_VERSION }}
 
     #   - name: C# - Upload package as artifact
-    #     uses: actions/upload-artifact@v3
+    #     uses: actions/upload-artifact@v4
     #     with:
     #       name: csharp-package-artifact
     #       path: ./generator_csharp/package/src/bin/Release/*.nupkg

csv_parser/csv_parser.py

@@ -95,7 +95,8 @@ def get_nomenclature(elem):
         if path_file != '':
             df_nomenclature = pd.read_csv(path_file, sep=",", keep_default_na=False, na_values=['_'], encoding="utf-8",
                                           dtype={'code': str})
-            L_ret = df_nomenclature["code"].values.tolist()
+            # Return codes with replaced commas and trimmed leading and trailing spaces for cleaner values
+            L_ret = [code.replace(',', ' ').strip() for code in df_nomenclature["code"].values.tolist()]
         # ToDo: ajouter un bloc dans le elseif pour détecter des https:// et aller chercher les nomenclatures publiées en ligne (MOS/NOs par exemple)
         else:
             print(f"{Color.RED}ERROR: nomenclature {nomenclature_name} does not exist, could not load associated values.")

csv_parser/out/hubsante.asyncapi.yaml

@@ -2763,7 +2763,7 @@ components:
           - LIBERAL.DENT
           - LIBERAL.LABO
           - LIBERAL.AUTREPRO
-          - 'TSU '
+          - TSU
           - SIS
           - SIS.MEDSP
           - SIS.ISP

generator/input/RS-EDA-MAJ.openapi.yaml

@@ -340,7 +340,7 @@ components:
           - LIBERAL.DENT
           - LIBERAL.LABO
           - LIBERAL.AUTREPRO
-          - 'TSU '
+          - TSU
           - SIS
           - SIS.MEDSP
           - SIS.ISP

generator/input/RS-EDA.openapi.yaml

@@ -453,7 +453,7 @@ components:
           - LIBERAL.DENT
           - LIBERAL.LABO
           - LIBERAL.AUTREPRO
-          - 'TSU '
+          - TSU
           - SIS
           - SIS.MEDSP
           - SIS.ISP

generator/input/RS-RPIS.openapi.yaml

@@ -1496,7 +1496,7 @@ components:
           - LIBERAL.DENT
           - LIBERAL.LABO
           - LIBERAL.AUTREPRO
-          - 'TSU '
+          - TSU
           - SIS
           - SIS.MEDSP
           - SIS.ISP

generator_csharp/package/src/HubsanteModel/Health/Model/Decision.cs

@@ -201,9 +201,9 @@ public enum ResourceTypeEnum
             LIBERALAUTREPRO = 19,
 
             /// <summary>
-            /// Enum TSU for value: TSU 
+            /// Enum TSU for value: TSU
             /// </summary>
-            [EnumMember(Value = "TSU ")]
+            [EnumMember(Value = "TSU")]
             TSU = 20,
 
             /// <summary>

generator_csharp/package/src/HubsanteModel/Reference/Model/Reference.cs

@@ -51,10 +51,10 @@ public enum StepEnum
             ERREUR = 2,
 
             /// <summary>
-            /// Enum CREE for value: CREE
+            /// Enum INTEGRE for value: INTEGRE
             /// </summary>
-            [EnumMember(Value = "CREE")]
-            CREE = 3,
+            [EnumMember(Value = "INTEGRE")]
+            INTEGRE = 3,
 
             /// <summary>
             /// Enum CONSULTE for value: CONSULTE
@@ -63,9 +63,9 @@ public enum StepEnum
             CONSULTE = 4,
 
             /// <summary>
-            /// Enum SUPPRIME for value: SUPPRIME 
+            /// Enum SUPPRIME for value: SUPPRIME
             /// </summary>
-            [EnumMember(Value = "SUPPRIME ")]
+            [EnumMember(Value = "SUPPRIME")]
             SUPPRIME = 5
         }
 

generator_csharp/package/src/HubsanteModel/Rpis/Model/Decision.cs

@@ -153,9 +153,9 @@ public enum ResourceTypeEnum
             LIBERALAUTREPRO = 19,
 
             /// <summary>
-            /// Enum TSU for value: TSU 
+            /// Enum TSU for value: TSU
             /// </summary>
-            [EnumMember(Value = "TSU ")]
+            [EnumMember(Value = "TSU")]
             TSU = 20,
 
             /// <summary>

generator_python/package/src/hubsante_model/health/models/decision.py

@@ -59,8 +59,8 @@ def resource_type_validate_enum(cls, value):
         if value is None:
             return value
 
-        if value not in set(['SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU ', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE']):
-            raise ValueError("must be one of enum values ('SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU ', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE')")
+        if value not in set(['SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE']):
+            raise ValueError("must be one of enum values ('SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE')")
         return value
 
     @field_validator('orientation_type')

generator_python/package/src/hubsante_model/reference/models/reference.py

@@ -38,8 +38,8 @@ def step_validate_enum(cls, value):
         if value is None:
             return value
 
-        if value not in set(['RECU', 'ERREUR', 'CREE', 'CONSULTE', 'SUPPRIME ']):
-            raise ValueError("must be one of enum values ('RECU', 'ERREUR', 'CREE', 'CONSULTE', 'SUPPRIME ')")
+        if value not in set(['RECU', 'ERREUR', 'INTEGRE', 'CONSULTE', 'SUPPRIME']):
+            raise ValueError("must be one of enum values ('RECU', 'ERREUR', 'INTEGRE', 'CONSULTE', 'SUPPRIME')")
         return value
 
     model_config = ConfigDict(

generator_python/package/src/hubsante_model/rpis/models/decision.py

@@ -34,8 +34,8 @@ class Decision(BaseModel):
     @field_validator('resource_type')
     def resource_type_validate_enum(cls, value):
         """Validates the enum"""
-        if value not in set(['SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU ', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE']):
-            raise ValueError("must be one of enum values ('SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU ', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE')")
+        if value not in set(['SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE']):
+            raise ValueError("must be one of enum values ('SMUR', 'SMUR.ADULT', 'SMUR.PED', 'SMUR.UMH-S', 'SMUR.CUMP', 'HOSPIT', 'LIBERAL', 'LIBERAL.MG', 'LIBERAL.PHARM', 'LIBERAL.INF', 'LIBERAL.KINE', 'LIBERAL.SOS', 'LIBERAL.MMG', 'LIBERAL.MSPD', 'LIBERAL.MCS', 'LIBERAL.SPEMED', 'LIBERAL.DENT', 'LIBERAL.LABO', 'LIBERAL.AUTREPRO', 'TSU', 'SIS', 'SIS.MEDSP', 'SIS.ISP', 'SIS.SP', 'AASC', 'FDO', 'FDO.PN', 'FDO.GEND', 'FDO.PM', 'FDO.DOUANES', 'AUTRE', 'AUTRE.ADM', 'AUTRE.DAE', 'AUTRE.AUTRE')")
         return value
 
     @field_validator('vehicle_type')

generator_ruby/gem/lib/hubsanteModel/models/health/decision.rb

@@ -187,7 +187,7 @@ def valid?
       return false if @decision_type.nil?
       decision_type_validator = EnumAttributeValidator.new('String', ["CONSEIL", "PMT", "INTER", "ORIENT", "PASPLUS"])
       return false unless decision_type_validator.valid?(@decision_type)
-      resource_type_validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU ", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
+      resource_type_validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
       return false unless resource_type_validator.valid?(@resource_type)
       orientation_type_validator = EnumAttributeValidator.new('String', ["URGENCES", "REA-USI", "SANTE", "CABINET", "DOMICILE", "EPHAD", "AUTRE"])
       return false unless orientation_type_validator.valid?(@orientation_type)
@@ -222,7 +222,7 @@ def decision_type=(decision_type)
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] resource_type Object to be assigned
     def resource_type=(resource_type)
-      validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU ", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
+      validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
       unless validator.valid?(resource_type)
         fail ArgumentError, "invalid value for \"resource_type\", must be one of #{validator.allowable_values}."
       end

generator_ruby/gem/lib/hubsanteModel/models/reference/reference.rb

@@ -131,15 +131,15 @@ def list_invalid_properties
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @distribution_id.nil?
-      step_validator = EnumAttributeValidator.new('String', ["RECU", "ERREUR", "CREE", "CONSULTE", "SUPPRIME "])
+      step_validator = EnumAttributeValidator.new('String', ["RECU", "ERREUR", "INTEGRE", "CONSULTE", "SUPPRIME"])
       return false unless step_validator.valid?(@step)
       true
     end
 
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] step Object to be assigned
     def step=(step)
-      validator = EnumAttributeValidator.new('String', ["RECU", "ERREUR", "CREE", "CONSULTE", "SUPPRIME "])
+      validator = EnumAttributeValidator.new('String', ["RECU", "ERREUR", "INTEGRE", "CONSULTE", "SUPPRIME"])
       unless validator.valid?(step)
         fail ArgumentError, "invalid value for \"step\", must be one of #{validator.allowable_values}."
       end

generator_ruby/gem/lib/hubsanteModel/models/rpis/decision.rb

@@ -134,7 +134,7 @@ def list_invalid_properties
     def valid?
       warn '[DEPRECATED] the `valid?` method is obsolete'
       return false if @resource_type.nil?
-      resource_type_validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU ", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
+      resource_type_validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
       return false unless resource_type_validator.valid?(@resource_type)
       return false if @vehicle_type.nil?
       vehicle_type_validator = EnumAttributeValidator.new('String', ["AASC", "AASC.VLSC", "AASC.VPSP", "AASC.AUTRESC", "AUTREVEC", "AUTREVEC.APIED", "AUTREVEC.AVION", "AUTREVEC.PERSO", "AUTREVEC.TAXI", "AUTREVEC.TRAIN", "AUTREVEC.TRANSP", "AUTREVEC.AUTRE", "AUTREVEC.AUTRETRA", "FSI", "FSI.HELIFSI", "FSI.VLFSI", "FSI.FFSI", "FSI.VHFSI", "LIB", "LIB.MEDV", "LIB.INF", "LIB.AUTREPRO", "SIS", "SIS.DRAGON", "SIS.AVSC", "SIS.FEUSIS", "SIS.GRIMP", "SIS.NAVISIS", "SIS.PCSIS", "SIS.SRSIS", "SIS.VCH", "SIS.VLCG", "SIS.VLISP", "SIS.VLMSP", "SIS.VLSIS", "SIS.VPL", "SIS.VPMA", "SIS.VR", "SIS.VSAV", "SIS.MOYSSE", "SIS.AUTRESIS", "SMUR", "SMUR.VLM", "SMUR.VL", "SMUR.PSM1", "SMUR.PSM2", "SMUR.PSM3", "SMUR.PSMP", "SMUR.VPC", "SMUR.AR", "SMUR.AR-BAR", "SMUR.AR-PED", "SMUR.HELISMUR", "SMUR.HELISAN", "SMUR.AVSMUR", "SMUR.AVSAN", "SMUR.NAVISMUR", "TSU", "TSU.VSL", "TSU.AMB-GV", "TSU.AMB-PV", "TSU.AMB-BAR", "TSU.AMB"])
@@ -148,7 +148,7 @@ def valid?
     # Custom attribute writer method checking allowed values (enum).
     # @param [Object] resource_type Object to be assigned
     def resource_type=(resource_type)
-      validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU ", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
+      validator = EnumAttributeValidator.new('String', ["SMUR", "SMUR.ADULT", "SMUR.PED", "SMUR.UMH-S", "SMUR.CUMP", "HOSPIT", "LIBERAL", "LIBERAL.MG", "LIBERAL.PHARM", "LIBERAL.INF", "LIBERAL.KINE", "LIBERAL.SOS", "LIBERAL.MMG", "LIBERAL.MSPD", "LIBERAL.MCS", "LIBERAL.SPEMED", "LIBERAL.DENT", "LIBERAL.LABO", "LIBERAL.AUTREPRO", "TSU", "SIS", "SIS.MEDSP", "SIS.ISP", "SIS.SP", "AASC", "FDO", "FDO.PN", "FDO.GEND", "FDO.PM", "FDO.DOUANES", "AUTRE", "AUTRE.ADM", "AUTRE.DAE", "AUTRE.AUTRE"])
       unless validator.valid?(resource_type)
         fail ArgumentError, "invalid value for \"resource_type\", must be one of #{validator.allowable_values}."
       end

src/main/java/com/hubsante/model/health/Decision.java

@@ -150,7 +150,7 @@ public enum ResourceTypeEnum {
 
     LIBERAL_AUTREPRO("LIBERAL.AUTREPRO"),
 
-    TSU_("TSU "),
+    TSU("TSU"),
 
     SIS("SIS"),
 

src/main/java/com/hubsante/model/rpis/Decision.java

@@ -92,7 +92,7 @@ public enum ResourceTypeEnum {
 
     LIBERAL_AUTREPRO("LIBERAL.AUTREPRO"),
 
-    TSU_("TSU "),
+    TSU("TSU"),
 
     SIS("SIS"),
 

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

@@ -306,7 +306,7 @@
                         "LIBERAL.DENT",
                         "LIBERAL.LABO",
                         "LIBERAL.AUTREPRO",
-                        "TSU ",
+                        "TSU",
                         "SIS",
                         "SIS.MEDSP",
                         "SIS.ISP",

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

@@ -415,7 +415,7 @@
                         "LIBERAL.DENT",
                         "LIBERAL.LABO",
                         "LIBERAL.AUTREPRO",
-                        "TSU ",
+                        "TSU",
                         "SIS",
                         "SIS.MEDSP",
                         "SIS.ISP",

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

@@ -1414,7 +1414,7 @@
                         "LIBERAL.DENT",
                         "LIBERAL.LABO",
                         "LIBERAL.AUTREPRO",
-                        "TSU ",
+                        "TSU",
                         "SIS",
                         "SIS.MEDSP",
                         "SIS.ISP",

src/main/resources/sample/examples/RS-EDA-MAJ/RS-EDA-MAJ_partageDossier_MonsieurX.02b.json

@@ -9,7 +9,7 @@
         "patientId": "fr.health.samu009.patient.DRFR150092406301259.1",
         "creation": "2024-03-03T15:16:00+01:00",
         "decisionType": "INTER",
-        "resourceType": "TSU "
+        "resourceType": "TSU"
       }
     ]
   }

src/main/resources/sample/examples/RS-EDA-MAJ/RS-EDA-MAJ_partageDossier_MonsieurX.02b.xml

@@ -8,6 +8,6 @@
       <role>MEDECIN</role>
     </operator>
     <decisionType>INTER</decisionType>
-    <resourceType>TSU </resourceType>
+    <resourceType>TSU</resourceType>
   </decision>
 </createCaseHealthUpdate>

src/main/resources/xsd/RS-EDA-MAJ.xsd

@@ -205,7 +205,7 @@ A fournir obligatoirement pour une décision d'intervention ou de transport/orie
                         <enumeration value="LIBERAL.DENT"/>
                         <enumeration value="LIBERAL.LABO"/>
                         <enumeration value="LIBERAL.AUTREPRO"/>
-                        <enumeration value="TSU "/>
+                        <enumeration value="TSU"/>
                         <enumeration value="SIS"/>
                         <enumeration value="SIS.MEDSP"/>
                         <enumeration value="SIS.ISP"/>

src/main/resources/xsd/RS-EDA.xsd

@@ -280,7 +280,7 @@ A fournir obligatoirement pour une décision d'intervention ou de transport/orie
                         <enumeration value="LIBERAL.DENT"/>
                         <enumeration value="LIBERAL.LABO"/>
                         <enumeration value="LIBERAL.AUTREPRO"/>
-                        <enumeration value="TSU "/>
+                        <enumeration value="TSU"/>
                         <enumeration value="SIS"/>
                         <enumeration value="SIS.MEDSP"/>
                         <enumeration value="SIS.ISP"/>

src/main/resources/xsd/RS-RPIS.xsd

@@ -1140,7 +1140,7 @@ A valoriser par un code de la nomenclature SI-SAMU-TYPE_MOYEN.</documentation>
                         <enumeration value="LIBERAL.DENT"/>
                         <enumeration value="LIBERAL.LABO"/>
                         <enumeration value="LIBERAL.AUTREPRO"/>
-                        <enumeration value="TSU "/>
+                        <enumeration value="TSU"/>
                         <enumeration value="SIS"/>
                         <enumeration value="SIS.MEDSP"/>
                         <enumeration value="SIS.ISP"/>