Merge pull request #259 from marcberger/feat/add_generic_role

Feat/add a role for generic export batch

Author: alicela

src/main/java/fr/insee/genesis/configuration/auth/security/ApplicationRole.java

@@ -6,6 +6,7 @@ public enum ApplicationRole {
     USER_PLATINE,
     COLLECT_PLATFORM,
     SCHEDULER,
-    READER
+    READER,
+    USER_BATCH_GENERIC
 }
 

src/main/java/fr/insee/genesis/configuration/auth/security/RoleConfiguration.java

@@ -34,6 +34,10 @@ public class RoleConfiguration {
     @Value("#{'${app.role.scheduler.claims}'.split(',')}")
     private List<String> schedulerClaims;
 
+    @Value("#{'${app.role.batch-generic.claims}'.split(',')}")
+    private List<String> batchGenericClaims;
+
+
     public Map<String, List<String>> getRolesByClaim() {
         return rolesByClaim;
     }
@@ -52,6 +56,7 @@ static RoleHierarchy roleHierarchy() {
                 .role(ApplicationRole.ADMIN.toString()).implies(ApplicationRole.USER_PLATINE.toString())
                 .role(ApplicationRole.ADMIN.toString()).implies(ApplicationRole.COLLECT_PLATFORM.toString())
                 .role(ApplicationRole.ADMIN.toString()).implies(ApplicationRole.SCHEDULER.toString())
+                .role(ApplicationRole.ADMIN.toString()).implies(ApplicationRole.USER_BATCH_GENERIC.toString())
                 .role(ApplicationRole.USER_KRAFTWERK.toString()).implies(ApplicationRole.READER.toString())
                 .role(ApplicationRole.USER_PLATINE.toString()).implies(ApplicationRole.READER.toString())
                 .build();
@@ -100,6 +105,11 @@ public void initialization() {
                 .computeIfAbsent(claim, k -> new ArrayList<>())
                 .add(String.valueOf(ApplicationRole.SCHEDULER)));
 
+        //Add claims for the USER_BATCH_GENERIC role
+        batchGenericClaims.forEach(claim -> rolesByClaim
+                .computeIfAbsent(claim, k -> new ArrayList<>())
+                .add(String.valueOf(ApplicationRole.USER_BATCH_GENERIC)));
+
         log.info("Roles configuration : {}", rolesByClaim);
     }
 

src/main/java/fr/insee/genesis/controller/rest/responses/RawResponseController.java

@@ -191,17 +191,18 @@ public ResponseEntity<Map<String, List<String>>> getProcessedDataIdsSinceHours(
         Map<String, List<String>> result = lunaticJsonRawDataApiPort.findProcessedIdsgroupedByQuestionnaireSince(LocalDateTime.now().minusHours(hours).minusMinutes(10));
         return ResponseEntity.ok(result);
     }
-    @Operation(summary = "Get lunatic JSON data from one campaign in Genesis Database, filtered by optional start and end dates")
+
+    @Operation(summary = "Get lunatic JSON data from one campaign in Genesis Database, filtered by start and end dates")
     @GetMapping(path = "/lunatic-json/{campaignId}")
-    @PreAuthorize("hasRole('USER_KRAFTWERK')")
+    @PreAuthorize("hasRole('USER_BATCH_GENERIC')")
     public ResponseEntity<PagedModel<LunaticJsonRawDataModel>> getRawResponsesFromJsonBody(
             @PathVariable String campaignId,
             @RequestParam(value = "startDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Instant startDate,
             @RequestParam(value = "endDate", required = false) @DateTimeFormat(iso = DateTimeFormat.ISO.DATE_TIME) Instant endDate,
             @RequestParam(value = "page", defaultValue = "0") int page,
             @RequestParam(value = "size", defaultValue = "1000") int size
     ) {
-        log.info("Try to read raw JSONs for campaign {}, with startDate={} and endDate={}", campaignId, startDate, endDate);
+        log.info("Try to read raw JSONs for campaign {}, with startDate={} and endDate={} - page={} - size={}", campaignId, startDate, endDate,page,size);
         Pageable pageable = PageRequest.of(page, size);
         Page<LunaticJsonRawDataModel> rawResponses = lunaticJsonRawDataApiPort.findRawDataByCampaignIdAndDate(campaignId, startDate, endDate, pageable);
         log.info("rawResponses=" + rawResponses.getContent().size());

src/main/java/fr/insee/genesis/infrastructure/adapter/LunaticJsonRawDataMongoAdapter.java

@@ -2,7 +2,6 @@
 
 import fr.insee.genesis.Constants;
 import fr.insee.genesis.domain.model.surveyunit.GroupedInterrogation;
-import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;

src/main/resources/application-dev.properties

@@ -23,6 +23,7 @@ app.role.user-platine.claims=***
 app.role.reader.claims=***
 app.role.collect-platform.claims=***
 app.role.scheduler.claims=***
+app.role.batch-generic.claims=***
 
 #--------------------------------------------------------------------------
 # Survey quality tool

src/main/resources/application-preprod.properties

@@ -23,7 +23,7 @@ app.role.user-platine.claims=***
 app.role.reader.claims=***
 app.role.collect-platform.claims=***
 app.role.scheduler.claims=***
-
+app.role.batch-generic.claims=***
 #--------------------------------------------------------------------------
 # Survey quality tool
 #--------------------------------------------------------------------------

src/main/resources/application-prod.properties

@@ -23,6 +23,7 @@ app.role.user-platine.claims=***
 app.role.reader.claims=***
 app.role.collect-platform.claims=***
 app.role.scheduler.claims=***
+app.role.batch-generic.claims=***
 
 #--------------------------------------------------------------------------
 # Survey quality tool

src/main/resources/application-test-cucumber.properties

@@ -8,6 +8,7 @@ app.role.user-platine.claims=utilisateur_Platine
 app.role.reader.claims=lecteur_traiter
 app.role.collect-platform.claims=protools
 app.role.scheduler.claims=scheduler_traiter
+app.role.batch-generic.claims=utilisateur_batch_generic
 
 logging.file.name = /logs/genesis-api.log
 

src/main/resources/application-test.properties

@@ -8,6 +8,7 @@ app.role.user-platine.claims=utilisateur_Platine
 app.role.reader.claims=lecteur_traiter
 app.role.collect-platform.claims=protools
 app.role.scheduler.claims=scheduler_traiter
+app.role.batch-generic.claims=utilisateur_batch_generic
 
 logging.file.name = /logs/genesis-api.log
 

src/test/java/fr/insee/genesis/stubs/LunaticJsonRawDataPersistanceStub.java

@@ -1,7 +1,6 @@
 package fr.insee.genesis.stubs;
 
 import fr.insee.genesis.domain.model.surveyunit.GroupedInterrogation;
-import fr.insee.genesis.domain.model.surveyunit.InterrogationId;
 import fr.insee.genesis.domain.model.surveyunit.Mode;
 import fr.insee.genesis.domain.model.surveyunit.rawdata.LunaticJsonRawDataModel;
 import fr.insee.genesis.domain.ports.spi.LunaticJsonRawDataPersistencePort;