From d32db1444ae77d6ff3697bb1a6c949bc5111f67d Mon Sep 17 00:00:00 2001 From: Eric Thuaud Date: Fri, 7 Jul 2023 09:49:38 +0200 Subject: [PATCH 1/5] build - upgrade version --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index bcd5c029..2fe4e409 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ fr.insee.survey platine-management - 1.0.14 + 1.0.15 platine-management REST API for communication between DB and Platine-Management UI and Platine-My-Surveys UI From f8f6ca0c08c3f4050cbe8ae49b3431d1c91e4fd2 Mon Sep 17 00:00:00 2001 From: Eric Thuaud Date: Fri, 7 Jul 2023 14:18:02 +0200 Subject: [PATCH 2/5] fix - add X01 to X00 period enum --- .../metadata/util/PeriodEnum.java | 99 +++++++++++++++++++ 1 file changed, 99 insertions(+) diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/metadata/util/PeriodEnum.java b/src/main/java/fr/insee/survey/datacollectionmanagement/metadata/util/PeriodEnum.java index 8b7f9d08..eb7b6b96 100644 --- a/src/main/java/fr/insee/survey/datacollectionmanagement/metadata/util/PeriodEnum.java +++ b/src/main/java/fr/insee/survey/datacollectionmanagement/metadata/util/PeriodEnum.java @@ -7,6 +7,105 @@ public enum PeriodEnum { A00(PeriodicityEnum.A, "annual"), X00(PeriodicityEnum.X, "pluriannual"), + X01(PeriodicityEnum.X, "pluriannual"), + X02(PeriodicityEnum.X, "pluriannual"), + X03(PeriodicityEnum.X, "pluriannual"), + X04(PeriodicityEnum.X, "pluriannual"), + X05(PeriodicityEnum.X, "pluriannual"), + X06(PeriodicityEnum.X, "pluriannual"), + X07(PeriodicityEnum.X, "pluriannual"), + X08(PeriodicityEnum.X, "pluriannual"), + X09(PeriodicityEnum.X, "pluriannual"), + X10(PeriodicityEnum.X, "pluriannual"), + X11(PeriodicityEnum.X, "pluriannual"), + X12(PeriodicityEnum.X, "pluriannual"), + X13(PeriodicityEnum.X, "pluriannual"), + X14(PeriodicityEnum.X, "pluriannual"), + X15(PeriodicityEnum.X, "pluriannual"), + X16(PeriodicityEnum.X, "pluriannual"), + X17(PeriodicityEnum.X, "pluriannual"), + X18(PeriodicityEnum.X, "pluriannual"), + X19(PeriodicityEnum.X, "pluriannual"), + X20(PeriodicityEnum.X, "pluriannual"), + X21(PeriodicityEnum.X, "pluriannual"), + X22(PeriodicityEnum.X, "pluriannual"), + X23(PeriodicityEnum.X, "pluriannual"), + X24(PeriodicityEnum.X, "pluriannual"), + X25(PeriodicityEnum.X, "pluriannual"), + X26(PeriodicityEnum.X, "pluriannual"), + X27(PeriodicityEnum.X, "pluriannual"), + X28(PeriodicityEnum.X, "pluriannual"), + X29(PeriodicityEnum.X, "pluriannual"), + X30(PeriodicityEnum.X, "pluriannual"), + X31(PeriodicityEnum.X, "pluriannual"), + X32(PeriodicityEnum.X, "pluriannual"), + X33(PeriodicityEnum.X, "pluriannual"), + X34(PeriodicityEnum.X, "pluriannual"), + X35(PeriodicityEnum.X, "pluriannual"), + X36(PeriodicityEnum.X, "pluriannual"), + X37(PeriodicityEnum.X, "pluriannual"), + X38(PeriodicityEnum.X, "pluriannual"), + X39(PeriodicityEnum.X, "pluriannual"), + X40(PeriodicityEnum.X, "pluriannual"), + X41(PeriodicityEnum.X, "pluriannual"), + X42(PeriodicityEnum.X, "pluriannual"), + X43(PeriodicityEnum.X, "pluriannual"), + X44(PeriodicityEnum.X, "pluriannual"), + X45(PeriodicityEnum.X, "pluriannual"), + X46(PeriodicityEnum.X, "pluriannual"), + X47(PeriodicityEnum.X, "pluriannual"), + X48(PeriodicityEnum.X, "pluriannual"), + X49(PeriodicityEnum.X, "pluriannual"), + X50(PeriodicityEnum.X, "pluriannual"), + X51(PeriodicityEnum.X, "pluriannual"), + X52(PeriodicityEnum.X, "pluriannual"), + X53(PeriodicityEnum.X, "pluriannual"), + X54(PeriodicityEnum.X, "pluriannual"), + X55(PeriodicityEnum.X, "pluriannual"), + X56(PeriodicityEnum.X, "pluriannual"), + X57(PeriodicityEnum.X, "pluriannual"), + X58(PeriodicityEnum.X, "pluriannual"), + X59(PeriodicityEnum.X, "pluriannual"), + X60(PeriodicityEnum.X, "pluriannual"), + X61(PeriodicityEnum.X, "pluriannual"), + X62(PeriodicityEnum.X, "pluriannual"), + X63(PeriodicityEnum.X, "pluriannual"), + X64(PeriodicityEnum.X, "pluriannual"), + X65(PeriodicityEnum.X, "pluriannual"), + X66(PeriodicityEnum.X, "pluriannual"), + X67(PeriodicityEnum.X, "pluriannual"), + X68(PeriodicityEnum.X, "pluriannual"), + X69(PeriodicityEnum.X, "pluriannual"), + X70(PeriodicityEnum.X, "pluriannual"), + X71(PeriodicityEnum.X, "pluriannual"), + X72(PeriodicityEnum.X, "pluriannual"), + X73(PeriodicityEnum.X, "pluriannual"), + X74(PeriodicityEnum.X, "pluriannual"), + X75(PeriodicityEnum.X, "pluriannual"), + X76(PeriodicityEnum.X, "pluriannual"), + X77(PeriodicityEnum.X, "pluriannual"), + X78(PeriodicityEnum.X, "pluriannual"), + X79(PeriodicityEnum.X, "pluriannual"), + X80(PeriodicityEnum.X, "pluriannual"), + X81(PeriodicityEnum.X, "pluriannual"), + X82(PeriodicityEnum.X, "pluriannual"), + X83(PeriodicityEnum.X, "pluriannual"), + X84(PeriodicityEnum.X, "pluriannual"), + X85(PeriodicityEnum.X, "pluriannual"), + X86(PeriodicityEnum.X, "pluriannual"), + X87(PeriodicityEnum.X, "pluriannual"), + X88(PeriodicityEnum.X, "pluriannual"), + X89(PeriodicityEnum.X, "pluriannual"), + X90(PeriodicityEnum.X, "pluriannual"), + X91(PeriodicityEnum.X, "pluriannual"), + X92(PeriodicityEnum.X, "pluriannual"), + X93(PeriodicityEnum.X, "pluriannual"), + X94(PeriodicityEnum.X, "pluriannual"), + X95(PeriodicityEnum.X, "pluriannual"), + X96(PeriodicityEnum.X, "pluriannual"), + X97(PeriodicityEnum.X, "pluriannual"), + X98(PeriodicityEnum.X, "pluriannual"), + X99(PeriodicityEnum.X, "pluriannual"), S01(PeriodicityEnum.S, "1st semester"), S02(PeriodicityEnum.S, "2nd semester"), T01(PeriodicityEnum.T, "1st trimester"), From 9387891b423f5076142dab03ff97c1333063c746 Mon Sep 17 00:00:00 2001 From: Eric Thuaud Date: Mon, 10 Jul 2023 10:15:26 +0200 Subject: [PATCH 3/5] fix - enable mirror site access regardless of source accred --- .../query/service/impl/CheckHabilitationServiceImpl.java | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java b/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java index 165c6127..3a060d3f 100644 --- a/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java +++ b/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java @@ -85,14 +85,14 @@ public ResponseEntity checkHabilitation(String role, String idS if(isUserInRole(roles, applicationConfig.getRoleInternalUser())) { if (user.isPresent()) { String userRole; - List accreditedSources = new ArrayList<>(); + //List accreditedSources = new ArrayList<>(); userRole = user.get().getRole().toString(); if (userRole.equals(User.UserRoleType.assistance)) { resp.setHabilitated(false); LOGGER.warn("User '{}' has assistance profile - check habilitation: false", idec); return new ResponseEntity<>(resp, HttpStatus.OK); } - accreditedSources = userService.findAccreditedSources(user.get().getIdentifier()); + /*accreditedSources = userService.findAccreditedSources(user.get().getIdentifier()); Optional campaign = campaignService.findById(campaignId); if (campaign.isPresent()) { String sourceSearched = campaign.get().getSurvey().getSource().getId(); @@ -107,6 +107,9 @@ public ResponseEntity checkHabilitation(String role, String idS } LOGGER.warn("Check habilitation of user {} for accessing survey-unit {} of campaign {} - campaign doesn't exist - check habilitation:false", idec, idSu, campaign); resp.setHabilitated(false); + return new ResponseEntity<>(resp, HttpStatus.OK);*/ + resp.setHabilitated(true); + LOGGER.warn("User '{}' has responsable or gestionnaire profile - check habilitation: true", idec); return new ResponseEntity<>(resp, HttpStatus.OK); } From 1c68dbaf676b37bb75ae4d2d0a90acc979259f43 Mon Sep 17 00:00:00 2001 From: Eric Thuaud Date: Mon, 10 Jul 2023 10:28:49 +0200 Subject: [PATCH 4/5] fix - enable mirror site access regardless of source accred --- .../query/service/impl/CheckHabilitationServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java b/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java index 3a060d3f..6561ff6d 100644 --- a/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java +++ b/src/main/java/fr/insee/survey/datacollectionmanagement/query/service/impl/CheckHabilitationServiceImpl.java @@ -109,7 +109,7 @@ public ResponseEntity checkHabilitation(String role, String idS resp.setHabilitated(false); return new ResponseEntity<>(resp, HttpStatus.OK);*/ resp.setHabilitated(true); - LOGGER.warn("User '{}' has responsable or gestionnaire profile - check habilitation: true", idec); + LOGGER.warn("User '{}' has {} profile - check habilitation: true", idec, userRole); return new ResponseEntity<>(resp, HttpStatus.OK); } From a3e5076be2e7ff304db6f7715c5e467876e1b106 Mon Sep 17 00:00:00 2001 From: Eric Thuaud Date: Thu, 13 Jul 2023 09:59:00 +0200 Subject: [PATCH 5/5] fix - enable mirror site access regardless of source accred --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 2fe4e409..80d7c62e 100644 --- a/pom.xml +++ b/pom.xml @@ -9,7 +9,7 @@ fr.insee.survey platine-management - 1.0.15 + 1.0.15-rc platine-management REST API for communication between DB and Platine-Management UI and Platine-My-Surveys UI