fix: add required metadata attributes when retrieving survey unit met…

…adata (#253)
InseeFr · Jun 18, 2024 · 611f53f · 611f53f
1 parent af58eb6
commit 611f53f
Show file tree

Hide file tree

Showing 7 changed files with 16 additions and 2 deletions.
diff --git a/pom.xml b/pom.xml
@@ -10,7 +10,7 @@
     <description>Modules for queen back-office</description>
 
     <properties>
-        <revision>4.3.9</revision>
+        <revision>4.3.10</revision>
         <changelist></changelist>
         <java.version>21</java.version>
         <maven.compiler.source>21</maven.compiler.source>

diff --git a/...n-application/src/main/java/fr/insee/queen/application/surveyunit/dto/output/LogoDto.java b/...n-application/src/main/java/fr/insee/queen/application/surveyunit/dto/output/LogoDto.java
@@ -1,10 +1,13 @@
 package fr.insee.queen.application.surveyunit.dto.output;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(name = "Logo")
 public record LogoDto(
+        @NotNull
         String url,
+        @NotNull
         String label
 ) {
 }
diff --git a/...-application/src/main/java/fr/insee/queen/application/surveyunit/dto/output/LogoDtos.java b/...-application/src/main/java/fr/insee/queen/application/surveyunit/dto/output/LogoDtos.java
@@ -1,11 +1,13 @@
 package fr.insee.queen.application.surveyunit.dto.output;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
 @Schema(name = "Logos")
 public record LogoDtos(
+        @NotNull
         LogoDto main,
         List<LogoDto> secondaries
 ) {

diff --git a/...plication/src/main/java/fr/insee/queen/application/surveyunit/dto/output/MetadataDto.java b/...plication/src/main/java/fr/insee/queen/application/surveyunit/dto/output/MetadataDto.java
@@ -9,4 +9,4 @@ public record MetadataDto(
         String label,
         String objectives
 ) {
-}
+}
diff --git a/...n/src/main/java/fr/insee/queen/application/surveyunit/dto/output/MetadataVariableDto.java b/...n/src/main/java/fr/insee/queen/application/surveyunit/dto/output/MetadataVariableDto.java
@@ -1,13 +1,16 @@
 package fr.insee.queen.application.surveyunit.dto.output;
 
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 @Schema(name = "MetadataVariable")
 public record MetadataVariableDto(
+        @NotNull
         String name,
         // TODO: Bug with openapi 3.1 and springdoc. Uncomment this when problem solved
         // https://github.com/springdoc/springdoc-openapi/issues/2608
         //@Schema(description = "Variable value", oneOf = {String.class, Boolean.class})
+        @NotNull
         Object value
 ) {
 }
diff --git a/...c/main/java/fr/insee/queen/application/surveyunit/dto/output/QuestionnaireContextDto.java b/...c/main/java/fr/insee/queen/application/surveyunit/dto/output/QuestionnaireContextDto.java
@@ -1,6 +1,7 @@
 package fr.insee.queen.application.surveyunit.dto.output;
 
 import com.fasterxml.jackson.annotation.JsonValue;
+import jakarta.validation.constraints.NotNull;
 import lombok.Getter;
 import lombok.NonNull;
 
@@ -12,6 +13,7 @@ public enum QuestionnaireContextDto {
     BUSINESS("business");
 
     @JsonValue
+    @NotNull
     private final String label;
 
     QuestionnaireContextDto(String label) {

diff --git a/...src/main/java/fr/insee/queen/application/surveyunit/dto/output/SurveyUnitMetadataDto.java b/...src/main/java/fr/insee/queen/application/surveyunit/dto/output/SurveyUnitMetadataDto.java
@@ -6,16 +6,20 @@
 import fr.insee.queen.application.web.validation.json.SchemaType;
 import fr.insee.queen.domain.surveyunit.model.SurveyUnitMetadata;
 import io.swagger.v3.oas.annotations.media.Schema;
+import jakarta.validation.constraints.NotNull;
 
 import java.util.List;
 
 @Schema(name = "SurveyUnitMetadata")
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public record SurveyUnitMetadataDto(
+        @NotNull
         QuestionnaireContextDto context,
         @Schema(ref = SchemaType.Names.PERSONALIZATION)
         ArrayNode personalization,
+        @NotNull
         String label,
+        @NotNull
         String objectives,
         List<MetadataVariableDto> variables,
         LogoDtos logos