Merge pull request 'develop' (#13) from develop into main

Reviewed-on: #13

.env

@@ -1,3 +1,3 @@
-POSTGRES_DB=fiscad_db
-POSTGRES_USER=fiscad_user
+POSTGRES_DB=abomey_db
+POSTGRES_USER=infocad_user
 POSTGRES_PASSWORD=W5fwD({9*q53

.gitea/workflows/cd-main.yml

@@ -1,48 +1,52 @@
 name: CD - Deploy on main
 
 on:
-  push:
+  pull_request:
     branches:
       - main
 
 jobs:
   deploy:
-    runs-on: [self-hosted, prod]
+    runs-on: self-hosted
 
     steps:
-
-      # 1) Vérifier Node.js (pas d'installation dynamique)
-      - name: Verify Node.js
+      # 1) S'assurer que Node.js est installé
+      - name: Ensure Node.js is installed
         shell: sh
         run: |
           if command -v node >/dev/null 2>&1; then
-            echo "Node.js version:"
-            node -v
+            echo "Node.js already installed: $(node -v)"
           else
-            echo "❌ Node.js is not installed on the runner"
-            exit 1
+            echo "Node.js not found, installing..."
+            apk update && apk add --no-cache nodejs
+            echo "Node.js installed: $(node -v)"
           fi
 
-      # 2) Vérifier Java 17 & Maven (préinstallés sur le VPS)
-      - name: Verify Java & Maven
+      # 2) S'assurer que Java & Maven sont installés
+      - name: Ensure Java & Maven are installed
         shell: sh
         run: |
-          if ! command -v java >/dev/null 2>&1; then
-            echo "❌ Java is not installed on the runner"
-            exit 1
-          fi
-
-          if ! command -v mvn >/dev/null 2>&1; then
-            echo "❌ Maven is not installed on the runner"
-            exit 1
-          fi
-
-          echo "Java version:"
+          if command -v java >/dev/null 2>&1; then
+            echo "Java already installed:"
             java -version
-          echo "Maven version:"
-          mvn -version
+          else
+            echo "Java not found, installing OpenJDK 17..."
+            apk update && apk add --no-cache openjdk17-jdk
+            echo "Java installed:"
+            java -version
+          fi
 
-      # 3) Détecter JAVA_HOME dynamiquement
+          if command -v mvn >/dev/null 2>&1; then
+            echo "Maven already installed:"
+            mvn -version
+          else
+            echo "Maven not found, installing Maven..."
+            apk update && apk add --no-cache maven
+            echo "Maven installed:"
+            mvn -version
+          fi
+
+      # 3) Détecter JAVA_HOME dynamiquement et le propager
       - name: Detect JAVA_HOME dynamically
         shell: sh
         run: |
@@ -52,93 +56,63 @@ jobs:
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
       # 4) Checkout du dépôt
-      #- name: Checkout repository
-      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
       - name: Checkout repository
-        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
+        uses: actions/checkout@v4
 
-      # 5) Informations de contexte (sans secrets)
-      - name: Show context information
+      # 5) Afficher quelques infos utiles
+      - name: Show current commit and tools
         shell: sh
         run: |
-          echo "Commit:"
+          echo "Current commit:"
           git rev-parse HEAD
-          echo "JAVA_HOME=$JAVA_HOME"
+          echo "JAVA_HOME is: $JAVA_HOME"
           java -version
           mvn -version
-          docker --version
-          docker-compose --version || docker compose version
 
-      # 6) Export de la configuration NON sensible
-      - name: Export database configuration
+      # 6) S'assurer que le client Docker + docker-compose sont installés
+      - name: Ensure Docker CLI is installed
         shell: sh
         run: |
-          echo "POSTGRES_DB_FISCAD=fiscad_db" >> "$GITHUB_ENV"
-          echo "POSTGRES_USER_FISCAD=fiscad_user" >> "$GITHUB_ENV"
+          if command -v docker >/dev/null 2>&1; then
+            echo "Docker CLI already installed:"
+            docker version || true
+          else
+            echo "Docker CLI not found, installing..."
+            apk update && apk add --no-cache docker docker-compose
+            echo "Docker CLI installed:"
+            docker version || true
+          fi
 
-      # 7) Création des secrets runtime (PRODUCTION)
-      - name: Create runtime secrets
+      # 7) Générer le .env utilisé par docker-compose-prod.yml
+      - name: Generate .env from Gitea secrets
         shell: sh
         run: |
-          mkdir -p secrets
-          echo "${{ secrets.DEFAULT_USER_NAME }}" > secrets/defaultUserName.txt
-          echo "${{ secrets.DEFAULT_USER_PASSWORD }}" > secrets/defaultUserPassword.txt
-          echo "${{ secrets.POSTGRES_PASSWORD_FISCAD }}" > secrets/postgresPassword.txt
-          chmod 600 secrets/*
+          cat > .env <<EOF
+          POSTGRES_DB_FISCAD=${{ secrets.POSTGRES_DB_FISCAD }}
+          POSTGRES_USER_FISCAD=${{ secrets.POSTGRES_USER_FISCAD }}
+          POSTGRES_PASSWORD_FISCAD=${{ secrets.POSTGRES_PASSWORD_FISCAD }}
+          EOF
+          echo "Generated .env:"
+          cat .env
 
-      # 8) Build Maven (jar final)
+      # 8) Build Maven pour générer le jar dans target/
       - name: Build backend with Maven
         shell: sh
-        run: |
-          mvn -B clean package -DskipTests
+        run: mvn -B clean package
 
-      # 9) Déploiement avec docker-compose (prod)
+      # 9) Déploiement en prod avec docker-compose-prod.yml
       - name: Deploy using docker-compose (prod)
         shell: sh
         run: |
+          # IMPORTANT : on fixe le nom du projet compose
           export COMPOSE_PROJECT_NAME=fiscad
           
-          cd "$GITHUB_WORKSPACE"
-          echo "Workspace: $(pwd)"
-          cat secrets/postgresPassword.txt
-          echo "POSTGRES_DB_FISCAD=$POSTGRES_DB_FISCAD"
-          echo "POSTGRES_USER_FISCAD=$POSTGRES_USER_FISCAD"
-          ls -l secrets/
-
+          # Puis on déploie avec un nom de projet fixe
           docker-compose -f docker-compose-prod.yml pull || true
           docker-compose -f docker-compose-prod.yml down --remove-orphans
           docker-compose -f docker-compose-prod.yml up -d --build
 
-      # 10) Test bloquant : connexion PostgreSQL
-      - name: Test database connection
+      # 10) Nettoyage des images non utilisées
+      - name: Cleanup unused images
         shell: sh
-        run: |
-          echo "⏳ Waiting for PostgreSQL to be ready..."
-          for i in $(seq 1 12); do
-            if docker exec fiscad-db pg_isready -U ${POSTGRES_USER_FISCAD} >/dev/null 2>&1; then
-              break
-            fi
-            sleep 5
-          done
-
-          echo "🔍 Testing database connection..."
-          docker exec fiscad-db sh -c "
-            export PGPASSWORD=\$(cat /run/secrets/postgresPassword) &&
-            psql -h localhost \
-                 -U ${POSTGRES_USER_FISCAD} \
-                 -d ${POSTGRES_DB_FISCAD} \
-                 -c 'SELECT 1;'
-          " 
-
-      # 11) OK Nettoyage des secrets (sécurité OBLIGATOIRE)
-      - name: Cleanup secrets
-        if: always()
-        shell: sh
-        run: |
-          rm -rf secrets
-
-      # 12) Nettoyage des images Docker inutilisées
-      - name: Cleanup unused Docker images
-        shell: sh
-        run: |
-          docker image prune -f || true
+        run: docker image prune -f || true

.gitea/workflows/ci-develop.yml

@@ -10,39 +10,43 @@ jobs:
     runs-on: self-hosted
 
     steps:
-
-      # 1) Vérifier Node.js (aucune installation automatique en CI natif)
-      - name: Verify Node.js
+      # 1) S'assurer que Node.js est installé (utile pour les actions JS comme actions/checkout)
+      - name: Ensure Node.js is installed
         shell: sh
         run: |
           if command -v node >/dev/null 2>&1; then
-            echo "Node.js version:"
-            node -v
+            echo "Node.js already installed: $(node -v)"
           else
-            echo "❌ Node.js is not installed on the runner"
-            exit 1
+            echo "Node.js not found, installing..."
+            apk update && apk add --no-cache nodejs
+            echo "Node.js installed: $(node -v)"
           fi
 
-      # 2) Vérifier Java & Maven (préinstallés sur le VPS)
-      - name: Verify Java & Maven
+      # 2) S'assurer que Java + Maven sont installés
+      - name: Ensure Java & Maven are installed
         shell: sh
         run: |
-          if ! command -v java >/dev/null 2>&1; then
-            echo "❌ Java is not installed on the runner"
-            exit 1
-          fi
-
-          if ! command -v mvn >/dev/null 2>&1; then
-            echo "❌ Maven is not installed on the runner"
-            exit 1
-          fi
-
-          echo "Java version:"
+          if command -v java >/dev/null 2>&1; then
+            echo "Java already installed:"
             java -version
-          echo "Maven version:"
-          mvn -version
+          else
+            echo "Java not found, installing OpenJDK 17..."
+            apk update && apk add --no-cache openjdk17-jdk
+            echo "Java installed:"
+            java -version
+          fi
 
-      # 3) Détecter JAVA_HOME dynamiquement
+          if command -v mvn >/dev/null 2>&1; then
+            echo "Maven already installed:"
+            mvn -version
+          else
+            echo "Maven not found, installing Maven..."
+            apk update && apk add --no-cache maven
+            echo "Maven installed:"
+            mvn -version
+          fi
+
+      # 3) Détecter automatiquement JAVA_HOME et le propager au reste du job
       - name: Detect JAVA_HOME dynamically
         shell: sh
         run: |
@@ -51,31 +55,19 @@ jobs:
           echo "Detected JAVA_HOME=$JAVA_HOME"
           echo "JAVA_HOME=$JAVA_HOME" >> "$GITHUB_ENV"
 
-      # 4) Checkout du dépôt
-      #- name: Checkout repository
-      #  uses: https://gitea.com/actions/checkout@v4 #actions/checkout@v4
+      # 4) Checkout du dépôt (Node est déjà garanti à ce stade)
       - name: Checkout repository
-        run: git clone ${{ gitea.server_url }}/${{ gitea.repository }} .
+        uses: actions/checkout@v4
 
-      # 5) Création des secrets runtime (CI uniquement)
-      - name: Create runtime secrets
+      # 5) Vérification des versions (pour les logs)
+      - name: Show Java & Maven versions
         shell: sh
         run: |
-          mkdir -p secrets
-          echo "${{ secrets.DEFAULT_USER_NAME }}" > secrets/defaultUserName.txt
-          echo "${{ secrets.DEFAULT_USER_PASSWORD }}" > secrets/defaultUserPassword.txt
-          echo "${{ secrets.POSTGRES_PASSWORD_FISCAD }}" > secrets/postgresPassword.txt
-          chmod 600 secrets/*
+          echo "JAVA_HOME is: $JAVA_HOME"
+          java -version
+          mvn -version
 
-      # 6) Build & tests Maven
-      - name: Build & Test with Maven
+      # 6) Build Maven
+      - name: Build with Maven
         shell: sh
-        run: |
-          mvn -B clean verify
-
-      # 7) Nettoyage des secrets (sécurité)
-      - name: Cleanup secrets
-        if: always()
-        shell: sh
-        run: |
-          rm -rf secrets
+        run: mvn -B clean verify

.gitignore

@@ -3,6 +3,3 @@ fiscad.log*
 .DS_Store
 target/*
 ansible
-secrets/
-.env
-/uploads/

Dockerfile

@@ -11,5 +11,4 @@ COPY  ./target/Fiscad-0.0.1-SNAPSHOT.jar fiscad.jar
 EXPOSE 8282
 
 # Lancer l'application
-#ENTRYPOINT ["java", "-jar", "fiscad.jar"]
-ENTRYPOINT ["sh", "-c", "export SPRING_DATASOURCE_PASSWORD=$(cat /run/secrets/postgresPassword) && export DEFAULT_USER_NAME=$(cat /run/secrets/defaultUserName) && export DEFAULT_USER_PASSWORD=$(cat /run/secrets/defaultUserPassword) && exec java -jar fiscad.jar"]
+ENTRYPOINT ["java", "-jar", "fiscad.jar"]

db-init/01-enable-postgis.sql

@@ -1,3 +0,0 @@
-CREATE EXTENSION IF NOT EXISTS postgis;
-CREATE EXTENSION IF NOT EXISTS postgis_topology;
-CREATE EXTENSION IF NOT EXISTS pg_cron;

docker-compose-prod.yml

@@ -1,76 +1,46 @@
+version: '3.9'
+
 services:
 
   db:
-    image: postgis/postgis:15-3.4
+    image: postgres:15
     container_name: fiscad-db
     restart: always
-
     environment:
       POSTGRES_DB: ${POSTGRES_DB_FISCAD}
       POSTGRES_USER: ${POSTGRES_USER_FISCAD}
-      POSTGRES_PASSWORD_FILE: /run/secrets/postgresPassword
-
-    secrets:
-      - postgresPassword
-
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD_FISCAD}
     ports:
       - "5432:5432"
-
     volumes:
       - db-data-fiscad:/var/lib/postgresql/data
-      - ./db-init:/docker-entrypoint-initdb.d
-
     healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD} -d ${POSTGRES_DB_FISCAD}"]
+      test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER_FISCAD}"]
       interval: 10s
       timeout: 5s
       retries: 5
 
-
   app:
     build:
       context: .
       dockerfile: Dockerfile
     container_name: fiscad-app
-    restart: on-failure
-
     depends_on:
-      db:
-        condition: service_healthy
-
+      - db
     environment:
       SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}
       SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER_FISCAD}
-
+      SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD_FISCAD}
       SERVER_PORT: 8282
-      IO_GMSS_FISCAD_PROFILE: dgi
-      SPRING_PROFILES_ACTIVE: dgi
-
-      DEFAULT_USER_NAME_FILE: /run/secrets/defaultUserName
-      DEFAULT_USER_PASSWORD_FILE: /run/secrets/defaultUserPassword
-
-    secrets:
-      - postgresPassword
-      - defaultUserName
-      - defaultUserPassword
-
+      IO_GMSS_FISCAD_PROFILE: abomey
+      SPRING_PROFILES_ACTIVE: abomey
     ports:
       - "8282:8282"
-
     volumes:
       - /fiscad/uploads:/app/uploads
       - /fiscad/jasperReport:/app/jasperReport
       - /fiscad/logs:/app/logs
-
+    restart: on-failure
 
 volumes:
   db-data-fiscad:
-
-
-secrets:
-  postgresPassword:
-    file: ./secrets/postgresPassword.txt
-  defaultUserName:
-    file: ./secrets/defaultUserName.txt
-  defaultUserPassword:
-    file: ./secrets/defaultUserPassword.txt

docker-compose.yml

@@ -1,4 +1,4 @@
-#version: '3.9'
+version: '3.9'
 
 services:
 
@@ -6,73 +6,41 @@ services:
     image: postgres:15
     container_name: fiscad-db
     restart: always
-
     environment:
-      POSTGRES_DB: ${POSTGRES_DB_FISCAD}
-      POSTGRES_USER: ${POSTGRES_USER_FISCAD}
-      POSTGRES_PASSWORD_FILE: /run/secrets/postgresPassword
-
-    secrets:
-      - postgresPassword
-
+      POSTGRES_DB: ${POSTGRES_DB}
+      POSTGRES_USER: ${POSTGRES_USER}
+      POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
     ports:
       - "5432:5432"
-
     volumes:
       - db-data:/var/lib/postgresql/data
-
     healthcheck:
       test: ["CMD-SHELL", "pg_isready -U ${POSTGRES_USER}"]
       interval: 10s
       timeout: 5s
       retries: 5
 
-
   app:
     build:
       context: .
       dockerfile: Dockerfile
     container_name: fiscad-app
-    restart: on-failure
-
     depends_on:
       - db
-
     environment:
-      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB_FISCAD}
-      SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER_FISCAD}
-      SPRING_DATASOURCE_PASSWORD_FILE: /run/secrets/postgresPassword
-
+      SPRING_DATASOURCE_URL: jdbc:postgresql://db:5432/${POSTGRES_DB}
+      SPRING_DATASOURCE_USERNAME: ${POSTGRES_USER}
+      SPRING_DATASOURCE_PASSWORD: ${POSTGRES_PASSWORD}
       SERVER_PORT: 8282
       IO_GMSS_FISCAD_PROFILE: dgi
       SPRING_PROFILES_ACTIVE: dgi
-
-      # 🔐 Secrets Spring (fichiers)
-      DEFAULT_USER_NAME_FILE: /run/secrets/defaultUserName
-      DEFAULT_USER_PASSWORD_FILE: /run/secrets/defaultUserPassword
-
-    secrets:
-      - defaultUserName
-      - defaultUserPassword
-      - postgresPassword
-
     ports:
       - "8282:8282"
-
     volumes:
       - ./uploads:/app/uploads
       - ./jasperReport:/app/jasperReport
       - ./logs:/app/logs
-
+    restart: on-failure
 
 volumes:
   db-data:
-
-
-secrets:
-  defaultUserName:
-    file: /secrets/defaultUserName.txt
-  defaultUserPassword:
-    file: ./secrets/defaultUserPassword.txt
-  postgresPassword:
-    file: ./secrets/postgresPassword.txt

pom.xml

@@ -73,7 +73,6 @@
             <scope>runtime</scope>
         </dependency>
 
-
         <dependency>
             <groupId>net.sf.jasperreports</groupId>
             <artifactId>jasperreports</artifactId>
@@ -150,24 +149,7 @@
             <scope>provided</scope>
         </dependency>
 
-        <dependency>
-            <groupId>com.wildbit.java</groupId>
-            <artifactId>postmark</artifactId>
-            <version>1.7.6</version>
-        </dependency>
 
-        <dependency>
-            <groupId>org.apache.httpcomponents.client5</groupId>
-            <artifactId>httpclient5</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jsr310</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>com.fasterxml.jackson.datatype</groupId>
-            <artifactId>jackson-datatype-jdk8</artifactId>
-        </dependency>
     </dependencies>
     <dependencyManagement>
         <dependencies>

secrets/defaultUserName.txt

@@ -1 +0,0 @@
-infocad_admin

secrets/defaultUserPassword.txt

@@ -1 +0,0 @@
-admin@123

src/main/java/io/gmss/fiscad/component/DataLoadConfig.java

@@ -3,8 +3,8 @@ package io.gmss.fiscad.component;
 import io.gmss.fiscad.entities.user.Role;
 import io.gmss.fiscad.entities.user.User;
 import io.gmss.fiscad.enums.UserRole;
-import io.gmss.fiscad.persistence.repositories.user.RoleRepository;
-import io.gmss.fiscad.persistence.repositories.user.UserRepository;
+import io.gmss.fiscad.repositories.user.RoleRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
 import jakarta.annotation.PostConstruct;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.security.crypto.password.PasswordEncoder;
@@ -20,12 +20,8 @@ public class DataLoadConfig {
     private final UserRepository userRepository;
     private final PasswordEncoder passwordEncoder;
 
-    @Value("${app.default-user.username}")
-    private String usernameFile;
-
-    @Value("${app.default-user.password}")
-    private String passwordFile;
-
+    @Value("${app.sourcemind.env.defaultpassword}")
+    private String defaultPassword;
 
     public DataLoadConfig(RoleRepository roleRepository, UserRepository userRepository, PasswordEncoder passwordEncoder) {
         this.roleRepository = roleRepository;
@@ -42,25 +38,32 @@ public class DataLoadConfig {
 
 
     public void loadRoles() {
+
         if (roleRepository.count() > 0) return;
         Set<Role> roles = new HashSet<>();
-        roles.add(new Role(UserRole.CREATE_USER, "Peut créer un utilisation."));
-        roles.add(new Role(UserRole.READ_USER, "peut lire un utilisation"));
-        roles.add(new Role(UserRole.UPDATE_USER, "peut modifier un utilisation"));
-        roles.add(new Role(UserRole.DELETE_USER, "peut supprimer un utilisation"));
+        roles.add(new Role(UserRole.ROLE_USER, "Role attribué aux utilisateurs simples."));
+        roles.add(new Role(UserRole.ROLE_ADMIN, "Role attribué aux administrateurs du système."));
+        roles.add(new Role(UserRole.ROLE_DIRECTEUR, "Role attribué aux directeurs des structures."));
+        roles.add(new Role(UserRole.ROLE_SUPERVISEUR, "Role attribué aux superviseurs des structures sur le terrain."));
+        roles.add(new Role(UserRole.ROLE_ENQUETEUR, "Role attribué aux enquêteurs des structures sur le terrain."));
+        roles.add(new Role(UserRole.ROLE_ANONYMOUS, "Role attribué à toutes les personnes qui s'inscrivent en ligne pour le compte d'une structure."));
         roleRepository.saveAll(roles);
+
     }
 
     public void loadUsers() {
-        if (!userRepository.existsByUsername(usernameFile) ) {
+        if (userRepository.countAllByUsernameIsNotNull() == 0) {
             User admin = new User();
-            admin.setUsername(usernameFile);
+            admin.setUsername("administrateur@infocad.bj");
             admin.setEmail("administrateur@infocad.bj");
             admin.setTel("N/A");
             admin.setNom("Administrateur");
             admin.setPrenom("Principal");
-            admin.setPassword(passwordEncoder.encode(passwordFile));
+            admin.setPassword(passwordEncoder.encode(defaultPassword));
             admin.setActive(true);
+            Set<Role> roles = new HashSet<>();
+            roles.add(roleRepository.findRoleByNom(UserRole.ROLE_ADMIN).get());
+            admin.setRoles(roles);
             userRepository.save(admin);
         }
     }

src/main/java/io/gmss/fiscad/configuration/ApplicationConfig.java

@@ -1,13 +1,9 @@
 package io.gmss.fiscad.configuration;
 
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
 import io.gmss.fiscad.security.CustomUserDetailsService;
 import io.gmss.fiscad.security.JwtAuthenticationFilter;
 import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.security.authentication.AuthenticationManager;
@@ -67,7 +63,4 @@ public class ApplicationConfig {
 
         return authenticationManagerBuilder.build();
     }
-
-
-
 }

src/main/java/io/gmss/fiscad/configuration/AuditConfig.java

@@ -1,7 +1,7 @@
 package io.gmss.fiscad.configuration;
 
 
-import io.gmss.fiscad.persistence.repositories.user.UserRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.data.domain.AuditorAware;

src/main/java/io/gmss/fiscad/configuration/AuditorAwareImpl.java

@@ -1,6 +1,6 @@
 package io.gmss.fiscad.configuration;
 
-import io.gmss.fiscad.persistence.repositories.user.UserRepository;
+import io.gmss.fiscad.repositories.user.UserRepository;
 import io.gmss.fiscad.security.UserPrincipal;
 import org.springframework.data.domain.AuditorAware;
 import org.springframework.security.authentication.AnonymousAuthenticationToken;

src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java

@@ -48,7 +48,7 @@ import io.swagger.v3.oas.annotations.servers.Server;
 )
 @SecurityScheme(
         name = "bearer",
-        description = "Authentification Json BatimentPaylaodWeb Token",
+        description = "Authentification Json Web Token",
         scheme = "Bearer",
         type = SecuritySchemeType.HTTP,
         bearerFormat = "JWT",

src/main/java/io/gmss/fiscad/configuration/RestTemplateConfig.java

@@ -1,50 +0,0 @@
-package io.gmss.fiscad.configuration;
-
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.fasterxml.jackson.datatype.jdk8.Jdk8Module;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-import org.springframework.boot.autoconfigure.jackson.Jackson2ObjectMapperBuilderCustomizer;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.converter.json.MappingJackson2HttpMessageConverter;
-import org.springframework.web.client.RestTemplate;
-
-@Configuration
-public class RestTemplateConfig {
-
-    @Bean
-    public ObjectMapper objectMapper() {
-        ObjectMapper mapper = new ObjectMapper();
-        mapper.registerModule(new JavaTimeModule());
-        mapper.registerModule(new Jdk8Module());
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        return mapper;
-    }
-
-    @Bean
-    public Jackson2ObjectMapperBuilderCustomizer jsonCustomizer() {
-        return builder -> {
-            builder.modules(new JavaTimeModule(), new Jdk8Module());
-            builder.featuresToDisable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-        };
-    }
-
-    @Bean
-    public RestTemplate restTemplate(ObjectMapper mapper) {
-
-        mapper.registerModule(new JavaTimeModule());
-        mapper.disable(SerializationFeature.WRITE_DATES_AS_TIMESTAMPS);
-
-        MappingJackson2HttpMessageConverter converter =
-                new MappingJackson2HttpMessageConverter(mapper);
-
-        RestTemplate restTemplate = new RestTemplate();
-        restTemplate.getMessageConverters().removeIf(
-                c -> c instanceof MappingJackson2HttpMessageConverter
-        );
-        restTemplate.getMessageConverters().add(converter);
-
-        return restTemplate;
-    }
-}

src/main/java/io/gmss/fiscad/configuration/SecurityConfig.java

@@ -1,120 +0,0 @@
-//package io.gmss.fiscad.configuration;
-//
-//import com.backend.api.security.CustomUserDetailsService;
-//import com.backend.api.security.JwtAuthenticationEntryPoint;
-//import com.backend.api.security.JwtAuthenticationFilter;
-//import org.springframework.beans.factory.annotation.Autowired;
-//import org.springframework.context.annotation.Bean;
-//import org.springframework.context.annotation.Configuration;
-//import org.springframework.http.HttpMethod;
-//import org.springframework.security.authentication.AuthenticationManager;
-//import org.springframework.security.config.BeanIds;
-//import org.springframework.security.config.annotation.authentication.builders.AuthenticationManagerBuilder;
-//import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
-//import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-//import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-//import org.springframework.security.config.annotation.web.configuration.WebSecurityConfigurerAdapter;
-//import org.springframework.security.config.http.SessionCreationPolicy;
-//import org.springframework.security.crypto.bcrypt.BCryptPasswordEncoder;
-//import org.springframework.security.crypto.password.PasswordEncoder;
-//import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-//
-//@Configuration
-//@EnableWebSecurity // active la sécurité  web sur le projet
-//@EnableGlobalMethodSecurity( // est utilisé pour définir la sécurité sur les méthodes
-//        securedEnabled = true, // est activé pour protéger un controlleur ou un service
-//        jsr250Enabled = true, // active le role qui doit être utilisé
-//        prePostEnabled = true // active le controle avant et après l'execution de la requête
-//)
-//public class SecurityConfig extends WebSecurityConfigurerAdapter {
-//
-//    /**
-//     * Est utilisé pour authentifier un utlisateur ou pour définir un role
-//     */
-//    @Autowired
-//    CustomUserDetailsService customUserDetailsService;
-//
-//    @Autowired
-//    private JwtAuthenticationEntryPoint unauthorizedHandler;
-//
-//    @Bean
-//    public JwtAuthenticationFilter jwtAuthenticationFilter() {
-//        return new JwtAuthenticationFilter();
-//    }
-//
-//
-//
-//    private static final String[] AUTH_WHITELIST = {
-//
-//            // -- swagger ui
-//            "/swagger-resources/**",
-//            "/swagger-ui.html",
-//            "/v3/api-docs",
-//            "/swagger-ui/**",
-//            "/webjars/**",
-//            "/api/**",
-////            "/api/synonym/**",
-//            "/api/auth/**"
-//    };
-//    @Override
-//    public void configure(AuthenticationManagerBuilder authenticationManagerBuilder) throws Exception {
-//        authenticationManagerBuilder
-//                .userDetailsService(customUserDetailsService)
-//                .passwordEncoder(passwordEncoder());
-//    }
-//
-//    @Bean(BeanIds.AUTHENTICATION_MANAGER)
-//    @Override
-//    public AuthenticationManager authenticationManagerBean() throws Exception {
-//        return super.authenticationManagerBean();
-//    }
-//
-//    @Bean
-//    public PasswordEncoder passwordEncoder() {
-//        return new BCryptPasswordEncoder();
-//    }
-//
-//    /**
-//     *
-//     * @param http
-//     * @throws Exception
-//     */
-//    @Override
-//    protected void configure(HttpSecurity http) throws Exception {
-//        http
-//                .cors()
-//                .and()
-//                .csrf()
-//                .disable()
-//                .exceptionHandling()
-//                .authenticationEntryPoint(unauthorizedHandler)
-//                .and()
-//                .sessionManagement()
-//                .sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-//                .and()
-//                .authorizeRequests()
-//                .antMatchers("/",
-//                        "/favicon.ico",
-//                        "/**/*.png",
-//                        "/**/*.gif",
-//                        "/**/*.svg",
-//                        "/**/*.jpg",
-//                        "/**/*.html",
-//                        "/**/*.css",
-//                        "/**/*.js")
-//                .permitAll()
-//                .antMatchers(AUTH_WHITELIST).permitAll()
-//                .antMatchers("/api/auth/**")
-//                .permitAll()
-//                .antMatchers("/api/user/checkUsernameAvailability", "/api/user/checkEmailAvailability")
-//                .permitAll()
-//                .antMatchers(HttpMethod.GET, "/api/polls/**", "/api/users/**")
-//                .permitAll()
-//                .anyRequest()
-//                .authenticated();
-//
-//        // Add our custom JWT security filter
-//        http.addFilterBefore(jwtAuthenticationFilter(), UsernamePasswordAuthenticationFilter.class);
-//
-//    }
-//}

src/main/java/io/gmss/fiscad/configuration/SpringSecurityConfig.java

@@ -1,113 +1,11 @@
 package io.gmss.fiscad.configuration;
+
+
 import io.gmss.fiscad.security.JwtAuthenticationEntryPoint;
 import io.gmss.fiscad.security.JwtAuthenticationFilter;
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
-import org.springframework.security.authentication.AuthenticationProvider;
-import org.springframework.security.config.annotation.method.configuration.EnableMethodSecurity;
-import org.springframework.security.config.annotation.web.builders.HttpSecurity;
-import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
-import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
-import org.springframework.security.config.http.SessionCreationPolicy;
-import org.springframework.security.web.SecurityFilterChain;
-import org.springframework.security.web.authentication.UsernamePasswordAuthenticationFilter;
-import org.springframework.web.cors.CorsConfiguration;
-import org.springframework.web.cors.CorsConfigurationSource;
-
-import java.util.List;
-
-@EnableWebSecurity
-@Configuration
-@EnableMethodSecurity(securedEnabled = true, jsr250Enabled = true, prePostEnabled = true)
-@RequiredArgsConstructor
-public class SpringSecurityConfig {
-
-    private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
-    private final AuthenticationProvider authenticationProvider;
-    private final JwtAuthenticationFilter jwtAuthenticationFilter;
-
-    private static final String[] PUBLIC_ENDPOINTS = {
-            "/api/auth/login",
-            "/api/open/**",
-            "/api/synchronisation/references",
-            "/v3/api-docs/**",
-            "/swagger-ui/**",
-            "/swagger-ui.html",
-            "/error",
-            "/api/**"   // A ENLEVER AVANT LA MISE EN PRODUCTION
-    };
-
-    @Bean
-    public SecurityFilterChain securityFilterChain(HttpSecurity http) throws Exception {
-
-        http
-                // Désactivation CSRF car JWT stateless
-                .csrf(AbstractHttpConfigurer::disable)
-
-                // CORS configuration propre
-                .cors(cors -> cors.configurationSource(corsConfigurationSource()))
-
-                // Gestion des exceptions d’authentification
-                .exceptionHandling(exception ->
-                        exception.authenticationEntryPoint(jwtAuthenticationEntryPoint)
-                )
-
-                // Stateless session
-                .sessionManagement(session ->
-                        session.sessionCreationPolicy(SessionCreationPolicy.STATELESS)
-                )
-
-                // Configuration des autorisations
-                .authorizeHttpRequests(auth -> auth
-                        // Autoriser les requêtes OPTIONS (CORS preflight)
-                        .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
-
-                        // Endpoints publics
-                        .requestMatchers(PUBLIC_ENDPOINTS).permitAll()
-
-                        // Tout le reste nécessite authentification
-                        .anyRequest().authenticated()
-                )
-
-                // Provider d’authentification
-                .authenticationProvider(authenticationProvider)
-
-                // Ajout du filtre JWT avant UsernamePasswordAuthenticationFilter
-                .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class);
-
-        return http.build();
-    }
-
-    /**
-     * Configuration CORS centralisée.
-     * ⚠️ En production, remplacer "*" par ton domaine frontend.
-     */
-    @Bean
-    public CorsConfigurationSource corsConfigurationSource() {
-        return request -> {
-            CorsConfiguration configuration = new CorsConfiguration();
-
-            configuration.setAllowedOrigins(List.of("*")); // ⚠️ restreindre en prod
-            configuration.setAllowedMethods(List.of("GET", "POST", "PUT", "DELETE", "PATCH", "OPTIONS"));
-            configuration.setAllowedHeaders(List.of("*"));
-            configuration.setAllowCredentials(false);
-
-            return configuration;
-        };
-    }
-}
-
-
-
-/*
-import io.gmss.fiscad.security.JwtAuthenticationEntryPoint;
-import io.gmss.fiscad.security.JwtAuthenticationFilter;
-import lombok.RequiredArgsConstructor;
-import org.springframework.context.annotation.Bean;
-import org.springframework.context.annotation.Configuration;
-import org.springframework.http.HttpMethod;
 import org.springframework.security.authentication.AuthenticationProvider;
 import org.springframework.security.config.annotation.method.configuration.EnableGlobalMethodSecurity;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
@@ -129,15 +27,16 @@ public class SpringSecurityConfig {
     private final JwtAuthenticationEntryPoint jwtAuthenticationEntryPoint;
     private final AuthenticationProvider authenticationProvider;
     private final JwtAuthenticationFilter jwtAuthenticationFilter;
+
+
     private static final String[] AUTH_WHITELIST = {
-          //  "/api/**",
+            "/api/**",
             "/api/auth/login",
             "/api/open/**",
             "/api/synchronisation/references",
             "/v3/api-docs/**",
             "/swagger-ui/**",
-            "/swagger-ui.html",
-            "/error"
+            "/swagger-ui.html"
 
     };
 
@@ -159,7 +58,7 @@ public class SpringSecurityConfig {
                 .exceptionHandling(ex -> ex.authenticationEntryPoint(jwtAuthenticationEntryPoint))
                 .authorizeHttpRequests(req ->
                         req
-                                .requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
+                                //.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
                                 .requestMatchers(AUTH_WHITELIST).permitAll()
                                 .anyRequest()
                                 .authenticated()
@@ -167,8 +66,11 @@ public class SpringSecurityConfig {
                 .authenticationProvider(authenticationProvider)
                 .sessionManagement(session -> session.sessionCreationPolicy(STATELESS))
                 .addFilterBefore(jwtAuthenticationFilter, UsernamePasswordAuthenticationFilter.class)
+
         ;
+
         return http.build();
     }
-}*/
 
+
+}

src/main/java/io/gmss/fiscad/controllers/decoupage/ArrondissementController.java

@@ -27,7 +27,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Arrondissement")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class ArrondissementController {
 
     private final ArrondissementService arrondissementService;
@@ -175,7 +175,7 @@ public class ArrondissementController {
     public ResponseEntity<?> getArrondissementById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, arrondissementService.getArrondissementById(id).orElse(null), "Arrondissement trouvé avec succès."),
+                    new ApiResponse<>(true, arrondissementService.getArrondissementById(id), "Arrondissement trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -199,31 +199,7 @@ public class ArrondissementController {
     public ResponseEntity<?> getArrondissementByCommune(@PathVariable Long communeId) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, arrondissementService.getArrondissementListByCommuneId(communeId), "Liste des arrondissements par commune chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/commune/{communeId}")
-    public ResponseEntity<?> getArrondissementByCommune(@PathVariable Long communeId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, arrondissementService.getArrondissementListByCommuneId(communeId,pageable), "Liste des arrondissements par commune chargée avec succès."),
+                    new ApiResponse<>(true, arrondissementService.getArrondissementByComune(communeId), "Liste des arrondissements par commune chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/decoupage/CommuneController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Commune")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class CommuneController {
 
     private final CommuneService communeService;
@@ -185,31 +185,7 @@ public class CommuneController {
 
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeService.getCommunesByDepartementId(departementId), "Liste des communes par département chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-departement-id/{departementId}")
-    public ResponseEntity<?> getCommuneByDepartementIdPaged(@PathVariable Long departementId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, communeService.getCommunesByDepartementId(departementId,pageable), "Liste des communes par département chargée avec succès."),
+                    new ApiResponse<>(true, communeService.getCommunesByDepartement(departementId), "Liste des communes par département chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/decoupage/DepartementController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Département")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class DepartementController {
 
     private final DepartementService departementService;

src/main/java/io/gmss/fiscad/controllers/decoupage/NationaliteController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Nationalité")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class NationaliteController {
 
     private final NationaliteService nationaliteService;

src/main/java/io/gmss/fiscad/controllers/decoupage/QuartierController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Quartier")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class QuartierController {
 
     private final QuartierService quartierService;
@@ -158,7 +158,7 @@ public class QuartierController {
     public ResponseEntity<?> getQuartierById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, quartierService.getQuartierById(id).orElse(null), "Quartier trouvé avec succès."),
+                    new ApiResponse<>(true, quartierService.getQuartierById(id), "Quartier trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -182,31 +182,7 @@ public class QuartierController {
 
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, quartierService.getQuartierListByArrondissementId(arrondissementId), "Liste des quartiers par commune chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/arrondissement/{arrondissementId}")
-    public ResponseEntity<?> getQuartierByArrondissementPaged(@PathVariable Long arrondissementId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, quartierService.getQuartierListByArrondissementId(arrondissementId,pageable), "Liste des quartiers par commune chargée avec succès."),
+                    new ApiResponse<>(true, quartierService.getQuartierByArrondissement(arrondissementId), "Liste des quartiers par commune chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java

@@ -4,10 +4,7 @@ import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb;
-import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
+import io.gmss.fiscad.paylaods.request.SecteurPayload;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.slf4j.Logger;
@@ -25,9 +22,9 @@ import org.springframework.web.client.HttpClientErrorException;
 
 @RestController
 @RequestMapping(value = "api/secteur", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
+//@SecurityRequirement(name = "bearer")
 @Tag(name = "Secteur")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class SecteurController {
 
     private final SecteurService secteurService;
@@ -37,16 +34,14 @@ public class SecteurController {
         this.secteurService = secteurService;
     }
 
-    @Operation(
-            summary = "Créer un secteur",
-            description = "Permet de Créer un secteur"
-    )
+
     @PostMapping("/create")
-    public ResponseEntity<?> createSecteur(@RequestBody @Valid @Validated SecteurPaylaodWeb secteurPaylaodWeb) {
+    public ResponseEntity<?> createSecteur(@RequestBody @Valid @Validated SecteurPayload secteurPayload) {
         try {
-            secteurPaylaodWeb = secteurService.createSecteur(secteurPaylaodWeb);
+            // Secteur secteur=getSecteurFromPayload(secteurPayload);
+            Secteur secteur = secteurService.createSecteur(secteurPayload);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurPaylaodWeb, "Secteur créé avec  succès."),
+                    new ApiResponse<>(true, secteur, "Secteur créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -65,15 +60,12 @@ public class SecteurController {
         }
     }
 
-    @Operation(
-            summary = "mettre à jour un secteur",
-            description = "Permet de modifier un secteur"
-    )
+
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateSecteur(@PathVariable Long id, @RequestBody SecteurPaylaodWeb secteurPayloadWeb) {
+    public ResponseEntity<?> updateSecteur(@PathVariable Long id, @RequestBody SecteurPayload secteurPayload) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.updateSecteur(id, secteurPayloadWeb), "Secteur mis à jour avec succès."),
+                    new ApiResponse<>(true, secteurService.updateSecteur(id, secteurPayload), "Secteur mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -91,10 +83,7 @@ public class SecteurController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    @Operation(
-            summary = "supprimer un secteur",
-            description = "Permet de supprimer un secteur"
-    )
+
     @DeleteMapping("/delete/{id}")
     public ResponseEntity<?> deleteSecteurr(@PathVariable Long id) {
         try {
@@ -118,10 +107,7 @@ public class SecteurController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    @Operation(
-            summary = "recuperer tous les secteurs",
-            description = "Permet de récuperer l'ensemble des secteurs"
-    )
+
     @GetMapping("/all")
     public ResponseEntity<?> getAllSecteurList() {
         try {
@@ -145,10 +131,6 @@ public class SecteurController {
         }
     }
 
-    @Operation(
-            summary = "recuperer tous les secteurs avec pagination",
-            description = "Permet de récuperer l'ensemble des secteurs avec pagination"
-    )
     @GetMapping("/all-paged")
     public ResponseEntity<?> getAllSecteurPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
@@ -173,10 +155,6 @@ public class SecteurController {
         }
     }
 
-    @Operation(
-            summary = "recuperer un secteurs par son ID ",
-            description = "Permet de récuperer le secteur ayant l'ID fournie en path"
-    )
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getSecteurById(@PathVariable Long id) {
         try {
@@ -200,15 +178,12 @@ public class SecteurController {
         }
     }
 
-    @Operation(
-            summary = "recuperer tous les secteurs d'une structure",
-            description = "Permet de récuperer l'ensemble des secteurs de la structure dont l'ID est fourni en path"
-    )
+
     @GetMapping("/by-structure-id/{structureId}")
     public ResponseEntity<?> getSecteurByStructureId(@PathVariable Long structureId) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.getSecteurListByStructureId(structureId), "Secteur trouvée avec succès."),
+                    new ApiResponse<>(true, secteurService.getSecteurListUneStruture(structureId), "Secteur trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -228,118 +203,4 @@ public class SecteurController {
     }
 
 
-    @Operation(
-            summary = "recuperer tous les secteurs d'une structure",
-            description = "Permet de récuperer l'ensemble des secteurs de la structure dont l'ID est fourni en path avec pagination"
-    )
-    @GetMapping("/page/by-structure-id/{structureId}")
-    public ResponseEntity<?> getSecteurByStructureIdPage(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.getSecteurListByStructureId(structureId,pageable), "Secteur trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @Operation(
-            summary = "recuperer tous les secteurs d'une section",
-            description = "Permet de récuperer l'ensemble des secteurs de la section dont l'ID est fourni en path"
-    )
-    @GetMapping("/by-section-id/{sectionId}")
-    public ResponseEntity<?> getSecteurBySectionId(@PathVariable Long sectionId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.getSecteurListBySectionId(sectionId), "Secteur trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "recuperer tous les secteurs d'une section avec pagination",
-            description = "Permet de récuperer l'ensemble des secteurs de la section dont l'ID est fourni en path avec pagination"
-    )
-    @GetMapping("/page/by-section-id/{sectionId}")
-    public ResponseEntity<?> getSecteurBySectionIdPage(@PathVariable Long sectionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.getSecteurListBySectionId(sectionId,pageable), "Secteur trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "recuperer tous les secteurs d'un departement",
-            description = "Permet de récuperer l'ensemble des secteurs du departement dont l'ID est fourni en path"
-    )
-    @GetMapping("/by-departement-id/{departementId}")
-    public ResponseEntity<?> getSecteurByDepartementId(@PathVariable Long departementId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurService.getListSecteurByDepartementId(departementId), "Secteur trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
 }

src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurDecoupageController.java

@@ -3,13 +3,10 @@ package io.gmss.fiscad.controllers.decoupage;
 import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
-import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.SecteurDecoupagePaylaodWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.PageRequest;
@@ -21,26 +18,29 @@ import org.springframework.security.access.prepost.PreAuthorize;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
-@AllArgsConstructor
+
+
 @RestController
 @RequestMapping(value = "api/secteur-decoupage", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "SecteurDecoupage")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
+@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class SecteurDecoupageController {
 
     private final SecteurDecoupageService secteurDecoupageService;
-    private final SecteurService secteurService;
     private static final Logger logger = LoggerFactory.getLogger(SecteurDecoupageController.class);
 
+    public SecteurDecoupageController(SecteurDecoupageService secteurDecoupageService) {
+        this.secteurDecoupageService = secteurDecoupageService;
+    }
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createSecteurDecoupage(@RequestBody @Valid @Validated SecteurDecoupagePaylaodWeb secteurDecoupagePaylaodWeb) {
+    public ResponseEntity<?> createSecteurDecoupage(@RequestBody @Valid @Validated SecteurDecoupage secteurDecoupage) {
         try {
-            secteurDecoupagePaylaodWeb = secteurDecoupageService.createSecteurDecoupage(secteurDecoupagePaylaodWeb);
+            secteurDecoupage = secteurDecoupageService.createSecteurDecoupage(secteurDecoupage);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupagePaylaodWeb, "SecteurDecoupage créé avec  succès."),
+                    new ApiResponse<>(true, secteurDecoupage, "SecteurDecoupage créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -60,10 +60,10 @@ public class SecteurDecoupageController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateSecteurDecoupage(@PathVariable Long id, @RequestBody SecteurDecoupagePaylaodWeb secteurDecoupagePaylaodWeb) {
+    public ResponseEntity<?> updateSecteurDecoupage(@PathVariable Long id, @RequestBody SecteurDecoupage secteurDecoupage) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.updateSecteurDecoupage(id, secteurDecoupagePaylaodWeb), "SecteurDecoupage mis à jour avec succès."),
+                    new ApiResponse<>(true, secteurDecoupageService.updateSecteurDecoupage(id, secteurDecoupage), "SecteurDecoupage mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -153,82 +153,11 @@ public class SecteurDecoupageController {
         }
     }
 
-    @GetMapping("/by-secteur-id/{secteurId}")
-    public ResponseEntity<?> getAllSecteurDecoupageListBySecteurId(@PathVariable Long secteurId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getSecteurDecoupageListBySecteurId(secteurId), "Liste des secteurDecoupages chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-secteur-decoupage-id/{secteurId}")
-    public ResponseEntity<?> getAllSecteurDecoupageListBySecteurIdPaged(@PathVariable Long secteurId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getSecteurDecoupageListBySecteurId(secteurId,pageable), "Liste des secteurDecoupages chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getSecteurDecoupageById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getSecteurDecoupageByIdToDto(id), "SecteurDecoupage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/arbre/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatParcelleDecoupageByUserId(userId), "SecteurDecoupage trouvée avec succès."),
+                    new ApiResponse<>(true, secteurDecoupageService.getSecteurDecoupageById(id), "SecteurDecoupage trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/decoupage/SectionController.java

@@ -1,256 +0,0 @@
-package io.gmss.fiscad.controllers.decoupage;
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.decoupage.SectionService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.SectionPaylaodWeb;
-import io.swagger.v3.oas.annotations.Operation;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/section", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Section")
-//@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
-public class SectionController {
-
-    private final SectionService sectionService;
-    private static final Logger logger = LoggerFactory.getLogger(SectionController.class);
-
-    public SectionController(SectionService sectionService) {
-        this.sectionService = sectionService;
-    }
-
-    @Operation(
-            summary = "Créer un section",
-            description = "Permet de Créer un section"
-    )
-    @PostMapping("/create")
-    public ResponseEntity<?> createSection(@RequestBody @Valid @Validated SectionPaylaodWeb sectionPaylaodWeb) {
-        try {
-            sectionPaylaodWeb = sectionService.createSection(sectionPaylaodWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionPaylaodWeb, "Section créé avec  succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @Operation(
-            summary = "mettre à jour un section",
-            description = "Permet de modifier un section"
-    )
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateSection(@PathVariable Long id, @RequestBody SectionPaylaodWeb sectionPayloadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionService.updateSection(id, sectionPayloadWeb), "Section mis à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-    @Operation(
-            summary = "supprimer un section",
-            description = "Permet de supprimer un section"
-    )
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteSection(@PathVariable Long id) {
-        try {
-            sectionService.deleteSection(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Section supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-    @Operation(
-            summary = "recuperer tous les sections",
-            description = "Permet de récuperer l'ensemble des sections"
-    )
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllSectionList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionService.getSectionList(), "Liste des sections chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @Operation(
-            summary = "recuperer tous les sections avec pagination",
-            description = "Permet de récuperer l'ensemble des sections avec pagination"
-    )
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllSectionPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionService.getSectionList(pageable), "Liste des sections chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @Operation(
-            summary = "recuperer un sections par son ID ",
-            description = "Permet de récuperer le section ayant l'ID fournie en path"
-    )
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getSectionById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionService.getSectionById(id).orElse(null), "Section trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @Operation(
-            summary = "recuperer tous les sections d'une structure",
-            description = "Permet de récuperer l'ensemble des sections de la structure dont l'ID est fourni en path"
-    )
-    @GetMapping("/by-structure-id/{structureId}")
-    public ResponseEntity<?> getSectionByStructureId(@PathVariable Long structureId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionService.getSectionListByStructureId(structureId), "Section trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "recuperer tous les sections d'une structure",
-            description = "Permet de récuperer l'ensemble des sections de la structure dont l'ID est fourni en path avec pagination"
-    )
-    @GetMapping("/page/by-structure-id/{structureId}")
-    public ResponseEntity<?> getSectionByStructureIdPage(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, sectionService.getSectionListByStructureId(structureId,pageable), "Section trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-}

src/main/java/io/gmss/fiscad/controllers/infocad/metier/CommentaireController.java

@@ -5,7 +5,7 @@ import io.gmss.fiscad.entities.infocad.metier.Commentaire;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.CommentaireService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.synchronisation.CommentaireRequest;
+import io.gmss.fiscad.paylaods.request.CommentaireRequest;
 import io.gmss.fiscad.paylaods.request.SyncCommentaireRequest;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -229,7 +229,7 @@ public class CommentaireController {
     }
     @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
     @PostMapping("/all-by-params")
-    //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du BatimentPaylaodWeb. \n 2 - Liste des commentaires lus provenant du BatimentPaylaodWeb \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
+    //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non lus provenant du Web. \n 2 - Liste des commentaires lus provenant du Web \n 3 - Liste des commentaires non lus provenant du mobile. \n 4 - Liste des commentaires lus provenant du mobile. \n A savoir : Les variables Origine et lu sont à varier pour avoir le résultat")
     public ResponseEntity<?> getcommentaireByParams(@RequestBody CommentaireRequest commentaireRequest) {
         try {
             return new ResponseEntity<>(
@@ -277,7 +277,7 @@ public class CommentaireController {
     }
 
     @PostMapping("synchronise/from-web")
-    //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du BatimentPaylaodWeb. \n 2 - Liste des commentaires synchronisés provenant du BatimentPaylaodWeb \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
+    //@ApiOperation(value = "Cette ressource permet d'avoir 4 résultats différents. \n 1 - Liste des commentaires non synchronisés provenant du Web. \n 2 - Liste des commentaires synchronisés provenant du Web \n 3 - Liste des commentaires non synchronisés provenant du mobile. \n 4 - Liste des commentaires synchronisés provenant du mobile. \n A savoir : Les variables Origine et Synchronise sont à varier pour avoir le résultat")
     public ResponseEntity<?> synchroniseCommentairesFromWeb(@RequestBody CommentaireRequest commentaireRequest) {
         try {
             return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/metier/EnqueteController.java

@@ -1,19 +1,11 @@
 package io.gmss.fiscad.controllers.infocad.metier;
 
-import io.gmss.fiscad.entities.infocad.metier.Enquete;
-import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.fiscad.entities.user.User;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
-import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad;
+import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
 import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -36,7 +28,7 @@ import java.util.List;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Enquête")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class EnqueteController {
 
     private final EnqueteService enqueteService;
@@ -49,51 +41,20 @@ public class EnqueteController {
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createEnquete(@RequestBody @Valid @Validated EnquetePayLoadWeb enquetePayLoadWeb) {
-        try {
-             enquetePayLoadWeb = enqueteService.createEnquete(enquetePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enquetePayLoadWeb, "Enquete batiment créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateEnquete(@PathVariable Long id, @RequestBody EnquetePayLoadWeb enquetePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteService.updateEnquete(id,enquetePayLoadWeb), "Enquete batiment mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
+    public ResponseEntity<?> createStructure(@RequestBody @Valid @Validated EnquetePayLoad enquetePayLoad) {
+//        try{
+//            enquete = enqueteService.createEnquete(enquete);
+//            return new ResponseEntity<>(
+//                    new ApiResponse<>(true, structure, "Structure créé avec  succès."),
+//                    HttpStatus.OK
+//            );
+//        }catch (Exception e){
+//            return new ResponseEntity<>(
+//                    new ApiResponse<>(false, e.getMessage()),
+//                    HttpStatus.OK
+//            );
+//        }
+        return null;
     }
 
     @PutMapping("/validation")
@@ -211,65 +172,6 @@ public class EnqueteController {
         }
     }
 
-    @Operation(
-            summary = "Récupérer les enquetes d'une parcelle",
-            description = "Permet de récuperer les enquêtes déjà réalisées sur une parcelles"
-    )
-    @GetMapping("/by-parcelle-id/{parcelleId}")
-    public ResponseEntity<?> getAllByParcelle(@PathVariable Long parcelleId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteService.getEnqueteListByParcelle(parcelleId), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @Operation(
-            summary = "Récupérer les enquetes d'une parcelle",
-            description = "Permet de récuperer les enquêtes déjà réalisées sur une parcelles"
-    )
-    @GetMapping("/page/by-parcelle-id/{parcelleId}")
-    public ResponseEntity<?> getAllByParcellePaged(@PathVariable Long parcelleId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteService.getEnqueteListByParcellePageable(parcelleId,pageable), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-
 
     @GetMapping("/all/dgi/decoupage-admin-for-enquete")
     public ResponseEntity<?> getAllByEnqueteDecoupageAdminForDgi() {
@@ -483,8 +385,5 @@ public class EnqueteController {
 
 
 
-
-
-
 }
 

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleController.java

@@ -1,448 +0,0 @@
-package io.gmss.fiscad.controllers.infocad.metier;
-
-import io.gmss.fiscad.entities.infocad.metier.Enquete;
-import io.gmss.fiscad.entities.infocad.metier.Parcelle;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.FiltreParcelle;
-import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
-import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-import java.util.List;
-
-@RestController
-@RequestMapping(value = "api/parcelle", produces = MediaType.APPLICATION_JSON_VALUE)
-//@SecurityRequirement(name = "bearer")
-@Tag(name = "Parcelle")
-@CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
-public class ParcelleController {
-
-    private final EnqueteService enqueteService;
-    private final ParcelleService parcelleService;
-
-    private static final Logger logger = LoggerFactory.getLogger(ParcelleController.class);
-
-    public ParcelleController(EnqueteService enqueteService, ParcelleService parcelleService) {
-        this.enqueteService = enqueteService;
-        this.parcelleService = parcelleService;
-    }
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createParcelle(@RequestBody @Valid @Validated ParcellePayLoadWeb parcellePayLoadWeb) {
-        try {
-             parcellePayLoadWeb = parcelleService.createParcelle(parcellePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcellePayLoadWeb, "parcelle créée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateEnquete(@PathVariable Long id, @RequestBody ParcellePayLoadWeb parcellePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.updateParcelle(id,parcellePayLoadWeb), "parcelle mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteStructurer(@PathVariable Long id) {
-        try {
-            parcelleService.deleteParcelle(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "parcelle supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-    //    @GetMapping("/all/by-decoupage")
-//    public ResponseEntity<?> getAllByDecoupage() {
-//        try {
-//            return new ResponseEntity<>(
-//                    new ApiResponse<>(true, enqueteService.getEnqueteCommuneArrondBloc(), "Liste des enquetes chargée avec succès."),
-//                    HttpStatus.OK
-//            );
-//        } catch (HttpClientErrorException.MethodNotAllowed e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-//        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-//                 FileStorageException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-//        } catch (NullPointerException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-//        } catch (Exception e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-//        }
-//    }
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getParcelleById(@CurrentUser UserPrincipal currentUser, @PathVariable Long id) {
-        try {
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleByIdToDto(userId,id), "enquete trouvé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllParcelle(@CurrentUser UserPrincipal currentUser) {
-        try {
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-             Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleListToDto(userId), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllParcellePaged(@CurrentUser UserPrincipal currentUser,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleListPageableToDto(userId,pageable), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @PostMapping("/all-paged/multi-criteres")
-    public ResponseEntity<?> getAllParcelleFiltrePaged(@CurrentUser UserPrincipal currentUser, @RequestParam int pageNo, @RequestParam int pageSize, @RequestBody FiltreParcelle filtreParcelle) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleByMultiFiltre(userId,filtreParcelle,pageable), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            e.printStackTrace();
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllParcelleByQuartier(@CurrentUser UserPrincipal currentUser,@PathVariable  Long  quartierId) {
-        try {
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleListByQuartierToDto(userId,quartierId), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllParcelleByQuartierPaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleListByQuartierPageableToDto(userId,quartierId,pageable), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all/by-rue-id/{rueId}")
-    public ResponseEntity<?> getAllParcelleByRue(@CurrentUser UserPrincipal currentUser,@PathVariable  Long  rueId) {
-        try {
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleListByRueToDto(userId,rueId), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/by-rue-id/{rueId}")
-    public ResponseEntity<?> getAllParcelleByRuePaged(@CurrentUser UserPrincipal currentUser,@PathVariable Long rueId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            if(currentUser==null)
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            Long userId = currentUser.getUser().getId();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcelleService.getParcelleListByRuePageableToDto(userId,rueId,pageable), "Liste des enquetes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-    @PutMapping("/syncrhonise-etat-batie-parcelle")
-    public ResponseEntity<?> putSynchroniseEtatBatieParcelle() {
-        try {
-            Integer nombreParcelleSync= parcelleService.majParcelleBatieNonbatie();
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,nombreParcelleSync , "Parcelle mise à jour avec succes."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-
-
-
-//    @GetMapping("/user-id/{userId}")
-//    public ResponseEntity<?> getParcellesByUserId(@PathVariable Long userId,@RequestParam int pageNo, @RequestParam int pageSize) {
-//        try {
-//            Pageable pageable = PageRequest.of(pageNo, pageSize);
-//            return new ResponseEntity<>(
-//                    new ApiResponse<>(true, parcelleService.getParcelleDataTableListByUserId(userId,pageable), "enquete trouvé avec succès."),
-//                    HttpStatus.OK
-//            );
-//        } catch (HttpClientErrorException.MethodNotAllowed e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-//        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-//                 FileStorageException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-//        } catch (NullPointerException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-//        } catch (Exception e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-//        }
-//    }
-
-
-
-}
-

src/main/java/io/gmss/fiscad/controllers/infocad/metier/ParcelleGeomController.java

@@ -20,7 +20,7 @@ import org.springframework.web.multipart.MultipartFile;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "ParcelleGeometrie")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class ParcelleGeomController {
 
     private final ParcelleGeomService parcelleGeomService;
@@ -63,24 +63,6 @@ public class ParcelleGeomController {
         );
     }
 
-
-    @GetMapping("/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getParcellesGeomsByQuartierId(@PathVariable Long quartierId) {
-        return new ResponseEntity<>(
-                new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListByQuatierId(quartierId), "Liste des parcelle chargée avec succès."),
-                HttpStatus.OK
-        );
-    }
-
-    @GetMapping("/page/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getParcellesGeomsByQuartierIdPaged(@PathVariable Long quartierId,@RequestParam int pageNo, @RequestParam int pageSize) {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-        return new ResponseEntity<>(
-                new ApiResponse<>(true, parcelleGeomService.getParcelleGeomListByQuatierIdPaged(quartierId,pageable), "Liste des parcelle chargée avec succès."),
-                HttpStatus.OK
-        );
-    }
-
     @GetMapping("/by-arrondissement/{codeArrondissement}")
     public ResponseEntity<?> getParcellesGeomsByArrondissement(@PathVariable String codeArrondissement) {
         return new ResponseEntity<>(

src/main/java/io/gmss/fiscad/controllers/infocad/metier/PersonneController.java

@@ -1,90 +1,28 @@
 package io.gmss.fiscad.controllers.infocad.metier;
 
 
-import io.gmss.fiscad.entities.infocad.metier.Enquete;
-import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.PersonneService;
 import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.dto.PersonneCompletDTO;
-import io.gmss.fiscad.paylaods.request.RecherchePersonneResquestBody;
-import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
-import jakarta.validation.Valid;
 import lombok.RequiredArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.security.access.prepost.PreAuthorize;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-import java.util.Optional;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RestController;
 
 
 @RestController
 @RequestMapping(value = "api/personne", produces = MediaType.APPLICATION_JSON_VALUE)
 @RequiredArgsConstructor
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class PersonneController {
-    private static final Logger logger = LoggerFactory.getLogger(PersonneController.class);
 
     private final PersonneService personneService;
 
-    @PostMapping("/create")
-    public ResponseEntity<?> createPersonne(@RequestBody @Valid @Validated PersonnePayLoadWeb personnePayLoadWeb) {
-        try {
-             personnePayLoadWeb = personneService.createPersonne(personnePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, personnePayLoadWeb, "Contribuable créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updatePersonne(@PathVariable Long id, @RequestBody PersonnePayLoadWeb personnePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, personneService.updatePersonne(id,personnePayLoadWeb), "Personne mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
     @GetMapping("/get-details/{id}")
     public ResponseEntity<?> getDetails(@PathVariable Long id)   {
         try{
@@ -100,86 +38,4 @@ public class PersonneController {
             );
         }
     }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getPersonneById(@PathVariable Long id)   {
-        try{
-            Optional<PersonnePayLoadWeb> optionalPersonne= personneService.getPersonneById(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, optionalPersonne.orElse(null), "Personne retrouvée avec  succès."),
-                    HttpStatus.OK
-            );
-        }catch (Exception e){
-            return new ResponseEntity<>(
-                    new ApiResponse<>(false, e.getMessage()),
-                    HttpStatus.OK
-            );
-        }
-    }
-
-    @PostMapping("/recherche")
-    public ResponseEntity<?> rechercherPersonne(@RequestBody RecherchePersonneResquestBody recherchePersonneResquestBody )   {
-        try{
-           // personneService.recherchePersonne(recherchePersonneResquestBody);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, personneService.recherchePersonne(recherchePersonneResquestBody), "Personne retrouvée avec  succès."),
-                    HttpStatus.OK
-            );
-        }catch (Exception e){
-            return new ResponseEntity<>(
-                    new ApiResponse<>(false, e.getMessage()),
-                    HttpStatus.OK
-            );
-        }
-    }
-
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllPersonne() {
-        try {
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, personneService.getPersonneList(), "Liste des personnes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllPersonnePaged(@CurrentUser UserPrincipal currentUser,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, personneService.getPersonneList(pageable), "Liste des personnes chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/infocad/metier/PieceController.java

@@ -1,272 +0,0 @@
-package io.gmss.fiscad.controllers.infocad.metier;
-
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.PiecePayLoadWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-@AllArgsConstructor
-@RestController
-@RequestMapping(value = "api/piece", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Piece")
-@CrossOrigin(origins = "*")
-public class PieceController {
-
-    private final PieceService pieceService;
-
-    private static final Logger logger = LoggerFactory.getLogger(PieceController.class);
-
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createPiece(@RequestBody @Valid @Validated PiecePayLoadWeb piecePayLoadWeb) {
-        try {
-            piecePayLoadWeb = pieceService.createPiece(piecePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, piecePayLoadWeb, "Piece créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updatePiece(@PathVariable Long id, @RequestBody PiecePayLoadWeb piecePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.updatePiece(id,piecePayLoadWeb), "Piece mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deletePiece(@PathVariable Long id) {
-        try {
-            pieceService.deletePiece(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Piece supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllPieceList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getPieceListToDto(), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllPiecePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getPieceListToDtoPageable(pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all/by-enquete-id/{enqueteId}")
-    public ResponseEntity<?> getAllPieceByEnqueteList(@PathVariable Long enqueteId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getAllPieceByEnqueteToDto(enqueteId), "Liste des pieces chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/by-enquete-id/{enqueteId}")
-    public ResponseEntity<?> getAllPieceByParcellePaged(@PathVariable Long enqueteId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getAllPieceByEnqueteToDtoPageable(enqueteId,pageable), "Liste des pieces chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}")
-    public ResponseEntity<?> getAllPieceByEnqueteBatiment(@PathVariable Long enqueteBatimentId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getAllPieceByEnqueteBatimentToDto(enqueteBatimentId), "Liste des pieces chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/by-enquete-unite-logement-id/{enqueteUniteLogementId}")
-    public ResponseEntity<?> getAllPieceByEnqueteUniteLogement(@PathVariable Long enqueteUniteLogementId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getAllPieceByEnqueteUniteLogementToDto(enqueteUniteLogementId), "Liste des pieces chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getPieceById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, pieceService.getPieceByToDto(id), "Piece trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/infocad/metier/UploadController.java

@@ -1,17 +1,13 @@
 package io.gmss.fiscad.controllers.infocad.metier;
 
 import io.gmss.fiscad.entities.infocad.metier.Upload;
-import io.gmss.fiscad.interfaces.infocad.metier.UploadService;
 import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.JobModels;
 import io.gmss.fiscad.proprietes.ZipStorageProperties;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository;
+import io.gmss.fiscad.repositories.infocad.metier.UploadRepository;
 import io.gmss.fiscad.service.FileStorageService;
 import io.gmss.fiscad.service.StringManager;
 import io.gmss.fiscad.service.ZipAsyncService;
-import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.media.Content;
-import io.swagger.v3.oas.annotations.media.Schema;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.servlet.http.HttpServletRequest;
@@ -49,13 +45,12 @@ import java.util.UUID;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Upload")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class UploadController {
 
     boolean headIsValid = false;
     private final ZipAsyncService service;
     private final ZipStorageProperties props;
-    private final UploadService uploadService;
 
     private static final Logger logger = LoggerFactory.getLogger(UploadController.class);
     @Autowired
@@ -99,7 +94,7 @@ public class UploadController {
 
         try {
             if (uploadRepository.findById(id).isPresent()) {
-                return new ResponseEntity<>(new ApiResponse(true, uploadRepository.findById(id), "File with id {" + id + "} is found."), HttpStatus.OK);
+                return new ResponseEntity<>(new ApiResponse(true, uploadRepository.getOne(id), "File with id {" + id + "} is found."), HttpStatus.OK);
             } else {
                 return new ResponseEntity<>(new ApiResponse(true, null, "The upload with id {" + id + "} you request for is not found."), HttpStatus.OK);
             }
@@ -144,39 +139,30 @@ public class UploadController {
                 .body(resource);
     }
 
-    @PostMapping(
-            value = "/save",
-            consumes = MediaType.MULTIPART_FORM_DATA_VALUE
-    )
-    public ResponseEntity<?> saveFilePieceId(
-            @Parameter(
-                    description = "Fichier à uploader",
-                    required = true,
-                    content = @Content(
-                            mediaType = MediaType.APPLICATION_OCTET_STREAM_VALUE,
-                            schema = @Schema(type = "string", format = "binary")
-                    )
-            )
-            @RequestPart("file") MultipartFile file,
+    @PostMapping("/save")
+    public ResponseEntity<?> save(@RequestPart(required = true) MultipartFile file, @RequestParam String reference, @RequestParam String description /*, @RequestParam Long idTypeUpload*/) {
 
-            @Parameter(description = "ID de la pièce", required = true)
-            @RequestParam("pieceId") Long pieceId
-    ) {
         try {
-            return ResponseEntity.ok(
-                    new ApiResponse(true,
-                            uploadService.createUpload(file, pieceId),
-                            "File has been created successfully.")
-            );
+            Upload upload = new Upload();
+            String fileName = fileStorageService.storeFile(file);
+            upload.setFileName(fileName);
+            upload.setMimeType(file.getContentType());
+            upload.setSize(file.getSize());
+            upload.setOriginalFileName(file.getOriginalFilename());
+            return new ResponseEntity<>(new ApiResponse(true, uploadRepository.save(upload), "File has been created successfully."), HttpStatus.OK);
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            e.printStackTrace();
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
         } catch (Exception e) {
-            logger.error(e.getMessage(), e);
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
-                    .body(new ApiResponse(false, null, e.getMessage()));
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
 
 
-
     @DeleteMapping("/delete/id/{id}")
     public ResponseEntity<?> delete(@PathVariable Long id) {
         try {
@@ -243,20 +229,4 @@ public class UploadController {
                 .orElse(ResponseEntity.notFound().build());
     }
 
-    @GetMapping(path = "/by-piece/{pieceId}")
-    public ResponseEntity<?> getByPiece(@PathVariable("pieceId") Long pieceId) {
-        try{
-            return new ResponseEntity<>(new ApiResponse(true, uploadService.getAllUploadByPiece(pieceId), "Liste des fichier de la piece"), HttpStatus.OK);
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-
-    }
-
 }

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/BlocController.java

@@ -28,7 +28,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Bloc")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class  BlocController {
 
     private final BlocService blocService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ModeAcquisitionController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Mode d'acquisition")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class ModeAcquisitionController {
 
     private final ModeAcquisitionService modeAcquisitionService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/NatureDomaineController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Nature domaine")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class NatureDomaineController {
 
     private final NatureDomaineService natureDomaineService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/PositionRepresentationController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Position représentation")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class PositionRepresentationController {
 
     private final PositionRepresentationService positionRepresentationService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/ProfessionController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Profession")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class ProfessionController {
 
     private final ProfessionService professionService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationGeographiqueController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Situation géographique")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class SituationGeographiqueController {
 
     private final SituationGeographiqueService situationGeographiqueService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SituationMatrimonialeController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Situation matrimoniale")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class SituationMatrimonialeController {
 
     private final SituationMatrimonialeService situationMatrimonialeService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/SourceDroitController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Source de droit")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class SourceDroitController {
 
     private final SourceDroitService sourceDroitService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/StructureController.java

@@ -6,7 +6,6 @@ import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
 import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -28,7 +27,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Structure")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class StructureController {
 
     private final StructureService structureService;
@@ -41,11 +40,11 @@ public class StructureController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createStructure(@RequestBody StructurePaylaodWeb structurePaylaodWeb) {
+    public ResponseEntity<?> createStructure(@RequestBody @Valid @Validated Structure structure) {
         try {
-            structurePaylaodWeb = structureService.createStructure(structurePaylaodWeb);
+            structure = structureService.createStructure(structure);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, structurePaylaodWeb, "Structure créé avec  succès."),
+                    new ApiResponse<>(true, structure, "Structure créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -65,10 +64,10 @@ public class StructureController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateStructure(@PathVariable Long id, @RequestBody StructurePaylaodWeb structurePaylaodWeb) {
+    public ResponseEntity<?> updateStructure(@PathVariable Long id, @RequestBody Structure structure) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, structureService.updateStructure(id, structurePaylaodWeb), "Structure mise à jour avec succès."),
+                    new ApiResponse<>(true, structureService.updateStructure(id, structure), "Structure mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -135,6 +134,36 @@ public class StructureController {
     }
 
 
+    @GetMapping("/all-by-arrondissement")
+    public ResponseEntity<?> getAllStructureListByArrondissement(@RequestParam Long arrondissementId) {
+        try {
+            if (arrondissementService.getArrondissementById(arrondissementId).isPresent()) {
+                return new ResponseEntity<>(
+                        new ApiResponse<>(true, structureService.getStructuresByArrondissement(arrondissementId), "Liste des structures chargée avec succès."),
+                        HttpStatus.OK
+                );
+            } else {
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, "Impossible de trouver l'arrondissement spécifiée."),
+                        HttpStatus.OK
+                );
+            }
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
     @GetMapping("/all-paged")
     public ResponseEntity<?> getAllStructurePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
         try {
@@ -160,53 +189,6 @@ public class StructureController {
 
     }
 
-    @GetMapping("/by-commune/{communeId}")
-    public ResponseEntity<?> getAllStructureListByCommune(@PathVariable Long communeId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, structureService.getStructureListByCommuneId(communeId), "Liste des structures chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-commune/{communeId}")
-    public ResponseEntity<?> getAllStructureListByCommunePageable(@PathVariable Long communeId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, structureService.getStructureListByCommuneId(communeId,pageable), "Liste des structures chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getStructureById(@PathVariable Long id) {
         try {

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeContestationController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Type de contestation")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class TypeContestationController {
 
     private final TypeContestationService typeContestationService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeDomaineController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Type de domaine")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class TypeDomaineController {
 
     private final TypeDomaineService typeDomaineService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePersonneController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Type de personne")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class TypePersonneController {
 
     private final TypePersonneService typePersonneService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypePieceController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Type de pièce")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class TypePieceController {
 
     private final TypePieceService typePieceService;

src/main/java/io/gmss/fiscad/controllers/infocad/parametre/TypeRepresentationController.java

@@ -26,7 +26,7 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Type de représentation")
 @CrossOrigin(origins = "*")
-//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
+@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
 public class TypeRepresentationController {
 
     private final TypeRepresentationService typeRepresentationService;

src/main/java/io/gmss/fiscad/controllers/report/ReportingController.java

@@ -7,8 +7,8 @@ package io.gmss.fiscad.controllers.report;
 
 import io.gmss.fiscad.enums.FormatRapport;
 import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
+import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository;
 import io.gmss.fiscad.service.ReportService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;

src/main/java/io/gmss/fiscad/controllers/rfu/metier/BatimentController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.Batiment;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -37,11 +36,11 @@ public class BatimentController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createBatiment(@RequestBody @Valid @Validated BatimentPaylaodWeb batimentPaylaodWeb) {
+    public ResponseEntity<?> createBatiment(@RequestBody @Valid @Validated Batiment batiment) {
         try {
-            batimentPaylaodWeb = batimentService.createBatiment(batimentPaylaodWeb);
+            batiment = batimentService.createBatiment(batiment);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentPaylaodWeb, "Batiment créé avec succès."),
+                    new ApiResponse<>(true, batiment, "Batiment créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -61,10 +60,10 @@ public class BatimentController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateBatiment(@PathVariable Long id, @RequestBody BatimentPaylaodWeb batimentPaylaodWeb) {
+    public ResponseEntity<?> updateBatiment(@PathVariable Long id, @RequestBody Batiment batiment) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.updateBatiment(id,batimentPaylaodWeb), "Batiment mise à jour avec succès."),
+                    new ApiResponse<>(true, batimentService.updateBatiment(id, batiment), "Batiment mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -154,53 +153,6 @@ public class BatimentController {
         }
     }
 
-    @GetMapping("/all/by-parcelle-id/{parcelleId}")
-    public ResponseEntity<?> getAllBatimentByParcelleList(@PathVariable Long parcelleId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.getBatimentListByParcelle(parcelleId), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/by-parcelle-id/{parcelleId}")
-    public ResponseEntity<?> getAllBatimentByParcellePaged(@PathVariable Long parcelleId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.getBatimentListByParcellePageable(parcelleId,pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getBatimentById(@PathVariable Long id) {
         try {

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueBatimentController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.CaracteristiqueBatimentPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -22,7 +21,7 @@ import org.springframework.web.client.HttpClientErrorException;
 
 
 @RestController
-@RequestMapping(value = "api/caracteristique-batiment", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(value = "api/caracteristique-caracteristiqueBatiment", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Caractéristique batiment")
 @CrossOrigin(origins = "*")
@@ -36,25 +35,34 @@ public class CaracteristiqueBatimentController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createCaracteristiqueBatiment(@RequestBody @Valid @Validated CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) {
+    public ResponseEntity<?> createCaracteristiqueBatiment(@RequestBody @Valid @Validated CaracteristiqueBatiment caracteristiqueBatiment) {
         try {
-            caracteristiqueBatimentPayloadWeb = caracteristiqueBatimentService.createCaracteristiqueBatiment(caracteristiqueBatimentPayloadWeb);
+            caracteristiqueBatiment = caracteristiqueBatimentService.createCaracteristiqueBatiment(caracteristiqueBatiment);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentPayloadWeb, "Caracteristique du batiment créé avec succès."),
+                    new ApiResponse<>(true, caracteristiqueBatiment, "Caracteristique du batiment créé avec succès."),
                     HttpStatus.OK
             );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
         } catch (Exception e) {
-            e.printStackTrace();
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateCaracteristiqueBatiment(@PathVariable Long id, @RequestBody CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) {
+    public ResponseEntity<?> updateCaracteristiqueBatiment(@PathVariable Long id, @RequestBody CaracteristiqueBatiment caracteristiqueBatiment) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentService.updateCaracteristiqueBatiment(id, caracteristiqueBatimentPayloadWeb), "Caracteristique du batiment mise à jour avec succès."),
+                    new ApiResponse<>(true, caracteristiqueBatimentService.updateCaracteristiqueBatiment(id, caracteristiqueBatiment), "Caracteristique du batiment mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -148,54 +156,7 @@ public class CaracteristiqueBatimentController {
     public ResponseEntity<?> getCaracteristiqueBatimentById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentToDto(id), "Caracteristique du batiment trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/by-enquete-batiment-id/{enqueteBatimentId}")
-    public ResponseEntity<?> getCaracteristiqueBatimentByBatimentId(@PathVariable Long enqueteBatimentId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatiment(enqueteBatimentId), "Caracteristique du batiment trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-enquete-batiment-id/{enqueteBatimentId}")
-    public ResponseEntity<?> getCaracteristiqueBatimentByEnqueteBatimentIdPaged(@PathVariable Long enqueteBatimentId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentListByEnqueteBatimentPageable(enqueteBatimentId,pageable), "Caracteristique du batiment trouvée avec succès."),
+                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentById(id), "Caracteristique du batiment trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueParcelleController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.CaracteristiqueParcellePayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -36,11 +35,11 @@ public class CaracteristiqueParcelleController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createCaracteristiqueParcelle(@RequestBody @Valid @Validated CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) {
+    public ResponseEntity<?> createCaracteristiqueParcelle(@RequestBody @Valid @Validated CaracteristiqueParcelle caracteristiqueParcelle) {
         try {
-            caracteristiqueParcellePayloadWeb = caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcellePayloadWeb);
+            caracteristiqueParcelle = caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcelle);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueParcellePayloadWeb, "Caracteristique parcelle créé avec succès."),
+                    new ApiResponse<>(true, caracteristiqueParcelle, "Caracteristique parcelle créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -60,10 +59,10 @@ public class CaracteristiqueParcelleController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateCaracteristiqueParcelle(@PathVariable Long id, @RequestBody CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) {
+    public ResponseEntity<?> updateCaracteristiqueParcelle(@PathVariable Long id, @RequestBody CaracteristiqueParcelle caracteristiqueParcelle) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueParcelleService.updateCaracteristiqueParcelle(id, caracteristiqueParcellePayloadWeb), "Caracteristique parcelle mise à jour avec succès."),
+                    new ApiResponse<>(true, caracteristiqueParcelleService.updateCaracteristiqueParcelle(id, caracteristiqueParcelle), "Caracteristique parcelle mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -175,52 +174,4 @@ public class CaracteristiqueParcelleController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/by-enquete-id/{enqueteId}")
-    public ResponseEntity<?> getAllCaracteristiqueParcelleList(@PathVariable Long enqueteId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueParcelleService.getCaracteristiqueParcelleByEnqueteList(enqueteId), "Liste des Caracteristiques parcelles chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-enquete-id/{enqueteId}")
-    public ResponseEntity<?> getAllCaracteristiqueParcellePaged(@PathVariable Long enqueteId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueParcelleService.getCaracteristiqueParcelleByEnqueteListPageable(enqueteId,pageable), "Liste des Caracteristiques parcelles chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/CaracteristiqueUniteLogementController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.CaracteristiqueUniteLogementPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -36,11 +35,11 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createCaracteristiqueUniteLogement(@RequestBody @Valid @Validated CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) {
+    public ResponseEntity<?> createCaracteristiqueUniteLogement(@RequestBody @Valid @Validated CaracteristiqueUniteLogement caracteristiqueUniteLogement) {
         try {
-            caracteristiqueUniteLogementPayloadWeb = caracteristiqueUniteLogementService.createCaracteristiqueUniteLogement(caracteristiqueUniteLogementPayloadWeb);
+            caracteristiqueUniteLogement = caracteristiqueUniteLogementService.createCaracteristiqueUniteLogement(caracteristiqueUniteLogement);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueUniteLogementPayloadWeb, "Caracteristique Unite Logement créé avec succès."),
+                    new ApiResponse<>(true, caracteristiqueUniteLogement, "Caracteristique Unite Logement créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -60,10 +59,10 @@ public class CaracteristiqueUniteLogementController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateCaracteristiqueUniteLogement(@PathVariable Long id, @RequestBody CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) {
+    public ResponseEntity<?> updateCaracteristiqueUniteLogement(@PathVariable Long id, @RequestBody CaracteristiqueUniteLogement caracteristiqueUniteLogement) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueUniteLogementService.updateCaracteristiqueUniteLogement(id, caracteristiqueUniteLogementPayloadWeb), "Caracteristique Unite Logement mise à jour avec succès."),
+                    new ApiResponse<>(true, caracteristiqueUniteLogementService.updateCaracteristiqueUniteLogement(id, caracteristiqueUniteLogement), "Caracteristique Unite Logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -175,51 +174,4 @@ public class CaracteristiqueUniteLogementController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-    @GetMapping("/by-enquete-ulo-id/{enqueteUloId}")
-    public ResponseEntity<?> getAllCaracteristiqueUniteLogementListByEul(@PathVariable Long enqueteUloId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueUniteLogementService.getCaracteristiqueUniteLogementListbyEul(enqueteUloId), "Liste des Caracteristiques Unite Logement chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-enquete-ulo-id/{enqueteUloId}")
-    public ResponseEntity<?> getAllCaracteristiqueUniteLogementByEulPaged(@PathVariable Long enqueteUloId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, caracteristiqueUniteLogementService.getCaracteristiqueUniteLogementListByEul(enqueteUloId,pageable), "Liste des Caracteristiques Unite Logement chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/DeclarationNcController.java

@@ -1,226 +0,0 @@
-package io.gmss.fiscad.controllers.rfu.metier;
-
-
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService;
-import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.DeclarationNcPayloadWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import lombok.AllArgsConstructor;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-@AllArgsConstructor
-@RestController
-@RequestMapping(value = "api/declaration-nc", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Déclaration NC")
-@CrossOrigin(origins = "*")
-public class DeclarationNcController {
-
-    private final DeclarationNcService declarationNcService;
-    private static final Logger logger = LoggerFactory.getLogger(DeclarationNcController.class);
-
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createDeclarationNc(@RequestBody @Valid @Validated DeclarationNcPayloadWeb declarationNcPayloadWeb) {
-        try {
-             declarationNcPayloadWeb = declarationNcService.createDeclarationNc(declarationNcPayloadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcPayloadWeb, "Déclaration NC créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody DeclarationNcPayloadWeb declarationNcPayloadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcService.updateDeclarationNc(id, declarationNcPayloadWeb), "Enquete batiment mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteEnqueteBatiment(@PathVariable Long id) {
-        try {
-            declarationNcService.deleteDeclarationNc(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Déclaration Nc supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllEnqueteBatimentList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcService.getDeclarationNcList(), "Liste des Enquetes batiments chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllEnqueteBatimentPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcService.getDeclarationNcList(pageable), "Liste des Enquetes batiments chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getEnqueteBatimentById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcService.getDeclarationNcById(id), "Enquete batiment trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/by-personne-id/{personneId}")
-    public ResponseEntity<?> getDeclarationNcByPersonne(@PathVariable Long personneId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcService.getDeclarationNcByPersonneList(personneId), "Déclarations NC trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-personne-id/{personneId}")
-    public ResponseEntity<?> getDeclarationNcByPersonnePaged(@PathVariable Long personneId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, declarationNcService.getDeclarationNcByPersonneList(personneId,pageable), "Déclaration NC trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/rfu/metier/DonneesImpositionTfuController.java

@@ -7,10 +7,7 @@ import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
+import io.gmss.fiscad.repositories.rfu.metier.ImpositionsTfuRepository;
 import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -163,104 +160,6 @@ public class DonneesImpositionTfuController {
         }
     }
 
-
-    @GetMapping("/all-page/by-imposition-id/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-page/by-imposition-id/non-batie/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdNonBatiePaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdNonBatiePageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all-page/by-imposition-id/batie-batiment/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieBatimentPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-page/by-imposition-id/batie-unite-logement/{impositionId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByImpositionIdBatieUniteLogPaged(@PathVariable Long impositionId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(impositionId, pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getDonneesImpositionTfuById(@PathVariable Long id) {
         try {
@@ -283,91 +182,31 @@ public class DonneesImpositionTfuController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
-    @PostMapping("/generer-batie")
-    public ResponseEntity<?> genererDonneesFiscaleBatie(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @Operation(summary = "Générer les données fiscales TFU")
+    @PostMapping("/generer")
+    public ResponseEntity<?> genererDonneesFiscale(@RequestBody ImpositionsTfu impositionsTfu) {
         try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
+            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfu.getId());
 
             if(optionalImpositionsTfu.isEmpty()){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
+                        new ApiResponse<>(false, null, "L'imposition tfu n'est pas trouvée."),
                         HttpStatus.OK
                 );
             }
 
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.TFU_FNB_GENERE)){
+            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.CREE)){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
+                        new ApiResponse<>(false, null, "le statut actuel ne permet pas cette opération."),
                         HttpStatus.OK
                 );
             }
 
-           if(userPrincipal==null){
+            optionalImpositionsTfu.get().setStatusAvis(StatusAvis.GENERE);
             return new ResponseEntity<>(
-                       new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
+                    new ApiResponse<>(true, donneesImpositionTfuService.genererDonneesFiscales(optionalImpositionsTfu.get()), "DonneesImpositionTfu trouvée avec succès."),
                     HttpStatus.OK
             );
-           }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition des fonciers batis Générées avec succès."),
-                    HttpStatus.OK
-            );
-
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-
-    @Operation(summary = "Générer les données fiscales TFU des parcelle baties")
-    @PostMapping("/generer-non-batie")
-    public ResponseEntity<?> genererDonneesImpositionNonBaties(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-        try {
-            Optional<ImpositionsTfu> optionalImpositionsTfu =impositionsTfuRepository.findById(impositionsTfuPaylaodWeb.getId());
-
-            if(optionalImpositionsTfu.isEmpty()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "L'instance d'imposition n'est pas trouvée."),
-                        HttpStatus.OK
-                );
-            }
-
-            if(!optionalImpositionsTfu.get().getStatusAvis().equals(StatusAvis.GENERATION_AUTORISE)){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "l'état actuel : "+optionalImpositionsTfu.get().getStatusAvis()+" ne permet pas cette opération."),
-                        HttpStatus.OK
-                );
-            }
-
-            if(userPrincipal==null){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'êtes pas autorisé à accéder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            impositionsTfuPaylaodWeb=donneesImpositionTfuService.genererDonneesFiscalesParcelleNonBatie(impositionsTfuPaylaodWeb,userPrincipal.getUser().getId());
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true,impositionsTfuPaylaodWeb, "Données d'imposition pour les fonciers non batis Générées avec succès."),
-                    HttpStatus.OK
-            );
-
         } catch (HttpClientErrorException.MethodNotAllowed e) {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);

src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java

@@ -1,179 +0,0 @@
-package io.gmss.fiscad.controllers.rfu.metier;
-
-
-import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.metier.EnqueteActiviteService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb ;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/enquete-activite", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "EnqueteActivite")
-@CrossOrigin(origins = "*")
-public class EnqueteActiviteController {
-
-    private final EnqueteActiviteService enqueteActiviteService;
-
-    private static final Logger logger = LoggerFactory.getLogger(EnqueteActiviteController.class);
-
-    public EnqueteActiviteController(EnqueteActiviteService enqueteActiviteService) {
-        this.enqueteActiviteService = enqueteActiviteService;
-    }
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createEnqueteActivite(@RequestBody @Valid @Validated EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) {
-        try {
-           EnqueteActivite enqueteActivite = enqueteActiviteService.createEnqueteActivite(enqueteActivitePayLoadWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteActivite, "Enquete Activite créé avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateEnqueteActivite(@PathVariable Long id, @RequestBody EnqueteActivitePayLoadWeb  enqueteActivitePayLoadWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteActiviteService.updateEnqueteActivite(id,enqueteActivitePayLoadWeb), "EnqueteActivite mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteEnqueteActivite(@PathVariable Long id) {
-        try {
-            enqueteActiviteService.deleteEnqueteActivite(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Enquete Activite supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllEnqueteActiviteList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteActiviteService.getEnqueteActiviteList(), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllEnqueteActivitePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteActiviteService.getEnqueteActiviteList(pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getEnqueteActiviteById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteActiviteService.getEnqueteActiviteById(id), "EnqueteActivite trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteBatimentController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -36,11 +35,11 @@ public class EnqueteBatimentController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
+    public ResponseEntity<?> createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatiment enqueteBatiment) {
         try {
-             enqueteBatimentPayloadWeb = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb);
+            enqueteBatiment = enqueteBatimentService.createEnqueteBatiment(enqueteBatiment);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentPayloadWeb, "Enquete batiment créé avec succès."),
+                    new ApiResponse<>(true, enqueteBatiment, "Enquete batiment créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -60,10 +59,10 @@ public class EnqueteBatimentController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
+    public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatiment enqueteBatiment) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.updateEnqueteBatiment(id, enqueteBatimentPayloadWeb), "Enquete batiment mise à jour avec succès."),
+                    new ApiResponse<>(true, enqueteBatimentService.updateEnqueteBatiment(id, enqueteBatiment), "Enquete batiment mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -176,51 +175,4 @@ public class EnqueteBatimentController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-    @GetMapping("/by-batiment-id/{batimentId}")
-    public ResponseEntity<?> getEnqueteBatimentByBatimentId(@PathVariable Long batimentId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.getEnqueteBatimentByBatimentList(batimentId), "Enquete batiment trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-batiment-id/{batimentId}")
-    public ResponseEntity<?> getEnqueteBatimentByBatimentIdPaged(@PathVariable Long batimentId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.getEnqueteBatimentByBatimentListPageable(batimentId,pageable), "Enquete batiment trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteUniteLogementController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -36,11 +35,11 @@ public class EnqueteUniteLogementController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
+    public ResponseEntity<?> createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogement enqueteUniteLogement) {
         try {
-             enqueteUniteLogementPayloadWeb = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb);
+            enqueteUniteLogement = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogement);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementPayloadWeb, "Enquete unite logement créé avec succès."),
+                    new ApiResponse<>(true, enqueteUniteLogement, "Enquete unite logement créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -60,10 +59,10 @@ public class EnqueteUniteLogementController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
+    public ResponseEntity<?> updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogement enqueteUniteLogement) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.updateEnqueteUniteLogement(id, enqueteUniteLogementPayloadWeb), "Enquete unite logement mise à jour avec succès."),
+                    new ApiResponse<>(true, enqueteUniteLogementService.updateEnqueteUniteLogement(id, enqueteUniteLogement), "Enquete unite logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -176,51 +175,4 @@ public class EnqueteUniteLogementController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-    @GetMapping("/by-unite-logement-id/{uniteLogementId}")
-    public ResponseEntity<?> getEnqueteUniteLogementByUniteLogement(@PathVariable Long uniteLogementId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getEnqueteUniteLogementUniteLogementList(uniteLogementId), "Enquete unite de logement trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/page/by-unite-logement-id/{uniteLogementId}")
-    public ResponseEntity<?> getEnqueteUniteLogementByUniteLogementPaged(@PathVariable Long uniteLogementId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getEnqueteUniteLogementByUniteLogementListPageable(uniteLogementId,pageable), "Enquete unite de logement trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/metier/ImpositionsTfuController.java

@@ -2,21 +2,12 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
-import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.interfaces.rfu.metier.ImpositionsTfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
-import io.gmss.fiscad.security.CurrentUser;
-import io.gmss.fiscad.security.UserPrincipal;
-import io.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
-import jakarta.ws.rs.NotAcceptableException;
-import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.data.domain.PageRequest;
@@ -30,7 +21,6 @@ import org.springframework.web.client.HttpClientErrorException;
 
 
 @RestController
-@AllArgsConstructor
 @RequestMapping(value = "api/impositions-tfu", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Impositions TFU")
@@ -38,32 +28,41 @@ import org.springframework.web.client.HttpClientErrorException;
 public class ImpositionsTfuController {
 
     private final ImpositionsTfuService impositionsTfuService;
-    private final EnqueteService enqueteService;
     private static final Logger logger = LoggerFactory.getLogger(ImpositionsTfuController.class);
 
-
+    public ImpositionsTfuController(ImpositionsTfuService impositionsTfuService) {
+        this.impositionsTfuService = impositionsTfuService;
+    }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createImpositionsTfu(@CurrentUser UserPrincipal currentUser,@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    public ResponseEntity<?> createImpositionsTfu(@RequestBody @Valid @Validated ImpositionsTfu impositionsTfu) {
         try {
-            if(currentUser==null){
+            impositionsTfu = impositionsTfuService.createImpositionsTfu(impositionsTfu);
             return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
+                    new ApiResponse<>(true, impositionsTfu, "Unite de logement créé avec succès."),
                     HttpStatus.OK
             );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
-            User user=currentUser.getUser();
-
-            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(false, null, "Vous n'etes pas autorisé à accéder à cette ressource."),
-                        HttpStatus.OK
-                );
     }
 
-            impositionsTfuPaylaodWeb = impositionsTfuService.createImpositionsTfu(impositionsTfuPaylaodWeb);
+    @PutMapping("/update/{id}")
+    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfu impositionsTfu) {
+        try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuPaylaodWeb, "Unite de logement créé avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.updateImpositionsTfu(id, impositionsTfu), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -83,27 +82,11 @@ public class ImpositionsTfuController {
     }
 
 
-    @PutMapping("/cloturer-enquete")
-    public ResponseEntity<?> cloturer(@CurrentUser UserPrincipal userPrincipal, @RequestBody  ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb ) {
+    @PutMapping("/valider/{id}")
+    public ResponseEntity<?> validerImpositionsTfu(@RequestBody ImpositionsTfu impositionsTfu) {
         try {
-
-            if(userPrincipal==null){
             return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Accès non autorisé"),
-                        HttpStatus.NOT_ACCEPTABLE
-                );
-            }
-
-
-            User user= userPrincipal.getUser();
-            if(user.getStructure().getId()!=impositionsTfuPaylaodWeb.getStructureId()){
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous n'êtes pas autorisé à cloturer les enquetes du : "+user.getStructure().getNom()),
-                        HttpStatus.OK
-                );
-            }
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.cloturerImpositionsTfu(impositionsTfuPaylaodWeb), "enquete cloturées avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.validerImpositionsTfu(impositionsTfu), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -122,62 +105,11 @@ public class ImpositionsTfuController {
         }
     }
 
-//    @PutMapping("/update/{id}")
-//    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-//        try {
-//            return new ResponseEntity<>(
-//                    new ApiResponse<>(true, impositionsTfuService.updateImpositionsTfu(id, impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
-//                    HttpStatus.OK
-//            );
-//        } catch (HttpClientErrorException.MethodNotAllowed e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-//        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-//                 FileStorageException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-//        } catch (NullPointerException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-//        } catch (Exception e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-//        }
-//    }
-
-    @Operation(
-            summary = "Autoriser la génération des avis d'un centre",
-            description = "Permet d'autoriser la génération des avis d'un centre pour un exervice données"
-    )
-
-    @PutMapping("/autoriser-generation-avis")
-    public ResponseEntity<?> autoriserImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    @PutMapping("/annuler/{id}")
+    public ResponseEntity<?> annulerImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfu impositionsTfu) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.autoriserGenerationImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/rejeter")
-    public ResponseEntity<?> annulerImpositionsTfu(@RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.rejeterImpositionsTfu(impositionsTfuPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.annulerImpositionsTfu(impositionsTfu), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -220,19 +152,11 @@ public class ImpositionsTfuController {
         }
     }
 
-    @GetMapping("/all/by-user")
-    public ResponseEntity<?> getAllImpositionsTfuList(@CurrentUser UserPrincipal userPrincipal) {
+    @GetMapping("/all")
+    public ResponseEntity<?> getAllImpositionsTfuList() {
         try {
-
-            if(userPrincipal==null){
             return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Vous n'êtes pas autorisé à acceder à cette ressource"),
-                        HttpStatus.OK
-                );
-            }
-            User user= userPrincipal.getUser();
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.getImpositionsTfuByUserIdIds(user.getId()), "Liste des Enquetes des unites Logements chargée avec succès."),
+                    new ApiResponse<>(true, impositionsTfuService.getImpositionsTfuList(), "Liste des Enquetes des unites Logements chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/metier/UniteLogementController.java

@@ -5,7 +5,6 @@ import io.gmss.fiscad.entities.rfu.metier.UniteLogement;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.UniteLogementPaylaodWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -36,11 +35,11 @@ public class UniteLogementController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createUniteLogement(@RequestBody @Valid @Validated UniteLogementPaylaodWeb enqueteUniteLogementPaylaodWeb) {
+    public ResponseEntity<?> createUniteLogement(@RequestBody @Valid @Validated UniteLogement enqueteUniteLogement) {
         try {
-            enqueteUniteLogementPaylaodWeb = enqueteUniteLogementService.createUniteLogement(enqueteUniteLogementPaylaodWeb);
+            enqueteUniteLogement = enqueteUniteLogementService.createUniteLogement(enqueteUniteLogement);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementPaylaodWeb, "Unite de logement créé avec succès."),
+                    new ApiResponse<>(true, enqueteUniteLogement, "Unite de logement créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -60,10 +59,10 @@ public class UniteLogementController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateUniteLogement(@PathVariable Long id, @RequestBody UniteLogementPaylaodWeb enqueteUniteLogementPaylaodWeb) {
+    public ResponseEntity<?> updateUniteLogement(@PathVariable Long id, @RequestBody UniteLogement enqueteUniteLogement) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.updateUniteLogement(id, enqueteUniteLogementPaylaodWeb), "Unite de logement mise à jour avec succès."),
+                    new ApiResponse<>(true, enqueteUniteLogementService.updateUniteLogement(id, enqueteUniteLogement), "Unite de logement mise à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -154,54 +153,6 @@ public class UniteLogementController {
         }
     }
 
-    @GetMapping("/all/by-batiment-id/{batimentId}")
-    public ResponseEntity<?> getAllUniteLogementListByBatiment(@PathVariable Long batimentId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByBatiment(batimentId), "Liste des Enquetes des unites Logements chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged/by-batiment-id/{batimentId}")
-    public ResponseEntity<?> getAllUniteLogementByBatimentPaged(@PathVariable Long batimentId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByBatimentPageable(batimentId,pageable), "Liste des enquetes des unites de logements chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getUniteLogementById(@PathVariable Long id) {
         try {
@@ -224,27 +175,4 @@ public class UniteLogementController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-    @GetMapping("/by-parcelle-id/{id}")
-    public ResponseEntity<?> getUniteLogementByParcelleId(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByParcelle(id), "Unite de  de logement trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
 }

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuController.java

@@ -2,9 +2,8 @@ package io.gmss.fiscad.controllers.rfu.parametre;
 
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuBati;
 import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuBatiService;
+import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuBatiPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -25,20 +24,20 @@ import org.springframework.web.client.HttpClientErrorException;
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Barem Rfu")
 public class BaremRfuController {
-    private final BaremRfuBatiService baremRfuBatiService;
+    private final BaremRfuService baremRfuService;
     private static final Logger logger = LoggerFactory.getLogger(BaremRfuController.class);
 
-    public BaremRfuController(BaremRfuBatiService baremRfuBatiService) {
-        this.baremRfuBatiService = baremRfuBatiService;
+    public BaremRfuController(BaremRfuService baremRfuService) {
+        this.baremRfuService = baremRfuService;
     }
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createBaremRfu(@RequestBody @Valid @Validated BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) {
+    public ResponseEntity<?> createBaremRfu(@RequestBody @Valid @Validated BaremRfuBati baremRfuBati) {
         try {
-            baremRfuBatiPayloadWeb = baremRfuBatiService.createBaremRfu(baremRfuBatiPayloadWeb);
+            baremRfuBati = baremRfuService.createBaremRfu(baremRfuBati);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiPayloadWeb, "BaremRfuBati créé avec  succès."),
+                    new ApiResponse<>(true, baremRfuBati, "BaremRfuBati créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -58,10 +57,10 @@ public class BaremRfuController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateBaremRfu(@PathVariable Long id, @RequestBody BaremRfuBatiPayloadWeb baremRfuBatiPayloadWeb) {
+    public ResponseEntity<?> updateBaremRfu(@PathVariable Long id, @RequestBody BaremRfuBati baremRfuBati) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.updateBaremRfu(id, baremRfuBatiPayloadWeb), "BaremRfuBati mis à jour avec succès."),
+                    new ApiResponse<>(true, baremRfuService.updateBaremRfu(id, baremRfuBati), "BaremRfuBati mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -83,7 +82,7 @@ public class BaremRfuController {
     @DeleteMapping("/delete/{id}")
     public ResponseEntity<?> deleteBaremRfur(@PathVariable Long id) {
         try {
-            baremRfuBatiService.deleteBaremRfu(id);
+            baremRfuService.deleteBaremRfu(id);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, "BaremRfuBati supprimée avec succès."),
                     HttpStatus.OK
@@ -108,7 +107,7 @@ public class BaremRfuController {
     public ResponseEntity<?> getAllBaremRfuList() {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuList(), "Liste des baremRfus chargée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuList(), "Liste des baremRfus chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -133,7 +132,7 @@ public class BaremRfuController {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
 
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuList(pageable), "Liste des baremRfus chargée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuList(pageable), "Liste des baremRfus chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -156,7 +155,7 @@ public class BaremRfuController {
     public ResponseEntity<?> getBaremRfuById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuById(id), "BaremRfuBati trouvée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuById(id), "BaremRfuBati trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -175,68 +174,13 @@ public class BaremRfuController {
         }
     }
 
-    @GetMapping("/by-categorie-batiment-id/{idCategorieBatiment}")
+    @GetMapping("/categorie-batiment/{idCategorieBatiment}")
     public ResponseEntity<?> getBaremRfuByType( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
                                                    @PathVariable Long idCategorieBatiment) {
 
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuByCategorieBatiment(idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/by-arrondissement-id/by-categorie-batiment-id/{idArrondissement}/{idCategorieBatiment}")
-    public ResponseEntity<?> getBaremRfuByArrondisementAndCategorie( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
-                                                @PathVariable Long idArrondissement,
-                                                @PathVariable Long idCategorieBatiment
-                                                ) {
-
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuByArrondissementAndCategorieBatiment(idArrondissement,idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/by-quartier-id/by-categorie-batiment-id/{idQuartier}/{idCategorieBatiment}")
-    public ResponseEntity<?> getBaremRfuByQuartierAndCategorie( //@Parameter(description = "ID de la catégorie de bâtiment", required = true)
-                                                                     @PathVariable Long idQuartier,
-                                                                     @PathVariable Long idCategorieBatiment
-    ) {
-
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuBatiService.getBaremRfuByQuartierAndCategorieBatiment(idQuartier,idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargée avec succès."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuByType(idCategorieBatiment), "Liste des baremRfu par categorie de batiments chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/BaremRfuNonBatiController.java

@@ -4,7 +4,6 @@ import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.parametre.BaremRfuNonBatiService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.BaremRfuNonBatiPayloadWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -35,11 +34,11 @@ public class BaremRfuNonBatiController {
 
 
     @PostMapping("/create")
-    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
+    public ResponseEntity<?> createBaremRfuNonBati(@RequestBody @Valid @Validated BaremRfuNonBati baremRfuNonBati) {
         try {
-            baremRfuNonBatiPayloadWeb = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBatiPayloadWeb);
+            baremRfuNonBati = baremRfuNonBatiService.createBaremRfuNonBati(baremRfuNonBati);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiPayloadWeb, "BaremRfuNonBati créé avec  succès."),
+                    new ApiResponse<>(true, baremRfuNonBati, "BaremRfuNonBati créé avec  succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -59,10 +58,10 @@ public class BaremRfuNonBatiController {
     }
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBatiPayloadWeb baremRfuNonBatiPayloadWeb) {
+    public ResponseEntity<?> updateBaremRfuNonBati(@PathVariable Long id, @RequestBody BaremRfuNonBati baremRfuNonBati) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.updateBaremRfuNonBati(id, baremRfuNonBatiPayloadWeb), "BaremRfuNonBati mis à jour avec succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.updateBaremRfuNonBati(id, baremRfuNonBati), "BaremRfuNonBati mis à jour avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -157,31 +156,7 @@ public class BaremRfuNonBatiController {
     public ResponseEntity<?> getBaremRfuNonBatiById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id).orElse(null), "BaremRfuNonBati trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/by-commune-id/by-zone-id/{communeId}/{zoneId}")
-    public ResponseEntity<?> getBaremRfuNonBatiByCommineAndZoneId(@PathVariable Long communeId, Long zoneId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiByCommuneAndZoneId(communeId,zoneId).orElse(null), "BaremRfuNonBati trouvée avec succès."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id), "BaremRfuNonBati trouvée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/EquipeController.java

@@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.rfu.parametre.Equipe;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload;
+import io.gmss.fiscad.paylaods.request.EquipePayload;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;

src/main/java/io/gmss/fiscad/controllers/rfu/parametre/UsageController.java

@@ -1,180 +0,0 @@
-package io.gmss.fiscad.controllers.rfu.parametre;
-
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.parametre.UsageService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/usage", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Usage")
-public class UsageController {
-
-    private final UsageService usageService;
-    private static final Logger logger = LoggerFactory.getLogger(UsageController.class);
-
-    public UsageController(UsageService usageService) {
-        this.usageService = usageService;
-    }
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createUsage(@RequestBody @Valid @Validated Usage usage) {
-        try {
-            usage = usageService.createUsage(usage);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usage, "Usage créé avec  succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateUsage(@PathVariable Long id, @RequestBody Usage usage) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.updateUsage(id, usage), "Usage mis à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteUsager(@PathVariable Long id) {
-        try {
-            usageService.deleteUsage(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Usage supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllUsageList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.getUsageList(), "Liste des usages chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllUsagePaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.getUsageList(pageable), "Liste des usages chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getUsageById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, usageService.getUsageById(id), "Usage trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-}
-

src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java

@@ -4,8 +4,7 @@ import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload;
-import io.gmss.fiscad.paylaods.request.synchronisation.*;
+import io.gmss.fiscad.paylaods.request.*;
 import io.gmss.fiscad.service.ZipService;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -469,11 +468,11 @@ public class SynchronisationController {
 
     @PostMapping(path = "/caracteristique-batiment")
     @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
-    public ResponseEntity<?> syncCaracteristiqueBatiment(@RequestBody List<CaracteristiqueBatimentPayload> CaracteristiqueBatimentPayloads) {
+    public ResponseEntity<?> syncCaracteristiqueBatiment(@RequestBody List<CaracteristiqueBatimentPaylod> caracteristiqueBatimentPaylods) {
         try {
             return new ResponseEntity<>(
                     //new ApiResponse<>(true, null, "Liste des caractéristiques des bâtiments synchronisée avec succès."),
-                    new ApiResponse<>(true, synchronisationService.syncCaracteristiqueBatiment(CaracteristiqueBatimentPayloads), "Liste des caractéristiques des bâtiments synchronisée avec succès."),
+                    new ApiResponse<>(true, synchronisationService.syncCaracteristiqueBatiment(caracteristiqueBatimentPaylods), "Liste des caractéristiques des bâtiments synchronisée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -494,11 +493,11 @@ public class SynchronisationController {
 
     @PostMapping(path = "/caracteristique-parcelle")
     @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
-    public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePayload> CaracteristiqueParcellePayloads) {
+    public ResponseEntity<?> syncCaracteristiqueParcelle(@RequestBody List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods) {
         try {
             return new ResponseEntity<>(
                     //new ApiResponse<>(true, null, "Liste des caractéristiques des parcelles synchronisée avec succès."),
-                    new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(CaracteristiqueParcellePayloads), "Liste des caractéristiques des parcelles synchronisée avec succès."),
+                    new ApiResponse<>(true, synchronisationService.syncCaracteristiqueParcelle(caracteristiqueParcellePaylods), "Liste des caractéristiques des parcelles synchronisée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -519,11 +518,11 @@ public class SynchronisationController {
 
     @PostMapping(path = "/caracteristique-unite-logement")
     @PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
-    public ResponseEntity<?> syncCaracteristiqueUniteLogement(@RequestBody List<CaracteristiqueUniteLogementPayload> CaracteristiqueUniteLogementPayloads) {
+    public ResponseEntity<?> syncCaracteristiqueUniteLogement(@RequestBody List<CaracteristiqueUniteLogementPaylod> caracteristiqueUniteLogementPaylods) {
         try {
             return new ResponseEntity<>(
                     //new ApiResponse<>(true, null, "Liste des caractéristiques des unités de logement synchronisée avec succès."),
-                    new ApiResponse<>(true, synchronisationService.syncCaracteristiqueUniteLogement(CaracteristiqueUniteLogementPayloads), "Liste des caractéristiques des unités de logement synchronisée avec succès."),
+                    new ApiResponse<>(true, synchronisationService.syncCaracteristiqueUniteLogement(caracteristiqueUniteLogementPaylods), "Liste des caractéristiques des unités de logement synchronisée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

src/main/java/io/gmss/fiscad/controllers/user/AuthController.java

@@ -11,7 +11,6 @@ import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.JwtAuthenticationResponse;
 import io.gmss.fiscad.paylaods.Login;
 import io.gmss.fiscad.paylaods.UserRequest;
-import io.gmss.fiscad.paylaods.request.crudweb.UserPaylaodWeb;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
@@ -91,13 +90,13 @@ public class AuthController {
     }
 
     @PostMapping("/signup")
-    public ResponseEntity<?> createUser(@RequestBody @Valid @Validated UserPaylaodWeb userPaylaodWeb) {
+    public ResponseEntity<?> createUser(@RequestBody @Valid @Validated UserRequest userRequest) {
         try {
-            //User user = getUser(userRequest);
-            //user.setUsername(userRequest.getEmail());
-            userPaylaodWeb = userService.createUser(userPaylaodWeb);
+            User user = getUser(userRequest);
+            user.setUsername(userRequest.getEmail());
+            user = userService.createUser(user, true);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, userPaylaodWeb, "Inscription effectué avec succès."),
+                    new ApiResponse<>(true, user, "Inscription effectué avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -116,5 +115,19 @@ public class AuthController {
         }
     }
 
-
+    private User getUser(UserRequest userRequest) {
+        User user = new User();
+        user.setNom(userRequest.getNom());
+        user.setPrenom(userRequest.getPrenom());
+        user.setTel(userRequest.getTelephone());
+        user.setEmail(userRequest.getEmail());
+        user.setUsername(userRequest.getEmail());
+        user.setPassword(userRequest.getPassword());
+        user.setActive(false);
+        Set<Role> roleSet = new HashSet<>();
+        roleSet.add(roleService.getRoleByRoleName(UserRole.ROLE_ANONYMOUS).get());
+        user.setRoles(roleSet);
+        user.setStructure(structureService.getStructureById(userRequest.getStructureId()).get());
+        return user;
+    }
 }

src/main/java/io/gmss/fiscad/controllers/user/AvoirFonctionController.java

@@ -1,234 +0,0 @@
-package io.gmss.fiscad.controllers.user;
-
-
-import io.gmss.fiscad.entities.user.AvoirFonction;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.user.AvoirFonctionService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.AvoirFonctionPaylaodWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/fonction-utilisateur", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Fonction Utilisateur")
-@CrossOrigin(origins = "*")
-public class AvoirFonctionController {
-
-    private final AvoirFonctionService avoirFonctionService;
-    private static final Logger logger = LoggerFactory.getLogger(AvoirFonctionController.class);
-
-    public AvoirFonctionController(AvoirFonctionService avoirFonctionService) {
-        this.avoirFonctionService = avoirFonctionService;
-    }
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createAvoirFonction(@RequestBody @Valid @Validated AvoirFonctionPaylaodWeb avoirFonctionPaylaodWeb ) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.createAvoirFonction(avoirFonctionPaylaodWeb), "Fonction utilisateur créée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateAvoirFonction(@PathVariable Long id, @RequestBody AvoirFonctionPaylaodWeb avoirFonctionPaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.updateAvoirFonction(id, avoirFonctionPaylaodWeb), "Fonction utilisateur mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteAvoirFonction(@PathVariable Long id) {
-        try {
-            avoirFonctionService.deleteAvoirFonction(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Fonction Utilisateur supprimée avec succès"),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAll() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.getAvoirFonctionList(), "Liste des fonctions utilisateur."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.getAvoirFonctionList(pageable), "Liste des fonction utilisateurs."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.getAvoirFonctionById(id), "Fonction utilisateur trouvés avec succès"),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/by-utilisateur-id/{userId}")
-    public ResponseEntity<?> getByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.getAvoirFonctionByUserId(userId), "Fonctions de utilisateur trouvées avec succès"),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @GetMapping("/page/by-utilisateur-id/{userId}")
-    public ResponseEntity<?> getByUserIdPageable(@PathVariable Long userId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, avoirFonctionService.getAvoirFonctionByUserId(userId,pageable), "Fonctions de utilisateur trouvées avec succès"),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-
-
-}

src/main/java/io/gmss/fiscad/controllers/user/DemandeReinitialisationMPController.java

@@ -113,17 +113,30 @@ public class DemandeReinitialisationMPController {
         }
     }
 
-//    @GetMapping("/all")
-//    public ResponseEntity<?> getAllDemandeReinitialisationMPList(@CurrentUser UserPrincipal userPrincipal) {
-//        try {
-//
-//            User user = userPrincipal.getUser();
-//
-//            if (user.getRoles().stream().anyMatch(r -> r.getNom().equals(UserRole.ROLE_ADMIN))) {
-//                return new ResponseEntity<>(
-//                        new ApiResponse<>(true, demandeReinitialisationMPService.getDemandeReinitialisationMPList(), "Liste des demande de Reinitialisation chargée avec succès."),
-//                        HttpStatus.OK
-//                );
+    @GetMapping("/all")
+    public ResponseEntity<?> getAllDemandeReinitialisationMPList(@CurrentUser UserPrincipal userPrincipal) {
+        try {
+
+            User user = userPrincipal.getUser();
+
+            if (user.getRoles().stream().anyMatch(r -> r.getNom().equals(UserRole.ROLE_ADMIN))) {
+                return new ResponseEntity<>(
+                        new ApiResponse<>(true, demandeReinitialisationMPService.getDemandeReinitialisationMPList(), "Liste des demande de Reinitialisation chargée avec succès."),
+                        HttpStatus.OK
+                );
+            } else {
+                if (user.getStructure() == null) {
+                    return new ResponseEntity<>(
+                            new ApiResponse<>(false, "Cet utilisateur n'est pas dans une structure; on ne peut donc pas afficher les demandes de réinitialisation de mot de passe."),
+                            HttpStatus.OK
+                    );
+                } else {
+                    return new ResponseEntity<>(
+                            new ApiResponse<>(true, demandeReinitialisationMPService.getDemandeReinitialisationMPNonTraiteList(user.getStructure()), "Liste des demande de Reinitialisation chargée avec succès."),
+                            HttpStatus.OK
+                    );
+                }
+            }
 //            }else {
 //                if (user.getStructure() == null) {
 //                    return new ResponseEntity<>(
@@ -137,35 +150,22 @@ public class DemandeReinitialisationMPController {
 //                    );
 //                }
 //            }
-////            }else {
-////                if (user.getStructure() == null) {
-////                    return new ResponseEntity<>(
-////                            new ApiResponse<>(false, "Cet utilisateur n'est pas dans une structure; on ne peut donc pas afficher les demandes de réinitialisation de mot de passe."),
-////                            HttpStatus.OK
-////                    );
-////                } else {
-////                    return new ResponseEntity<>(
-////                            new ApiResponse<>(true, demandeReinitialisationMPService.getDemandeReinitialisationMPNonTraiteList(user.getStructure()), "Liste des demande de Reinitialisation chargée avec succès."),
-////                            HttpStatus.OK
-////                    );
-////                }
-////            }
-//        } catch (HttpClientErrorException.MethodNotAllowed e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-//        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-//                 FileStorageException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-//        } catch (NullPointerException e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-//        } catch (Exception e) {
-//            logger.error(e.getLocalizedMessage());
-//            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-//        }
-//
-//    }
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+
+    }
 
     @GetMapping("/all-paged")
     public ResponseEntity<?> getAllDemandeReinitialisationMPPaged(@RequestParam int pageNo, @RequestParam int pageSize) {

src/main/java/io/gmss/fiscad/controllers/user/FonctionController.java

@@ -1,179 +0,0 @@
-package io.gmss.fiscad.controllers.user;
-
-
-import io.gmss.fiscad.entities.user.Fonction;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.rfu.metier.FonctionService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.FonctionPaylaodWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/fonction", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Fonction")
-@CrossOrigin(origins = "*")
-public class FonctionController {
-
-    private final FonctionService fonctionService;
-
-    private static final Logger logger = LoggerFactory.getLogger(FonctionController.class);
-
-    public FonctionController(FonctionService fonctionService) {
-        this.fonctionService = fonctionService;
-    }
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createFonction(@RequestBody @Valid @Validated FonctionPaylaodWeb fonctionPaylaodWeb) {
-        try {
-           Fonction fonction = fonctionService.createFonction(fonctionPaylaodWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonction, "Secteur affecté avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateFonction(@PathVariable Long id, @RequestBody FonctionPaylaodWeb fonctionPaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionService.updateFonction(id, fonctionPaylaodWeb), "Affectation de Secteur mise à jour avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteFonction(@PathVariable Long id) {
-        try {
-            fonctionService.deleteFonction(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Fonction supprimée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAllFonctionList() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionService.getFonctionListToDto(), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllFonctionPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionService.getFonctionListToDtoPageable(pageable), "Liste des caractéristiques chargée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getFonctionById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, fonctionService.getFonctionById(id), "Fonction trouvée avec succès."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-}

src/main/java/io/gmss/fiscad/controllers/user/ProfileController.java

@@ -1,182 +0,0 @@
-package io.gmss.fiscad.controllers.user;
-
-
-import io.gmss.fiscad.entities.user.Profile;
-import io.gmss.fiscad.exceptions.*;
-import io.gmss.fiscad.interfaces.user.ProfileService;
-import io.gmss.fiscad.paylaods.ApiResponse;
-import io.gmss.fiscad.paylaods.request.crudweb.ProfilePaylaodWeb;
-import io.swagger.v3.oas.annotations.security.SecurityRequirement;
-import io.swagger.v3.oas.annotations.tags.Tag;
-import jakarta.validation.Valid;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
-import org.springframework.http.HttpStatus;
-import org.springframework.http.MediaType;
-import org.springframework.http.ResponseEntity;
-import org.springframework.validation.annotation.Validated;
-import org.springframework.web.bind.annotation.*;
-import org.springframework.web.client.HttpClientErrorException;
-
-
-@RestController
-@RequestMapping(value = "api/profil", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
-@Tag(name = "Profile")
-@CrossOrigin(origins = "*")
-public class ProfileController {
-
-    private final ProfileService profileService;
-    private static final Logger logger = LoggerFactory.getLogger(ProfileController.class);
-
-    public ProfileController(ProfileService profileService) {
-        this.profileService = profileService;
-    }
-
-
-    @PostMapping("/create")
-    public ResponseEntity<?> createProfile(@RequestBody @Valid @Validated ProfilePaylaodWeb profilePaylaodWeb ) {
-        try {
-            Profile  profile = profileService.createProfile(profilePaylaodWeb);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profile, "Profile created successully."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-
-    @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateProfile(@PathVariable Long id, @RequestBody ProfilePaylaodWeb profilePaylaodWeb) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileService.updateProfile(id, profilePaylaodWeb), "Profile updated successully."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @DeleteMapping("/delete/{id}")
-    public ResponseEntity<?> deleteProfile(@PathVariable Long id) {
-        try {
-            profileService.deleteProfile(id);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, "Profile deleted successully"),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all")
-    public ResponseEntity<?> getAll() {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileService.getProfileList(), "Liste des profiles."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/id/{id}")
-    public ResponseEntity<?> getById(@PathVariable Long id) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileService.getProfileById(id), "Profile trouvé avec succès"),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, profileService.getProfileList(pageable), "Liste des profiles."),
-                    HttpStatus.OK
-            );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-}

src/main/java/io/gmss/fiscad/controllers/user/UserController.java

@@ -8,15 +8,12 @@ import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.user.UserService;
 import io.gmss.fiscad.paylaods.ApiResponse;
 import io.gmss.fiscad.paylaods.Login;
-import io.gmss.fiscad.paylaods.request.crudweb.UserPaylaodWeb;
 import io.gmss.fiscad.security.CurrentUser;
 import io.gmss.fiscad.security.UserPrincipal;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
-import org.springframework.data.domain.PageRequest;
-import org.springframework.data.domain.Pageable;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
@@ -24,7 +21,6 @@ import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.client.HttpClientErrorException;
 
-import java.util.Optional;
 import java.util.Set;
 
 
@@ -44,11 +40,12 @@ public class UserController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createUser(@RequestBody @Valid @Validated UserPaylaodWeb userPaylaodWeb) {
+    public ResponseEntity<?> createUser(@RequestBody @Valid @Validated User user) {
         try {
-            userPaylaodWeb  = userService.createUser(userPaylaodWeb);
+            user.setUsername(user.getEmail());
+            user = userService.createUser(user, true);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, userPaylaodWeb, "Utilisateur créé avec succès"),
+                    new ApiResponse<>(true, user, "Utilisateur créé avec succès"),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -94,9 +91,9 @@ public class UserController {
     @PostMapping("/reset-password")
     public ResponseEntity<?> resetUserPassword(@RequestBody @Valid @Validated Login login) {
         try {
-            UserPaylaodWeb userPaylaodWeb= userService.resetPassword(login.getUsername());
+            User user = userService.resetPassword(login.getUsername(), login.getPassword());
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, userPaylaodWeb, "Votre mot de passe à été réinitialisée avec succès."),
+                    new ApiResponse<>(true, user, "Votre mot de passe à été réinitialisée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -115,10 +112,10 @@ public class UserController {
         }
     }
 
-    @PostMapping("/validate-user-account/{userName}")
-    public ResponseEntity<?> validateUserAccount(@PathVariable String userName) {
+    @PostMapping("/validate-user-account")
+    public ResponseEntity<?> validateUserAccount(@RequestBody @Valid @Validated Login login) {
         try {
-            User user = userService.validateUserAccount(userName);
+            User user = userService.validateUserAccount(login.getUsername(), login.getUserRole());
             return new ResponseEntity<>(
                     new ApiResponse<>(true, user, "Cet compte à été activé avec succès."),
                     HttpStatus.OK
@@ -141,10 +138,10 @@ public class UserController {
 
 
     @PutMapping("/update/{id}")
-    public ResponseEntity<?> updateUser(@PathVariable Long id, @RequestBody UserPaylaodWeb userPaylaodWeb) {
+    public ResponseEntity<?> updateUser(@PathVariable Long id, @RequestBody User user) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, userService.updateUser(id, userPaylaodWeb), "Utilisateur modifié avec succès."),
+                    new ApiResponse<>(true, userService.updateUser(id, user), "Utilisateur modifié avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -163,37 +160,30 @@ public class UserController {
         }
     }
 
-    @GetMapping("/activate/{id}")
-    public ResponseEntity<?> acitvateUser(@PathVariable Long id) {
+    @GetMapping("/activate-or-not/{id}")
+    public ResponseEntity<?> acitvateOrNotUser(@PathVariable Long id) {
         try {
-            User user  = userService.activateUser(id);
+
+            User user = userService.getUserById(id);
+            if(containsRoleAnonyme(user.getRoles())){
                 return new ResponseEntity<>(
-                    new ApiResponse<>(true, user, "Utilisateur activé avec succès"),
+                        new ApiResponse<>(false, user , "Ce compte n'est pas encore validé."),
                         HttpStatus.OK
                 );
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
             }
-    }
-
-
-    @GetMapping("/desactivate/{id}")
-    public ResponseEntity<?> disacitvateUser(@PathVariable Long id) {
-        try {
-            User user  = userService.disactivateUser(id);
+            if(user.isResetPassword()){
                 return new ResponseEntity<>(
-                    new ApiResponse<>(true, user, "Utilisateur désactivé avec succès"),
+                        new ApiResponse<>(false, user , "Ce compte n'est pas encore validé."),
+                        HttpStatus.OK
+                );
+            }
+            user = userService.activateOrNotUser(id);
+            String message = "Utilisateur activé avec succès";
+            if (!user.isActive()) {
+                message = "Utilisateur désactivé avec succès";
+            }
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, user, message),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -238,87 +228,57 @@ public class UserController {
 
 
     @GetMapping("/all")
-    public ResponseEntity<?> getAll() {
+    public ResponseEntity<?> getAll(@CurrentUser UserPrincipal userPrincipal) {
         try {
-
+            if(userPrincipal==null){
                 return new ResponseEntity<>(
-                        new ApiResponse<>(true, userService.getListUserToDto(), "Liste des utilisateurs chargée avec succès."),
-                        HttpStatus.OK);
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-paged")
-    public ResponseEntity<?> getAllPaged(@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, userService.getListUserToDto(pageable), "Liste des utilisateurs chargée avec succès."),
-                    HttpStatus.OK);
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-        }
-    }
-
-    @GetMapping("/all-by-structure/{structureId}")
-    public ResponseEntity<?> getAllByStructure(@PathVariable Long structureId) {
-        try {
-
-                return new ResponseEntity<>(
-                        new ApiResponse<>(true, userService.getListUserByStructureToDto(structureId), "Liste des utilisateurs chargée avec succès."),
+                        new ApiResponse<>(false, null, "Vous n'êtes pas authorisés à accéder à la liste des utilisateurs"),
                         HttpStatus.OK
                 );
-
-        } catch (HttpClientErrorException.MethodNotAllowed e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
-        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
-                 FileStorageException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
-        } catch (NullPointerException e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
-        } catch (Exception e) {
-            logger.error(e.getLocalizedMessage());
-            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
             }
+            User user = userPrincipal.getUser();
 
-    }
-
-    @GetMapping("/page/all-by-structure/{structureId}")
-    public ResponseEntity<?> getAllByStructurePaged(@PathVariable Long structureId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-
+            if (user.getRoles().stream().anyMatch(r -> r.getNom().equals(UserRole.ROLE_ADMIN))) {
                 return new ResponseEntity<>(
-                        new ApiResponse<>(true, userService.getListUserByStructureToDto(structureId,pageable), "Liste des utilisateurs chargée avec succès."),
+                        new ApiResponse<>(true, userService.getAllUserListResponse(), "Liste des utilisateurs chargée avec succès."),
                         HttpStatus.OK
                 );
+            } else {
+                return new ResponseEntity<>(
+                        new ApiResponse<>(true, userService.getListUserResponseByStructure(userPrincipal.getUser().getStructure().getId()), "Liste des utilisateurs chargée avec succès."),
+                        HttpStatus.OK
+                );
+            }
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+    @GetMapping("/all-by-structure")
+    public ResponseEntity<?> getAllByStructure(@CurrentUser UserPrincipal userPrincipal) {
+        try {
+            if (userPrincipal.getUser().getStructure() != null) {
+                return new ResponseEntity<>(
+                        new ApiResponse<>(true, userService.getListUserByStructure(userPrincipal.getUser().getStructure().getId()), "Liste des utilisateurs chargée avec succès."),
+                        HttpStatus.OK
+                );
+            } else {
+                return new ResponseEntity<>(
+                        new ApiResponse<>(false, "Impossible de trouver la structure indiquée."),
+                        HttpStatus.OK
+                );
+            }
         } catch (HttpClientErrorException.MethodNotAllowed e) {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
@@ -336,6 +296,14 @@ public class UserController {
 
     }
 
+//    @GetMapping("/all-paged")
+//    public ResponseEntity<?> getAllpaged(@RequestParam int pageNo, @RequestParam int pageSize) {
+//        Pageable pageable = PageRequest.of(pageNo, pageSize);
+//        return new ResponseEntity<>(
+//                new ApiResponse<>(true, userService.getUserList(pageable), "Liste des utilisateurs chargée avec succès."),
+//                HttpStatus.OK
+//        );
+//    }
 
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getUserById(@PathVariable Long id) {
@@ -383,5 +351,35 @@ public class UserController {
         }
     }
 
-
+    @GetMapping("/all-by-role/{userrole}")
+    public ResponseEntity<?> getUserByUserRole(@PathVariable UserRole userrole) {
+        try {
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, userService.getUserByProfil(userrole), "Users found."),
+                    HttpStatus.OK
+            );
+        } catch (HttpClientErrorException.MethodNotAllowed e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
+        } catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
+                 FileStorageException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
+        } catch (NullPointerException e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
+        } catch (Exception e) {
+            logger.error(e.getLocalizedMessage());
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
+        }
+    }
+
+    public boolean  containsRoleAnonyme(Set<Role> roles){
+        for(Role r: roles ){
+            if(r.getNom().equals(UserRole.ROLE_ANONYMOUS)){
+                return true;
+            }
+        }
+        return false;
+    }
 }

src/main/java/io/gmss/fiscad/entities/BaseEntity.java

@@ -37,6 +37,4 @@ public class BaseEntity implements Serializable {
     private boolean deleted;
     private Long externalKey;
     private Long enqueteExternalKey;
-    @JsonIgnore
-    private String source ;
 }

src/main/java/io/gmss/fiscad/entities/Parameters.java

@@ -1,28 +0,0 @@
-package io.gmss.fiscad.entities;
-
-import io.gmss.fiscad.entities.audit.UserDateAudit;
-import io.gmss.fiscad.enums.ParametersType;
-import jakarta.persistence.*;
-import lombok.Getter;
-import lombok.Setter;
-
-import java.io.Serializable;
-
-@Entity
-@Getter
-@Setter
-public class Parameters extends UserDateAudit implements Serializable {
-
-
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @Enumerated(EnumType.STRING)
-    private ParametersType name;
-    private String value;
-
-    public Parameters() {
-    }
-
-
-}

src/main/java/io/gmss/fiscad/entities/audit/DateAudit.java

@@ -1,43 +0,0 @@
-package io.gmss.fiscad.entities.audit;
-
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.EntityListeners;
-import jakarta.persistence.MappedSuperclass;
-import org.springframework.data.annotation.CreatedDate;
-import org.springframework.data.annotation.LastModifiedDate;
-import org.springframework.data.jpa.domain.support.AuditingEntityListener;
-
-import java.io.Serializable;
-import java.time.Instant;
-
-@MappedSuperclass
-@EntityListeners(AuditingEntityListener.class)
-public abstract class DateAudit implements Serializable {
-
-    @JsonIgnore
-    @CreatedDate
-   // @Column(updatable = false)
-    private Instant createdAt= Instant.now() ;
-
-    @JsonIgnore
-    @LastModifiedDate
-   // @Column(nullable = false)
-    private Instant  updatedAt=Instant.now();
-
-    public Instant  getCreatedAt() {
-        return createdAt;
-    }
-
-    public void setCreatedAt(Instant  createdAt) {
-        this.createdAt = createdAt;
-    }
-
-    public Instant  getUpdatedAt() {
-        return updatedAt;
-    }
-
-    public void setUpdatedAt(Instant  updatedAt) {
-        this.updatedAt = updatedAt;
-    }
-}

src/main/java/io/gmss/fiscad/entities/audit/UserDateAudit.java

@@ -1,37 +0,0 @@
-package io.gmss.fiscad.entities.audit;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import jakarta.persistence.Column;
-import jakarta.persistence.MappedSuperclass;
-import org.springframework.data.annotation.CreatedBy;
-import org.springframework.data.annotation.LastModifiedBy;
-
-import java.io.Serializable;
-
-@MappedSuperclass
-public abstract class UserDateAudit extends DateAudit implements Serializable {
-    @JsonIgnore
-    @CreatedBy
-    @Column(updatable = false)
-    private Long createdBy;
-
-    @JsonIgnore
-    @LastModifiedBy
-    private Long updatedBy;
-
-    public Long getCreatedBy() {
-        return createdBy;
-    }
-
-    public void setCreatedBy(Long createdBy) {
-        this.createdBy = createdBy;
-    }
-
-    public Long getUpdatedBy() {
-        return updatedBy;
-    }
-
-    public void setUpdatedBy(Long updatedBy) {
-        this.updatedBy = updatedBy;
-    }
-}

src/main/java/io/gmss/fiscad/entities/decoupage/Quartier.java

@@ -24,13 +24,9 @@ public class Quartier extends BaseEntity implements Serializable {
     private Long id;
     private String code;
     private String nom;
-    private String codeExterne;
    // @JsonIgnore
     @ManyToOne
     private Arrondissement arrondissement;
-
-    private String longitude;
-    private String latitude;
 //    @JsonIgnore
 //    @OneToOne(mappedBy = "quartier")
 //    private Bloc bloc;

src/main/java/io/gmss/fiscad/entities/decoupage/Secteur.java

@@ -1,6 +1,5 @@
 package io.gmss.fiscad.entities.decoupage;
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonManagedReference;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
@@ -27,16 +26,16 @@ public class Secteur extends BaseEntity implements Serializable {
     private Long id;
     private String code;
     private String nom;
-
-   // @ManyToOne
-   // private Structure structure;
-
-    //@JsonBackReference
     @ManyToOne
-    private Section section ;
+    private User chefSecteur;
+    @ManyToOne
+    private Structure structure;
 
-    //@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-   // @JoinColumn(name = "secteur_id")
-   // @JsonManagedReference
-   // private List<SecteurDecoupage> secteurDecoupages;
+    @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
+    @JoinColumn(name = "secteur_id")
+    @JsonManagedReference
+    private List<SecteurDecoupage> secteurDecoupages;
+
+    ///Creer un payload pour la creation de secteur découpage
+    /// ressource pour envoyer les découpage d'un secteur
 }

src/main/java/io/gmss/fiscad/entities/decoupage/SecteurDecoupage.java

@@ -25,6 +25,7 @@ import java.util.List;
 @AllArgsConstructor
 @Where(clause = " deleted = false")
 public class SecteurDecoupage extends BaseEntity implements Serializable {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -35,20 +36,16 @@ public class SecteurDecoupage extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateFin;
 
-    //@JsonBackReference
+    @JsonBackReference
     @ManyToOne
     private Secteur secteur;
 
-    private String codeSecteur ;
-
     @ManyToOne
     private Arrondissement arrondissement;
 
     @ManyToOne
     private Quartier quartier;
 
-    private String codeQuartier ;
-
 //    @JsonIgnore
 //    @OneToMany(mappedBy = "secteurDecoupage")
 //    private List<Bloc> blocs;

src/main/java/io/gmss/fiscad/entities/decoupage/Section.java

@@ -1,37 +0,0 @@
-package io.gmss.fiscad.entities.decoupage;
-
-import com.fasterxml.jackson.annotation.JsonManagedReference;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.user.Fonction;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Where(clause = " deleted = false")
-public class Section extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String code;
-    private String nom;
-
-    @ManyToOne
-    private Structure structure;
-
-    //@OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
-    //@JoinColumn(name = "section_id")
-    //@JsonManagedReference
-    //private List<Secteur> secteurs;
-}

src/main/java/io/gmss/fiscad/entities/infocad/metier/ActeurConcerne.java

@@ -55,9 +55,9 @@ public class ActeurConcerne extends BaseEntity implements Serializable {
     @Enumerated(EnumType.STRING)
     private RoleActeur roleActeur;
 
-//    @OneToMany(mappedBy = "acteurConcerne")
-//    @JsonManagedReference
-//    private List<Piece> pieces;
+    @OneToMany(mappedBy = "acteurConcerne")
+    @JsonManagedReference
+    private List<Piece> pieces;
 
     @JsonIgnore
     @ManyToOne

src/main/java/io/gmss/fiscad/entities/infocad/metier/Enquete.java

@@ -8,7 +8,6 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.infocad.parametre.Bloc;
-import io.gmss.fiscad.entities.infocad.parametre.ModeAcquisition;
 import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
@@ -16,16 +15,18 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
 import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
 import io.gmss.fiscad.entities.rfu.parametre.Campagne;
 import io.gmss.fiscad.entities.rfu.parametre.Equipe;
-import io.gmss.fiscad.entities.rfu.parametre.Exercice;
 import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
 import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatutEnquete;
+import io.gmss.fiscad.enums.StatusEnquete;
 import io.gmss.fiscad.enums.StatutEnregistrement;
+import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
+import org.hibernate.annotations.SQLDelete;
+import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
 import java.time.LocalDate;
@@ -55,29 +56,11 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
 
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
-
-
-    private Boolean litige;
-
-
-    @ManyToOne
-    private User user;
-
-    //@JsonIgnore
-    @ManyToOne
-    private Exercice exercice;
+    private boolean litige;
 
     @JsonIgnore
     @ManyToOne
-    private ModeAcquisition modeAcquisition;
+    private User user;
 
     private Long mobileDataId;
 
@@ -85,7 +68,7 @@ public class Enquete extends BaseEntity implements Serializable {
     @OneToMany(mappedBy = "enquete")
     private List<ActeurConcerne> acteurConcernes;
 
-    //@JsonIgnore
+    @JsonIgnore
     @ManyToOne
     private Parcelle parcelle;
 
@@ -103,7 +86,7 @@ public class Enquete extends BaseEntity implements Serializable {
     @ManyToOne
     private Equipe equipe;
 
-   // @JsonIgnore
+    @JsonIgnore
     @ManyToOne
     @JoinColumn(name = "proprietaire_id")
     private Personne personne ;
@@ -114,7 +97,7 @@ public class Enquete extends BaseEntity implements Serializable {
     private String autreNumeroTitreFoncier;
     private Long personneId;
     @Enumerated(EnumType.STRING)
-    private StatutEnquete statutEnquete;
+    private StatusEnquete statusEnquete;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateValidation;
@@ -131,7 +114,7 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateSynchronisation;
-    private Boolean synchronise;
+    private boolean synchronise;
     private String observationParticuliere;
     @Transient
     private String nomPrenomEnqueteur;
@@ -172,24 +155,18 @@ public class Enquete extends BaseEntity implements Serializable {
     private String numeroTitreFoncier;
 
     /// Nouveau champs ajoutés pour RFU Abomey
-    private String numEntreeParcelle;
+    private String numEnterParcelle;
     private String numRue;
     private String nomRue;
     private String emplacement;
-    private Float altitude;
-    private Float precision;
-    private Integer nbreCoProprietaire;
-    private Integer nbreIndivisiaire;
+    private float altitude;
+    private float precision;
+    private int nbreCoProprietaire;
+    private int nbreIndivisiaire;
     private String autreAdresse;
-    private Float superficie ;
-    private Integer nbreBatiment;
-    private Integer nbrePiscine;
-    private Long montantMensuelleLocation;
-    private Long montantAnnuelleLocation;
-    private Long valeurParcelleEstime;
-    private Long valeurParcelleReel;
-    private Long valeurParcelleCalcule;
-    private String ncProprietaire;
+    private String surface;
+    private int nbreBatiment;
+    private int nbrePiscine;
 
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
@@ -199,27 +176,20 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateFinExcemption;
 
-    private String representantNom;
-    private String representantPrenom;
-    private String representantTel;
-    private String representantNpi;
-//
-//    @JsonIgnore
-//    @OneToMany(mappedBy = "enquete")
-//    @JsonManagedReference
-//    private List<EnqueteUniteLogement> enqueteUniteLogements;
+    @JsonIgnore
+    @OneToMany(mappedBy = "enquete")
+    private List<EnqueteUniteLogement> enqueteUniteLogements;
 
-//    @JsonIgnore
-//    @JsonManagedReference
-//    @OneToMany(mappedBy = "enquete")
-//    private List<EnqueteBatiment> enqueteBatiments;
+    @JsonIgnore
+    @OneToMany(mappedBy = "enquete")
+    private List<EnqueteBatiment> enqueteBatiments;
 
     @JsonIgnore
     @OneToMany(mappedBy = "enquete")
     private List<CaracteristiqueParcelle> caracteristiqueParcelles;
 
-    //@Enumerated(EnumType.STRING)
-    //private StatutEnregistrement statutEnregistrement;
+    @Enumerated(EnumType.STRING)
+    private StatutEnregistrement statutEnregistrement;
 
 
     public Long getTerminalId() {
@@ -250,7 +220,7 @@ public class Enquete extends BaseEntity implements Serializable {
     public String getDepartement() {
         if (this.bloc != null) {
             Arrondissement arrondissement = this.bloc.getArrondissement();
-            if (arrondissement != null && arrondissement.getCommune()!=null && arrondissement.getCommune().getDepartement()!=null) {
+            if (arrondissement != null) {
                 return arrondissement.getCommune().getDepartement().getNom();
             } else return "";
         } else return "";
@@ -259,7 +229,7 @@ public class Enquete extends BaseEntity implements Serializable {
     public String getCommune() {
         if (this.bloc != null) {
             Arrondissement arrondissement = this.bloc.getArrondissement();
-            if (arrondissement != null && arrondissement.getCommune()!=null) {
+            if (arrondissement != null) {
                 return arrondissement.getCommune().getNom();
             } else return "";
         } else return "";
@@ -277,7 +247,7 @@ public class Enquete extends BaseEntity implements Serializable {
     public String getTypeDomaine() {
         if (this.parcelle != null) {
             NatureDomaine natureDomaine = this.parcelle.getNatureDomaine();
-            if (natureDomaine != null && natureDomaine.getTypeDomaine()!=null ) {
+            if (natureDomaine != null) {
                 return natureDomaine.getTypeDomaine().getLibelle();
             } else return "";
         } else return "";
@@ -290,7 +260,7 @@ public class Enquete extends BaseEntity implements Serializable {
     }
 
     public String getStructureEnqueteur() {
-        if (this.user != null && this.user.getStructure()!=null) {
+        if (this.user != null) {
             return this.user.getStructure().getNom();
         } else return "";
     }

src/main/java/io/gmss/fiscad/entities/infocad/metier/Parcelle.java

@@ -1,15 +1,10 @@
 package io.gmss.fiscad.entities.infocad.metier;
 
-import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonIgnore;
-import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
-import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Quartier;
 import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
 import io.gmss.fiscad.entities.rfu.metier.Batiment;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import jakarta.persistence.*;
 import lombok.*;
 import org.hibernate.annotations.ColumnDefault;
@@ -17,7 +12,6 @@ import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -31,6 +25,7 @@ import java.util.List;
 //                "WHERE id = ?")
 //@Where(clause = " deleted = false")
 public class Parcelle extends BaseEntity implements Serializable {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
@@ -41,49 +36,30 @@ public class Parcelle extends BaseEntity implements Serializable {
     private String numeroParcelle;
     private String longitude;
     private String latitude;
-    private String altitude;
     private String situationGeographique;
-    @ColumnDefault("0.0")
-    private Float superficie;
+    @ColumnDefault("0")
+    private int superficie;
     @ManyToOne
     private NatureDomaine natureDomaine;
-    @ManyToOne
-    private TypeDomaine typeDomaine;
     @JsonIgnore
     @ManyToOne
     private Quartier quartier;
     private String i;
     private String p;
     private String observation;
-    private String numeroTitreFoncier;
-    private LocalDate dateTitreFoncier ;
+    private String numTitreFoncier;
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;
     private String autreNumeroTitreFoncier;
+
+    private Long typeDomaineId;
     private Long numeroProvisoire;
     private Long blocId;
     @ColumnDefault("false")
     private boolean synchronise;
     private Long idDerniereEnquete;
     private Long mobileDataId;
-    private String numEntreeParcelle;
-    private String codeQuartier;
-    @ManyToOne
-    private Rue rue ;
-    private String numeroRue ;
-    private Boolean batie;
-    private Integer nombrePiscine;
-    @ManyToOne
-    private Usage usage;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
-  //  private String ncProprietaire ;
 //    @JsonIgnore
 //    @OneToMany(mappedBy = "parcelle")
 //    private List<Batiment> batiments;

src/main/java/io/gmss/fiscad/entities/infocad/metier/ParcelleGeom.java

@@ -1,7 +1,6 @@
 package io.gmss.fiscad.entities.infocad.metier;
 
 
-import com.fasterxml.jackson.annotation.JsonBackReference;
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
@@ -10,7 +9,6 @@ import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.decoupage.Commune;
 import io.gmss.fiscad.entities.decoupage.Departement;
 import io.gmss.fiscad.entities.decoupage.Quartier;
-import io.gmss.fiscad.enums.SourceDonnee;
 import io.gmss.fiscad.enums.StatutParcelle;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -25,7 +23,6 @@ import org.n52.jackson.datatype.jts.GeometryDeserializer;
 import org.n52.jackson.datatype.jts.GeometrySerializer;
 
 import java.io.Serializable;
-import java.time.LocalDate;
 
 @EqualsAndHashCode(callSuper = true)
 @Entity
@@ -41,96 +38,64 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
+    private String NomDepartement;
+    private String NomCommune;
+    private String NomArrondissement;
+    private String NomVillageQuartier;
+    private String codeBloc;
+    private String q;
+    private String ilot;
+    private String zone;
+    private String p;
     @Column(unique = true,nullable = true)
     private String nup;
     @Column(unique = true,nullable = true)
     private String nupProvisoire;
     private String longitude;
     private String latitude;
-    private String codeDepartement;
-    private String nomDepartement;
-    private String codeCommune;
-    private String nomCommune;
-    private String codeArrondissement;
-    private String nomArrondissement;
-    private String codeQuartierVillage;
-    private String nomVillageQuartier;
-    private String codeBloc;
-    private String numeroRue;
-    private String numeroEntreePorte;
-
-    private String codeInstad;
-    private String numeroEtatLieux;
-    private String numeroTitreFoncier;
-    private LocalDate dateTitreFoncier;
-    private Boolean batie ;
-
-    private String npi;
-    private String ifu;
-    private String nom;
-    private String prenom;
-    private String raisonSociale;
-    private String nomEtPrenoms;
-    private String telephone;
-    private String adresse;
-
-    private String nomRepresentant;
-    private String prenomRepresentant;
-    private String raisonSocialeRepresentant;
-    private String nomEtPrenomsRepresentant;
-    private String telephoneRepresentant;
-    private String adresseRepresentant;
-
-    private String q;
-    private String zone;
-    private String ilot;
-    private String p;
-
-    private String qLotissement;
-    private String ilotLotissement;
-    private String pLotissement;
-
     private String pointsPolygone;
     private Integer superficie;
-
+    private String nomEtPrenoms;
     private String dateCollecte;
-    @Enumerated(EnumType.STRING)
-    private SourceDonnee sourceDonnees;
+    private String sourceDonnees;
     private String observations;
-
     @Enumerated(EnumType.STRING)
     private StatutParcelle statutParcelle;
     private Long uploadId;
-
-    @ManyToOne //(fetch = FetchType.LAZY)
-   // @JsonBackReference
+    @ManyToOne
     private Departement departement;
-
-    @ManyToOne //(fetch = FetchType.LAZY)
-    //@JsonBackReference
+    @ManyToOne
     private Commune commune;
-
-    @ManyToOne //(fetch = FetchType.LAZY)
-   // @JsonBackReference
+    @ManyToOne
     private Arrondissement arrondissement;
-
-    @ManyToOne //(fetch = FetchType.LAZY)
-    @JsonBackReference
+    @ManyToOne
     private Quartier quartier ;
-
     @ColumnDefault("0")
-    private Integer  geomSrid;
+    private int  geomSrid;
     @JsonSerialize(using = GeometrySerializer.class)
     @JsonDeserialize(contentUsing = GeometryDeserializer.class)
     @Column(name = "geometry",columnDefinition = "geometry(Polygon,32631)")
     private Polygon geometry;
     @Column(columnDefinition = "TEXT")
     private String geometryString;
+    private String codeInsae;
+    private String numeroEtatLieux;
+    private String numeroTitreFoncier;
+    private String telephone;
+    //private String codeParcelle;
+    //private String codeEquipe;
 
-    @JsonIgnore
-    @ManyToOne
-    @JsonBackReference
-    private Parcelle parcelle;
+    //private String elLot;
+    //private String elLettreParcelle;
+    //private String rfuQuartierOuZone;
+    //private String rfuIlot;
+    //private String rfuLettreParcelle;
+
+    //private String nomLotissement;
+    ////////////
+//    @JsonIgnore
+//    @OneToOne
+//    private Parcelle parcelle;
 //    @JsonSerialize(using = GeometrySerializer.class)
 //    @JsonDeserialize(contentUsing = GeometryDeserializer.class)
 //    @Column(name = "geom",columnDefinition = "geometry(Polygon,4326)")

src/main/java/io/gmss/fiscad/entities/infocad/metier/Piece.java

@@ -11,8 +11,6 @@ import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.infocad.parametre.SourceDroit;
 import io.gmss.fiscad.entities.infocad.parametre.TypePiece;
 import io.gmss.fiscad.entities.rfu.metier.DeclarationNc;
-import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -46,10 +44,6 @@ public class Piece extends BaseEntity implements Serializable {
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateExpiration;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateEtablissement;
-
     @ManyToOne
     private TypePiece typePiece;
     private Long mobileDataId;
@@ -57,32 +51,15 @@ public class Piece extends BaseEntity implements Serializable {
     @ManyToOne(fetch = FetchType.LAZY)
     private Personne personne;
     private Long personneExternalKey;
-
-//    @JsonIgnore
-//    @JsonBackReference
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    private ActeurConcerne acteurConcerne;
-//    private Long acteurConcerneExternalKey;
-
+    @JsonIgnore
+    @JsonBackReference
+    @ManyToOne(fetch = FetchType.LAZY)
+    private ActeurConcerne acteurConcerne;
+    private Long acteurConcerneExternalKey;
 
     @ManyToOne
     private SourceDroit sourceDroit;
 
-    @JsonIgnore
-    @JsonBackReference
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Enquete enquete ;
-
-    @JsonIgnore
-   @JsonBackReference
-    @ManyToOne(fetch = FetchType.LAZY)
-    private EnqueteBatiment enqueteBatiment ;
-
-    @JsonIgnore
-    @JsonBackReference
-    @ManyToOne(fetch = FetchType.LAZY)
-    private EnqueteUniteLogement enqueteUniteLogement ;
-
     @ManyToOne
     private ModeAcquisition modeAcquisition;
 
@@ -97,7 +74,7 @@ public class Piece extends BaseEntity implements Serializable {
 
     private Long max_numero_piece_id;
     private Long max_numero_acteur_concerne_id;
-    //private Long enqueteId;
+    private Long enqueteId;
     private Long blocId;
     @ColumnDefault("false")
     private boolean synchronise;

src/main/java/io/gmss/fiscad/entities/infocad/metier/Rue.java

@@ -1,30 +0,0 @@
-package io.gmss.fiscad.entities.infocad.metier;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.infocad.parametre.TypeRue;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-import java.util.List;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class Rue extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String numero ;
-    private String nom ;
-    @ManyToOne
-    private TypeRue typeRue ;
-}

src/main/java/io/gmss/fiscad/entities/infocad/metier/Upload.java

@@ -97,17 +97,17 @@ public class Upload extends BaseEntity implements Serializable {
         System.out.println("url = " + url);
        // return url != null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null;
         return url != null ? url.toLowerCase().startsWith("https") ? url : url.toLowerCase().replaceFirst("http", "https") : null;
+
     }
 
     private String serverContext() {
         String url= ServletUriComponentsBuilder.fromCurrentContextPath()
                 .path("/api/upload/downloadFile/")
                 .toUriString();
-        //System.out.println(url);
-//        if(!url.contains("8282/api")){
-//            url.replace("/api",":8282/api");
-//        }
-        //System.out.println(url);
+        if(!url.contains("8282/api")){
+            url.replace("/api",":8282/api");
+        }
+
             return url;
     }
 

src/main/java/io/gmss/fiscad/entities/infocad/parametre/Bloc.java

@@ -34,6 +34,7 @@ import java.util.Set;
                 "WHERE id = ?")
 @Where(clause = " deleted = false")
 public class Bloc extends BaseEntity implements Serializable {
+
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;

src/main/java/io/gmss/fiscad/entities/infocad/parametre/Personne.java

@@ -10,7 +10,6 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.entities.metadata.MobileDataPersonne;
 import io.gmss.fiscad.enums.Categorie;
-import io.gmss.fiscad.enums.EtatIdentificationPersonne;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -21,8 +20,6 @@ import org.hibernate.annotations.SQLDelete;
 import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -41,12 +38,11 @@ public class Personne extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private String ifu;
-    private String nom;
-    private String prenom;
-    private String raisonSociale;
+    private String nomOuSigle;
+    private String prenomOuRaisonSociale;
     private String numRavip;
     private String npi;
-    private LocalDate dateNaissanceOuConsti;
+    private String dateNaissanceOuConsti;
     private String lieuNaissance;
     private String tel1;
     private String tel2;
@@ -79,17 +75,10 @@ public class Personne extends BaseEntity implements Serializable {
     @ColumnDefault("0")
     private int mustHaveRepresentant;
     private String filePath;
-
-    @Enumerated(EnumType.STRING)
-    private EtatIdentificationPersonne etatIdentificationPersonne;
     private String observation;
-    private String numeroRccm ;
-    private LocalDate dateRccm ;
-    private String email ;
     @ColumnDefault("false")
     private boolean synchronise;
 
-
     @OneToMany(mappedBy = "personne")
     private List<Upload> uploads;
 
@@ -98,11 +87,10 @@ public class Personne extends BaseEntity implements Serializable {
 
     private Long mobileDataId;
     public List<Upload> getUploads() {
-
-        return uploads==null ? new ArrayList<>():uploads.stream().filter(upload -> upload.getPiece() == null && upload.getMembreGroupe() == null).toList();
+        return uploads.stream().filter(upload -> upload.getPiece() == null && upload.getMembreGroupe() == null).toList();
     }
 
     public List<Piece> getPieces() {
-        return pieces==null ? new ArrayList<>():pieces.stream().filter(piece -> piece.getPersonne() != null).toList();
+        return pieces.stream().filter(piece -> piece.getActeurConcerne() == null).toList();
     }
 }

src/main/java/io/gmss/fiscad/entities/infocad/parametre/Structure.java

@@ -2,11 +2,9 @@ package io.gmss.fiscad.entities.infocad.parametre;
 
 import com.fasterxml.jackson.annotation.JsonIgnore;
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
-import com.fasterxml.jackson.annotation.JsonManagedReference;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.user.Fonction;
 import io.gmss.fiscad.entities.user.User;
 import jakarta.persistence.*;
 import jakarta.validation.constraints.NotNull;
@@ -30,12 +28,12 @@ import java.util.Set;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-//@SQLDelete(sql =
-//        "UPDATE structure " +
-//                "SET deleted = true " +
-//                "WHERE id = ?")
-//@Where(clause = " deleted = false")
-//@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
+@SQLDelete(sql =
+        "UPDATE structure " +
+                "SET deleted = true " +
+                "WHERE id = ?")
+@Where(clause = " deleted = false")
+@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class Structure extends BaseEntity implements Serializable {
 
     @Id
@@ -49,29 +47,21 @@ public class Structure extends BaseEntity implements Serializable {
     private String tel;
     private String email;
     private String adresse;
-    //@NotNull(message = "Veuillez préciser la commune du centre d'impôts")
+    @NotNull
     @ManyToOne
     private Commune commune;
-
-    @JsonIgnore
+    //@JsonIgnore
     @ManyToMany
     @JoinTable(name = "arrondissements_structures",
             joinColumns = @JoinColumn(name = "structure_id"),
             inverseJoinColumns = @JoinColumn(name = "arrondissement_id")
     )
     private Set<Arrondissement> arrondissements;
+//    @JsonIgnore
+//    @OneToMany(mappedBy = "structure")
+//    private List<User> agents;
+//    @JsonIgnore
+//    @OneToMany(mappedBy = "structure")
+//    private List<Bloc> blocs;
 
-    @Override
-    public String toString() {
-        return "Structure{" +
-                "id=" + id +
-                ", code='" + code + '\'' +
-                ", nom='" + nom + '\'' +
-                ", ifu='" + ifu + '\'' +
-                ", rccm='" + rccm + '\'' +
-                ", tel='" + tel + '\'' +
-                ", email='" + email + '\'' +
-                ", adresse='" + adresse + '\'' +
-                '}';
-    }
 }

src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRue.java

@@ -1,37 +0,0 @@
-package io.gmss.fiscad.entities.infocad.parametre;
-
-import com.fasterxml.jackson.annotation.JsonIgnore;
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.entities.decoupage.Arrondissement;
-import io.gmss.fiscad.entities.decoupage.Quartier;
-import io.gmss.fiscad.entities.decoupage.Secteur;
-import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
-import io.gmss.fiscad.entities.infocad.metier.Enquete;
-import jakarta.persistence.*;
-import jakarta.validation.constraints.NotNull;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.SQLDelete;
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-import java.util.List;
-import java.util.Set;
-
-/**
- * Un bloc représente un secteur de découpage admin dans le cadre d'une enquete fiscale
- */
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-public class TypeRue extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String code;
-    private String nom;
-}

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataActeurConcerne.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.ActeurConcernePayLoad;
+import io.gmss.fiscad.paylaods.request.ActeurConcernePayLoad;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataBatiment.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.BatimentPaylaod;
+import io.gmss.fiscad.paylaods.request.BatimentPaylaod;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueBatiment.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueBatimentPayload;
+import io.gmss.fiscad.paylaods.request.CaracteristiqueBatimentPaylod;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,7 +26,7 @@ public class MobileDataCaracteristiqueBatiment extends BaseEntity implements Ser
     private Long externalKey;
     @Type(JsonBinaryType.class)
     @Column(columnDefinition = "jsonb")
-    private CaracteristiqueBatimentPayload CaracteristiqueBatimentPayload ;
+    private CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod ;
     @Column(columnDefinition = "boolean default false")
     private boolean traiter;
 }

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueParcelle.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueParcellePayload;
+import io.gmss.fiscad.paylaods.request.CaracteristiqueParcellePaylod;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,7 +26,7 @@ public class MobileDataCaracteristiqueParcelle extends BaseEntity implements Ser
     private Long externalKey;
     @Type(JsonBinaryType.class)
     @Column(columnDefinition = "jsonb")
-    private CaracteristiqueParcellePayload CaracteristiqueParcellePayload ;
+    private CaracteristiqueParcellePaylod caracteristiqueParcellePaylod ;
     @Column(columnDefinition = "boolean default false")
     private boolean traiter;
 }

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueUniteLogement.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.CaracteristiqueUniteLogementPayload;
+import io.gmss.fiscad.paylaods.request.CaracteristiqueUniteLogementPaylod;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;
@@ -26,7 +26,7 @@ public class MobileDataCaracteristiqueUniteLogement extends BaseEntity implement
     private Long externalKey;
     @Type(JsonBinaryType.class)
     @Column(columnDefinition = "jsonb")
-    private CaracteristiqueUniteLogementPayload CaracteristiqueUniteLogementPayload ;
+    private CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod ;
     @Column(columnDefinition = "boolean default false")
     private boolean traiter;
 }

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.DeclarationNcPayload;
+import io.gmss.fiscad.paylaods.request.DeclarationNcPayload;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnquete.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad;
+import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteActivite.java

@@ -2,8 +2,8 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.BatimentPaylaod;
-import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteActivitePayload;
+import io.gmss.fiscad.paylaods.request.BatimentPaylaod;
+import io.gmss.fiscad.paylaods.request.EnqueteActivitePayload;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteBatiment.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteBatimentPayload;
+import io.gmss.fiscad.paylaods.request.EnqueteBatimentPayload;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;

src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteUniteLogement.java

@@ -2,7 +2,7 @@ package io.gmss.fiscad.entities.metadata;
 
 import com.vladmihalcea.hibernate.type.json.JsonBinaryType;
 import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.paylaods.request.synchronisation.EnqueteUniteLogementPayload;
+import io.gmss.fiscad.paylaods.request.EnqueteUniteLogementPayload;
 import jakarta.persistence.*;
 import lombok.Getter;
 import lombok.Setter;