feat: add endpoint to get ongoing campaigns by type (V1, V2 or V3)

InseeFr · Sep 11, 2024 · 4b64d3d · 4b64d3d
1 parent f8d66f2
commit 4b64d3d
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/...java/fr/insee/survey/datacollectionmanagement/metadata/controller/CampaignController.java b/...java/fr/insee/survey/datacollectionmanagement/metadata/controller/CampaignController.java
@@ -234,7 +234,7 @@ private CampaignOngoingDto convertToCampaignOngoingDto(Campaign campaign) {
     }
 
     private boolean isCampaignInType(Campaign c, String campaignType) {
-        if (campaignType.isEmpty())
+        if (StringUtils.isEmpty(campaignType))
             return true;
         if (campaignType.equalsIgnoreCase(V3.name()))
             return parametersService.findSuitableParameterValue(c, Parameters.ParameterEnum.URL_TYPE).equalsIgnoreCase(campaignType)

diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/metadata/util/ParamValidator.java b/src/main/java/fr/insee/survey/datacollectionmanagement/metadata/util/ParamValidator.java
@@ -13,18 +13,21 @@
 
 public class ParamValidator {
 
+    private ParamValidator() {
+        throw new IllegalStateException("Validation class");
+    }
 
     public static void validateParams(ParamsDto paramsDto) {
         if (paramsDto.getParamId().equalsIgnoreCase(Parameters.ParameterEnum.URL_TYPE.name())
                 && Arrays.stream(UrlTypeEnum.values()).noneMatch(p -> p.name().equals(paramsDto.getParamValue()))) {
 
-            throw new NotMatchException(String.format("Only %s are valid values for URL_TYPE", Arrays.stream(UrlTypeEnum.values()).map(item -> item.name())
+            throw new NotMatchException(String.format("Only %s are valid values for URL_TYPE", Arrays.stream(UrlTypeEnum.values()).map(Enum::name)
                     .collect(joining(" "))));
         }
         if (paramsDto.getParamId().equalsIgnoreCase(Parameters.ParameterEnum.URL_REDIRECTION.name())
                 && Arrays.stream(UrlRedirectionEnum.values()).noneMatch(p -> p.name().equals(paramsDto.getParamValue()))) {
 
-            throw new NotMatchException(String.format("Only %s are valid values for URL_REDIRECTION", Arrays.stream(UrlRedirectionEnum.values()).map(item -> item.name())
+            throw new NotMatchException(String.format("Only %s are valid values for URL_REDIRECTION", Arrays.stream(UrlRedirectionEnum.values()).map(Enum::name)
                     .collect(joining(" "))));
         }
         if (paramsDto.getParamId().equalsIgnoreCase(Parameters.ParameterEnum.MAIL_ASSISTANCE.name())