Merge pull request #140 from InseeFr/2.1.6-rc1-live

2.1.6 rc1 live

Author: rkouere

.gitignore

@@ -4,7 +4,7 @@ target/
 !**/src/main/**/target/
 !**/src/test/**/target/
 !**/src/main/resources/application.properties
-
+*.log
 ### STS ###
 .apt_generated
 .classpath

pom.xml

@@ -11,7 +11,7 @@
     </parent>
     <groupId>fr.insee.rmes</groupId>
     <artifactId>ddi-access-services</artifactId>
-    <version>2.1.5</version>
+    <version>2.1.6-rc1</version>
     <name>DDI Access Services</name>
     <description>Rest API to access to Colectica repository services</description>
     <properties>

src/main/resources/application.yaml

@@ -86,7 +86,7 @@ logging:
     rollingpolicy:
       max-file-size: 1MB
   file:
-    name: XXXX
+    name: output.log
 
 auth:
   api:

src/main/resources/xslTransformerFiles/ddiDatarelationship2Json.xsl

@@ -3,7 +3,7 @@
                 xmlns:msxsl="urn:schemas-microsoft-com:xslt" exclude-result-prefixes="msxsl"
                 xmlns:l="ddi:logicalproduct:3_3"
                 xmlns:r="ddi:reusable:3_3"
->
+                xmlns:ext="java:java.lang.System">
 
     <xsl:output method="text" indent="yes" />
 
@@ -21,13 +21,20 @@
             <xsl:variable name="dataRelation_URN" select="r:URN" />
             <xsl:variable name="dataRelation_name" select="l:DataRelationshipName/r:String" />
             <xsl:variable name="dataRelation_libelle_fr" select="r:Label/r:Content" />
+            <xsl:variable name="dataRelation_Version" select="r:Version" />
+            <xsl:variable name="dataRelation_Versiondate" select="@versionDate" />
+
 
             <xsl:if test="position() > 1">
                 <xsl:text>,&#10;</xsl:text>
             </xsl:if>
 
             <xsl:text>  {&#10;    "id": "</xsl:text>
             <xsl:value-of select="$dataRelation_URN" />
+            <xsl:text>",&#10;    "version": "</xsl:text>
+            <xsl:value-of select="$dataRelation_Version" />
+            <xsl:text>",&#10;    "versionDate": "</xsl:text>
+            <xsl:value-of select="$dataRelation_Versiondate" />
             <xsl:text>",&#10;    "nom": "</xsl:text>
             <xsl:value-of select="$dataRelation_name" />
             <xsl:text>",&#10;    "label": [&#10;      { "contenu": "</xsl:text>
@@ -38,6 +45,10 @@
                 <xsl:variable name="VariableUsed_Agency" select="r:Agency" />
                 <xsl:variable name="VariableUsed_ID" select="r:ID" />
                 <xsl:variable name="VariableUsed_Version" select="r:Version" />
+
+
+
+                <!--                isGeographic="true"-->
                 <xsl:variable name="VariableUsed_URN" select="concat('urn:ddi:', $VariableUsed_Agency, ':', $VariableUsed_ID, ':', $VariableUsed_Version)" />
 
                 <xsl:variable name="var" select="key('varByURN', $VariableUsed_URN)" />
@@ -53,14 +64,38 @@
                 <xsl:value-of select="normalize-space($var/r:Label/r:Content)" />
                 <xsl:text>", "langue": "fr" },&#10;          { "contenu": "", "langue": "en" }&#10;        ],&#10;        "ordre": "</xsl:text>
                 <xsl:number />
-                <xsl:text>",&#10;        "representation": </xsl:text>
-
+                <xsl:text>",&#10;        "role": "</xsl:text>
+                <xsl:choose>
+                    <xsl:when test="not(normalize-space($var/l:VariableRepresentation/l:VariableRole))">
+                        <!-- Si la valeur est vide, appliquer une valeur par défaut -->
+                        <xsl:value-of select="'Mesure'" />
+                    </xsl:when>
+                    <xsl:otherwise>
+                        <!-- Sinon, afficher la valeur existante -->
+                        <xsl:value-of select="normalize-space($var/l:VariableRepresentation/l:VariableRole)" />
+                    </xsl:otherwise>
+                </xsl:choose>
+                <xsl:text>",&#10;        "variablegeographique": "</xsl:text>
+                <xsl:value-of select="normalize-space($var/@isGeographic)" />
+                <xsl:text>",&#10;        "representation": {</xsl:text>
+                <xsl:text>"type":</xsl:text>
                 <xsl:choose>
                     <xsl:when test="$var/l:VariableRepresentation/r:CodeRepresentation">
                         <xsl:text>"codes"</xsl:text>
                     </xsl:when>
                     <xsl:when test="$var/l:VariableRepresentation/r:NumericRepresentation">
-                        <xsl:text>"numerique"</xsl:text>
+                        <xsl:variable name="NumericTypeCode" select="$var/l:VariableRepresentation/r:NumericRepresentation/r:NumericTypeCode" />
+                        <xsl:choose>
+                            <xsl:when test="not(normalize-space($NumericTypeCode))">
+                                <!-- Si la valeur est vide, appliquer une valeur par défaut -->
+                                <xsl:text>"numerique"</xsl:text>
+                            </xsl:when>
+                            <xsl:otherwise>
+                                <!-- Sinon, afficher la valeur existante -->
+                                <xsl:text>"</xsl:text><xsl:value-of select="$NumericTypeCode" /><xsl:text>"</xsl:text>
+                            </xsl:otherwise>
+                        </xsl:choose>
+
                     </xsl:when>
                     <xsl:when test="$var/l:VariableRepresentation/r:TextRepresentation">
                         <xsl:text>"texte"</xsl:text>
@@ -72,7 +107,7 @@
                         <xsl:text>"null"</xsl:text>
                     </xsl:otherwise>
                 </xsl:choose>
-
+                <xsl:text>}</xsl:text>
                 <!-- Process Code Representation -->
                 <xsl:if test="$var/l:VariableRepresentation/r:CodeRepresentation">
                     <xsl:text>,&#10;        "controles": { "codes": [&#10;</xsl:text>

src/test/java/fr/insee/rmes/tocolecticaapi/controller/GetItemTest.java

@@ -35,27 +35,41 @@ class GetItemTest {
     @MockitoBean
     private ColecticaService colecticaService;
 
+    /***
+     * This test will :
+     * - use the method which generates the json from the DDI (colecticaService.searchColecticaInstanceByUuid()). This
+     * method will use a hard coded DDI file /getItemTest/physicalInstance.xml.
+     * - check that the json generated is conform with the expected json
+     * @throws Exception
+     */
     @Test
     void whenGetDataRelationshipWithUuid_shouldReturnRightJson() throws Exception {
-        String uuid="34abf2d5-f0bb-47df-b3d2-42ff7f8f5874";
+        String uuid="9a7f1abd-10ec-48f3-975f-fcfedb7dc4cd";
         var dataRelationShipEndpoint="/Item/ddiFragment/"+uuid+"/dataRelationship";
         when(colecticaService.searchColecticaInstanceByUuid(uuid)).thenReturn(read("/getItemTest/physicalInstance.xml"));
         mockMvc.perform(get(dataRelationShipEndpoint).accept(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-                .andExpect(content().json(read("/getItemTest/34abf2d5-f0bb-47df-b3d2-42ff7f8f5874_expected.json")));
+                .andExpect(content().json(read("/getItemTest/9a7f1abd-10ec-48f3-975f-fcfedb7dc4cd_expected.json")));
     }
 
+    /***
+     * This test will :
+     * - use the method which generates the json from the DDI (colecticaService.searchColecticaInstanceByUuid()). This
+     * method will use a hard coded DDI file /getItemTest/physicalInstance.xml.
+     * - check that the json generated is conform with the expected json
+     * @throws Exception
+     */
     @Test
     void whenGetDataRelationshipWithUuidAndVersion_shouldReturnRightJson() throws Exception {
-        String uuid="34abf2d5-f0bb-47df-b3d2-42ff7f8f5874";
+        String uuid="9a7f1abd-10ec-48f3-975f-fcfedb7dc4cd9a7f1abd-10ec-48f3-975f-fcfedb7dc4cd";
         int version = 2;
         var dataRelationShipEndpoint="/Item/ddiFragment/"+uuid+"/"+version+"/dataRelationship";
         when(colecticaService.searchColecticaInstanceByUuid(uuid+"/"+version)).thenReturn(read("/getItemTest/physicalInstance.xml"));
         mockMvc.perform(get(dataRelationShipEndpoint).accept(MediaType.APPLICATION_JSON))
                 .andExpect(status().isOk())
                 .andExpect(content().contentType(MediaType.APPLICATION_JSON_VALUE))
-                .andExpect(content().json(read("/getItemTest/34abf2d5-f0bb-47df-b3d2-42ff7f8f5874_expected.json")));
+                .andExpect(content().json(read("/getItemTest/9a7f1abd-10ec-48f3-975f-fcfedb7dc4cd_expected.json")));
     }