Merge pull request 'gestion revu de code en utilisant uniquement les DTO' (#81) from features/crud_entites into develop

Reviewed-on: #81

.gitea/workflows/cd-main.yml

@@ -52,10 +52,8 @@ 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

.gitea/workflows/ci-develop.yml

@@ -52,10 +52,8 @@ 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) Création des secrets runtime (CI uniquement)
       - name: Create runtime secrets

.gitignore

@@ -5,4 +5,3 @@ target/*
 ansible
 secrets/
 .env
-/uploads/

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>

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/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",
+            "/swagger-ui.html"
-            "/error"
 
     };
 
@@ -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/SecteurController.java

@@ -7,7 +7,6 @@ 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.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 import org.slf4j.Logger;
@@ -25,7 +24,7 @@ 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')")
 public class SecteurController {
@@ -315,31 +314,5 @@ public class SecteurController {
     }
 
 
-    @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

@@ -1,7 +1,6 @@
 package io.gmss.fiscad.controllers.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
@@ -249,221 +248,4 @@ public class SecteurDecoupageController {
     }
 
 
-    @GetMapping("/arbre/enquete-en-cours/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteEncoursByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-valide/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteValideByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-cloture/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteClotureByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-batiment-en-cours/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteBatimentEncoursByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-batiment-valide/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteBatimentValideByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-batiment-cloture/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteBatimentClotureByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteBatimentDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-unitlog-en-cours/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteUniteLogEncoursByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.EN_COURS.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-unitlog-valide/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteUniteLogValideByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.VALIDE.toString()), "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) {
-            e.printStackTrace();
-            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/enquete-unitlog-cloture/user-id/{userId}")
-    public ResponseEntity<?> getArborescenceEnqueteUniteLigClotureByUserId(@PathVariable Long userId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, secteurDecoupageService.getStatEnqueteUniteLogementDecoupageByUserId(userId, StatutEnquete.CLOTURE.toString()), "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) {
-            e.printStackTrace();
-            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/SectionController.java

@@ -5,7 +5,6 @@ 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;
@@ -22,7 +21,7 @@ import org.springframework.web.client.HttpClientErrorException;
 
 @RestController
 @RequestMapping(value = "api/section", produces = MediaType.APPLICATION_JSON_VALUE)
-@SecurityRequirement(name = "bearer")
+//@SecurityRequirement(name = "bearer")
 @Tag(name = "Section")
 //@PreAuthorize("hasRole('ROLE_ADMIN') or hasRole('ROLE_SUPERVISEUR')")
 public class SectionController {

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

@@ -2,8 +2,6 @@ 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.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
 import io.gmss.fiscad.paylaods.ApiResponse;
@@ -12,8 +10,6 @@ import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
 import io.gmss.fiscad.paylaods.request.synchronisation.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;
@@ -52,9 +48,9 @@ public class EnqueteController {
     @PostMapping("/create")
     public ResponseEntity<?> createEnquete(@RequestBody @Valid @Validated EnquetePayLoadWeb enquetePayLoadWeb) {
         try {
-             enquetePayLoadWeb = enqueteService.createEnquete(enquetePayLoadWeb);
+            Enquete enquete = enqueteService.createEnquete(enquetePayLoadWeb);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, enquetePayLoadWeb, "Enquete batiment créé avec succès."),
+                    new ApiResponse<>(true, enquete, "Enquete batiment créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -68,8 +64,7 @@ public class EnqueteController {
             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());
-           // logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
 
@@ -124,7 +119,6 @@ public class EnqueteController {
     @PutMapping("/rejet")
     public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         try {
-
             return new ResponseEntity<>(
                     new ApiResponse<>(true, enqueteService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectuée avec succès."),
                     HttpStatus.OK
@@ -218,8 +212,8 @@ public class EnqueteController {
             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}")
+    @GetMapping("/all/by-parcelle-id/{parcelleId}")
-    public ResponseEntity<?> getAllByParcelle(@PathVariable Long parcelleId) {
+    public ResponseEntity<?> getAllByEnqueteDecoupageAdmin(@PathVariable Long parcelleId) {
         try {
             return new ResponseEntity<>(
                     new ApiResponse<>(true, enqueteService.getEnqueteListByParcelle(parcelleId), "Liste des enquetes chargée avec succès."),
@@ -242,36 +236,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("/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")
@@ -486,65 +450,5 @@ public class EnqueteController {
 
 
 
-    @GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllEnqueteEncoursByQuartierPaged(@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, enqueteService.getEnqueteListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours 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/cloture/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllEnqueteClotureByQuartierPaged(@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, enqueteService.getEnqueteListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours 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/ParcelleController.java

@@ -6,13 +6,10 @@ 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;
@@ -31,7 +28,7 @@ import java.util.List;
 
 @RestController
 @RequestMapping(value = "api/parcelle", produces = MediaType.APPLICATION_JSON_VALUE)
-//@SecurityRequirement(name = "bearer")
+@SecurityRequirement(name = "bearer")
 @Tag(name = "Parcelle")
 @CrossOrigin(origins = "*")
 //@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
@@ -51,9 +48,9 @@ public class ParcelleController {
     @PostMapping("/create")
     public ResponseEntity<?> createParcelle(@RequestBody @Valid @Validated ParcellePayLoadWeb parcellePayLoadWeb) {
         try {
-             parcellePayLoadWeb = parcelleService.createParcelle(parcellePayLoadWeb);
+            Parcelle parcelle = parcelleService.createParcelle(parcellePayLoadWeb);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, parcellePayLoadWeb, "parcelle créée avec succès."),
+                    new ApiResponse<>(true, parcelle, "parcelle créée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -91,7 +88,6 @@ public class ParcelleController {
             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);
         }
@@ -122,67 +118,12 @@ public class ParcelleController {
             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), "parcelle 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("/all")
-    public ResponseEntity<?> getAllParcelle(@CurrentUser UserPrincipal currentUser) {
+    public ResponseEntity<?> getAllParcelle() {
         try {
-            if(currentUser==null)
             return new ResponseEntity<>(
-                        new ApiResponse<>(true,null, "Vous ne pouvez pas accéder à cette ressource"),
+                    new ApiResponse<>(true, parcelleService.getParcelleList(), "Liste des enquetes chargée avec succès."),
-                        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) {
@@ -201,19 +142,37 @@ public class ParcelleController {
         }
     }
 
+
+    @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("/all-paged")
-    public ResponseEntity<?> getAllParcellePaged(@CurrentUser UserPrincipal currentUser,@RequestParam int pageNo, @RequestParam int pageSize) {
+    public ResponseEntity<?> getAllEnquetePaged(@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"),
+                    new ApiResponse<>(true, parcelleService.getParcelleList(pageable), "Liste des enquetes chargée avec succès."),
-                        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) {
@@ -233,141 +192,38 @@ public class ParcelleController {
     }
 
 
-    @PostMapping("/all-paged/multi-criteres")
+
-    public ResponseEntity<?> getAllParcelleFiltrePaged(@CurrentUser UserPrincipal currentUser, @RequestParam int pageNo, @RequestParam int pageSize, @RequestBody FiltreParcelle filtreParcelle) {
+    @GetMapping("/id/{id}")
+    public ResponseEntity<?> getStructureById(@PathVariable Long id) {
+        try {
+            return new ResponseEntity<>(
+                    new ApiResponse<>(true, parcelleService.getParcelleById(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("/user-id/{userId}")
+    public ResponseEntity<?> getParcellesByUserId(@PathVariable Long userId,@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"),
+                    new ApiResponse<>(true, parcelleService.getParcelleDataTableListByUserId(userId,pageable), "enquete trouvé avec succès."),
-                        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) {
@@ -388,61 +244,5 @@ public class ParcelleController {
 
 
 
-    @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

@@ -7,17 +7,12 @@ 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;
@@ -41,9 +36,9 @@ public class PersonneController {
     @PostMapping("/create")
     public ResponseEntity<?> createPersonne(@RequestBody @Valid @Validated PersonnePayLoadWeb personnePayLoadWeb) {
         try {
-             personnePayLoadWeb = personneService.createPersonne(personnePayLoadWeb);
+            Personne personne = personneService.createPersonne(personnePayLoadWeb);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, personnePayLoadWeb, "Contribuable créé avec succès."),
+                    new ApiResponse<>(true, personne, "Contribuable créé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -104,7 +99,7 @@ public class PersonneController {
     @GetMapping("/id/{id}")
     public ResponseEntity<?> getPersonneById(@PathVariable Long id)   {
         try{
-            Optional<PersonnePayLoadWeb> optionalPersonne= personneService.getPersonneById(id);
+            Optional<Personne> optionalPersonne= personneService.getPersonneById(id);
             return new ResponseEntity<>(
                     new ApiResponse<>(true, optionalPersonne.orElse(null), "Personne retrouvée avec  succès."),
                     HttpStatus.OK
@@ -116,70 +111,4 @@ public class PersonneController {
             );
         }
     }
-
-    @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,7 +1,6 @@
 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;
@@ -9,9 +8,6 @@ import io.gmss.fiscad.persistence.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(
+    @PostMapping("/save")
-            value = "/save",
+    public ResponseEntity<?> save(@RequestPart(required = true) MultipartFile file, @RequestParam String reference, @RequestParam String description /*, @RequestParam Long idTypeUpload*/) {
-            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,
 
-            @Parameter(description = "ID de la pièce", required = true)
-            @RequestParam("pieceId") Long pieceId
-    ) {
         try {
-            return ResponseEntity.ok(
+            Upload upload = new Upload();
-                    new ApiResponse(true,
+            String fileName = fileStorageService.storeFile(file);
-                            uploadService.createUpload(file, pieceId),
+            upload.setFileName(fileName);
-                            "File has been created successfully.")
+            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);
+            logger.error(e.getLocalizedMessage());
-            return ResponseEntity.status(HttpStatus.INTERNAL_SERVER_ERROR)
+            return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
-                    .body(new ApiResponse(false, null, e.getMessage()));
         }
     }
 
 
-
     @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

@@ -41,7 +41,7 @@ public class StructureController {
     }
 
     @PostMapping("/create")
-    public ResponseEntity<?> createStructure(@RequestBody StructurePaylaodWeb structurePaylaodWeb) {
+    public ResponseEntity<?> createStructure(@RequestBody @Valid @Validated StructurePaylaodWeb structurePaylaodWeb) {
         try {
             structurePaylaodWeb = structureService.createStructure(structurePaylaodWeb);
             return new ResponseEntity<>(
@@ -211,7 +211,7 @@ public class StructureController {
     public ResponseEntity<?> getStructureById(@PathVariable Long id) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, structureService.getStructureById(id), "Structure trouvé avec succès."),
+                    new ApiResponse<>(true, structureService.getStructureByIdToDto(id), "Structure trouvé avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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/rfu/metier/BatimentController.java

@@ -39,9 +39,9 @@ public class BatimentController {
     @PostMapping("/create")
     public ResponseEntity<?> createBatiment(@RequestBody @Valid @Validated BatimentPaylaodWeb batimentPaylaodWeb) {
         try {
-            batimentPaylaodWeb = batimentService.createBatiment(batimentPaylaodWeb);
+           Batiment batiment = batimentService.createBatiment(batimentPaylaodWeb);
             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) {
@@ -154,53 +154,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 {
@@ -223,52 +176,4 @@ public class BatimentController {
             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<?> getAllBatimentByQuartierPaged(@PathVariable Long quartierId,  @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.getBatimentListByquartierPageable(quartierId,pageable), "Liste des 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/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllBatimentByQuartier(@PathVariable Long quartierId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, batimentService.getBatimentListByquartier(quartierId), "Liste des 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);
-        }
-    }
 }

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."),
+                    new ApiResponse<>(true, caracteristiqueBatimentService.getCaracteristiqueBatimentById(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."),
                     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.swagger.v3.oas.annotations.Operation;
 import io.swagger.v3.oas.annotations.security.SecurityRequirement;
 import io.swagger.v3.oas.annotations.tags.Tag;
@@ -120,7 +117,7 @@ public class DonneesImpositionTfuController {
     public ResponseEntity<?> getAllDonneesImpositionTfuList() {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(), "Liste des impositions chargée avec succès."),
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(), "Liste des caractéristiques chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -144,105 +141,7 @@ public class DonneesImpositionTfuController {
         try {
             Pageable pageable = PageRequest.of(pageNo, pageSize);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(pageable), "Liste des impositions chargée avec succès."),
+                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesImpositionTfuList(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/{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 impositions 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 impositions 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 impositions 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 impositions chargée avec succès."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -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")
+    @Operation(summary = "Générer les données fiscales TFU")
-    @PostMapping("/generer-batie")
+    @PostMapping("/generer")
-    public ResponseEntity<?> genererDonneesFiscaleBatie(@CurrentUser UserPrincipal userPrincipal, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    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);
@@ -434,79 +273,4 @@ public class DonneesImpositionTfuController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-    @GetMapping("/all-page/by-exercice-id/by-structure-id/{exerciceId}/{structureId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByExerciceIdAndStructureIdPaged(@PathVariable Long exerciceId, @PathVariable Long structureId,@RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-            System.out.println("NOUS SOMMES ICI");
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByExerciceAndStructureIdPageable(exerciceId,structureId, pageable), "Liste des impositions 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-exercice-id/by-structure-id/by-quartier-id/{exerciceId}/{structureId}/{quartierId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByExerciceIdAndStructureId(@PathVariable Long exerciceId, @PathVariable Long structureId, @PathVariable Long quartierId) {
-        try {
-            System.out.println("NOUS SOMMES ICI");
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByExerciceAndStructureId(exerciceId,structureId,quartierId), "Liste des imposition 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-personne-id/{personneId}")
-    public ResponseEntity<?> getAllDonneesImpositionTfuByPersonneId(@PathVariable Long personneId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, donneesImpositionTfuService.getDonneesFiscalesByPersonneId(personneId), "Liste des impositions 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/EnqueteBatimentController.java

@@ -2,14 +2,10 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
-import io.gmss.fiscad.enums.StatutEnquete;
 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.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
-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;
@@ -24,8 +20,6 @@ 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/enquete-batiment", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -44,9 +38,9 @@ public class EnqueteBatimentController {
     @PostMapping("/create")
     public ResponseEntity<?> createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
         try {
-             enqueteBatimentPayloadWeb = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb);
+            EnqueteBatiment enqueteBatiment = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb);
             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) {
@@ -57,7 +51,6 @@ public class EnqueteBatimentController {
             logger.error(e.getLocalizedMessage());
             return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), 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) {
@@ -183,206 +176,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);
-        }
-    }
-
-
-    @GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllEnqueteBatimentEnCoursByQuartierPaged(@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, enqueteBatimentService.getEnqueteBatimentListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours 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/cloture/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllEnqueteBatimentClotureByQuartierPaged(@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, enqueteBatimentService.getEnqueteBatimentListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours 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("/validation")
-    public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.validerEnquete(enqueteTraitementPayLoad), "Validation effectué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("/rejet")
-    public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectué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("/validation-lot")
-    public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.validerEnquete(enqueteTraitementPayLoads), "Validation effectué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("/rejet-lot")
-    public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteBatimentService.rejeterEnquete(enqueteTraitementPayLoads), "Rejet effectué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

@@ -2,14 +2,10 @@ package io.gmss.fiscad.controllers.rfu.metier;
 
 
 import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
-import io.gmss.fiscad.enums.StatutEnquete;
 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.EnqueteTraitementPayLoad;
 import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
-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;
@@ -24,8 +20,6 @@ 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/enquete-unite-logement", produces = MediaType.APPLICATION_JSON_VALUE)
@@ -44,9 +38,9 @@ public class EnqueteUniteLogementController {
     @PostMapping("/create")
     public ResponseEntity<?> createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
         try {
-             enqueteUniteLogementPayloadWeb = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb);
+            EnqueteUniteLogement enqueteUniteLogement = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb);
             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) {
@@ -182,207 +176,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);
-        }
-    }
-
-
-    @GetMapping("/all-paged/en-cours/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllEnqueteUniteLogementEncoursByQuartierPaged(@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, enqueteUniteLogementService.getEnqueteUniteLogementListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.EN_COURS, pageable), "Liste des enquetes en cours 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/cloture/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllEnqueteUniteLogementClotureByQuartierPaged(@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, enqueteUniteLogementService.getEnqueteUniteLogementListByQuartierByStatutPageableToDto(userId,quartierId, StatutEnquete.CLOTURE, pageable), "Liste des enquetes en cours 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("/validation")
-    public ResponseEntity<?> validerEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.validerEnquete(enqueteTraitementPayLoad), "Validation effectué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("/rejet")
-    public ResponseEntity<?> rejeterEnquete(@RequestBody EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
-        try {
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.rejeterEnquete(enqueteTraitementPayLoad), "Rejet effectué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("/validation-lot")
-    public ResponseEntity<?> validerEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.validerEnquete(enqueteTraitementPayLoads), "Validation effectué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("/rejet-lot")
-    public ResponseEntity<?> rejeterEnqueteParLot(@RequestBody List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.rejeterEnquete(enqueteTraitementPayLoads), "Rejet effectué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")
+    @PutMapping("/valider/{id}")
-    public ResponseEntity<?> cloturer(@CurrentUser UserPrincipal userPrincipal, @RequestBody  ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb ) {
+    public ResponseEntity<?> validerImpositionsTfu(@RequestBody ImpositionsTfu impositionsTfu) {
         try {
-
-            if(userPrincipal==null){
             return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Accès non autorisé"),
+                    new ApiResponse<>(true, impositionsTfuService.validerImpositionsTfu(impositionsTfu), "Unite de logement mise à jour avec succès."),
-                        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."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -122,62 +105,11 @@ public class ImpositionsTfuController {
         }
     }
 
-//    @PutMapping("/update/{id}")
+    @PutMapping("/annuler/{id}")
-//    public ResponseEntity<?> updateImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb) {
+    public ResponseEntity<?> annulerImpositionsTfu(@PathVariable Long id, @RequestBody ImpositionsTfu impositionsTfu) {
-//        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) {
         try {
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, impositionsTfuService.autoriserGenerationImpositionsTfu(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) {
-            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."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -220,19 +152,11 @@ public class ImpositionsTfuController {
         }
     }
 
-    @GetMapping("/all/by-user")
+    @GetMapping("/all")
-    public ResponseEntity<?> getAllImpositionsTfuList(@CurrentUser UserPrincipal userPrincipal) {
+    public ResponseEntity<?> getAllImpositionsTfuList() {
         try {
-
-            if(userPrincipal==null){
             return new ResponseEntity<>(
-                        new ApiResponse<>(true, null, "Vous n'êtes pas autorisé à acceder à cette ressource"),
+                    new ApiResponse<>(true, impositionsTfuService.getImpositionsTfuList(), "Liste des Enquetes des unites Logements chargée avec succès."),
-                        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."),
                     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,77 +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);
-        }
-    }
-
-
-    @GetMapping("/all-paged/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllUniteLogementByQuartierPaged(@PathVariable Long quartierId, @RequestParam int pageNo, @RequestParam int pageSize) {
-        try {
-            Pageable pageable = PageRequest.of(pageNo, pageSize);
-
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByQuartierPageable(quartierId,pageable), "Liste 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("/all/by-quartier-id/{quartierId}")
-    public ResponseEntity<?> getAllUniteLogementByQuartier(@PathVariable Long quartierId) {
-        try {
-            return new ResponseEntity<>(
-                    new ApiResponse<>(true, enqueteUniteLogementService.getUniteLogementListByQuartier(quartierId), "Liste 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);
-        }
-    }
 }

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) {
+    public BaremRfuController(BaremRfuService baremRfuService) {
-        this.baremRfuBatiService = baremRfuBatiService;
+        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."),
+                    new ApiResponse<>(true, baremRfuService.getBaremRfuByType(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."),
                     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."),
+                    new ApiResponse<>(true, baremRfuNonBatiService.getBaremRfuNonBatiById(id), "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."),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {

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/statistique/StatistiqueController.java

@@ -1,12 +1,9 @@
 package io.gmss.fiscad.controllers.statistique;
 
 import io.gmss.fiscad.enums.NiveauDecoupage;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.*;
 import io.gmss.fiscad.interfaces.statistique.StatistiquesService;
 import io.gmss.fiscad.paylaods.ApiResponse;
-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;
@@ -177,77 +174,4 @@ public class StatistiqueController {
             return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
         }
     }
-
-
-
-    @Operation(
-            summary = "Statistique des enquetes en cours par object ",
-            description = "Donnes le nombre d'enquetes en coures par objet"
-    )
-    @GetMapping(path = "/nombre-enquete/par-objet/en-cours")
-    public ResponseEntity<?> getStatistiquesEnqueteEnCoursParObjet(@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, statistiquesService.getStatNombreEnqueteParObjetUserConnect(userId,StatutEnquete.EN_COURS.toString()), "Statistique des personne par type."),
-                    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 = "Statistique des enquetes en cours par object ",
-            description = "Donnes le nombre d'enquetes en coures par objet"
-    )
-    @GetMapping(path = "/nombre-enquete/par-objet/cloture")
-    public ResponseEntity<?> getStatistiquesEnqueteClotureParObjet(@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, statistiquesService.getStatNombreEnqueteParObjetUserConnect(userId, StatutEnquete.CLOTURE.toString()), "Statistique des personne par type."),
-                    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/AuthController.java

@@ -116,5 +116,18 @@ 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<>();
+        //user.setAvoirFonctions(roleSet);
+        user.setStructure(structureService.getStructureById(userRequest.getStructureId()).get());
+        return user;
+    }
 }

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

@@ -22,7 +22,7 @@ import org.springframework.web.client.HttpClientErrorException;
 
 
 @RestController
-@RequestMapping(value = "api/profil", produces = MediaType.APPLICATION_JSON_VALUE)
+@RequestMapping(value = "api/profile", produces = MediaType.APPLICATION_JSON_VALUE)
 @SecurityRequirement(name = "bearer")
 @Tag(name = "Profile")
 @CrossOrigin(origins = "*")

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

@@ -94,7 +94,7 @@ public class UserController {
     @PostMapping("/reset-password")
     public ResponseEntity<?> resetUserPassword(@RequestBody @Valid @Validated Login login) {
         try {
-            UserPaylaodWeb userPaylaodWeb= userService.resetPassword(login.getUsername());
+            UserPaylaodWeb userPaylaodWeb= userService.resetPassword(login.getUsername(), login.getPassword());
             return new ResponseEntity<>(
                     new ApiResponse<>(true, userPaylaodWeb, "Votre mot de passe à été réinitialisée avec succès."),
                     HttpStatus.OK
@@ -163,37 +163,31 @@ public class UserController {
         }
     }
 
-    @GetMapping("/activate/{id}")
+    @GetMapping("/activate-or-not/{id}")
-    public ResponseEntity<?> acitvateUser(@PathVariable Long id) {
+    public ResponseEntity<?> acitvateOrNotUser(@PathVariable Long id) {
         try {
-            User user  = userService.activateUser(id);
+
+            User user = userService.getUserById(id);
+//            if(user.getAvoirFonctions().isEmpty()){
+//                return new ResponseEntity<>(
+//                        new ApiResponse<>(false, user , "Ce compte n'est pas encore validé."),
+//                        HttpStatus.OK
+//                );
+//            }
+
+            if(user.isResetPassword()){
                 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);
             }
+            user = userService.activateOrNotUser(id);
+            String message = "Utilisateur activé avec succès";
+            if (!user.isActive()) {
+                message = "Utilisateur désactivé avec succès";
             }
-
-
-    @GetMapping("/desactivate/{id}")
-    public ResponseEntity<?> disacitvateUser(@PathVariable Long id) {
-        try {
-            User user  = userService.disactivateUser(id);
             return new ResponseEntity<>(
-                    new ApiResponse<>(true, user, "Utilisateur désactivé avec succès"),
+                    new ApiResponse<>(true, user, message),
                     HttpStatus.OK
             );
         } catch (HttpClientErrorException.MethodNotAllowed e) {
@@ -336,6 +330,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) {

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

@@ -29,8 +29,6 @@ public class Quartier extends BaseEntity implements Serializable {
     @ManyToOne
     private Arrondissement arrondissement;
 
-    private String longitude;
-    private String latitude;
 //    @JsonIgnore
 //    @OneToOne(mappedBy = "quartier")
 //    private Bloc bloc;

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;
@@ -55,29 +54,15 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
 
-
+    private boolean litige;
-    @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;
-
     @JsonIgnore
     @ManyToOne
-    private ModeAcquisition modeAcquisition;
+    private Exercice exercice;
 
     private Long mobileDataId;
 
@@ -99,9 +84,9 @@ public class Enquete extends BaseEntity implements Serializable {
     @ManyToOne
     private Campagne campagne;
 
-//    @JsonIgnore
+    @JsonIgnore
-//    @ManyToOne
+    @ManyToOne
-//    private Equipe equipe;
+    private Equipe equipe;
 
    // @JsonIgnore
     @ManyToOne
@@ -131,7 +116,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;
@@ -188,8 +173,6 @@ public class Enquete extends BaseEntity implements Serializable {
     private Long montantAnnuelleLocation;
     private Long valeurParcelleEstime;
     private Long valeurParcelleReel;
-    private Long valeurParcelleCalcule;
-    private String ncProprietaire;
 
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
@@ -199,20 +182,15 @@ public class Enquete extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateFinExcemption;
 
-    private String representantNom;
+    @JsonIgnore
-    private String representantPrenom;
+    @OneToMany(mappedBy = "enquete")
-    private String representantTel;
+    @JsonManagedReference
-    private String representantNpi;
+    private List<EnqueteUniteLogement> enqueteUniteLogements;
-//
-//    @JsonIgnore
-//    @OneToMany(mappedBy = "enquete")
-//    @JsonManagedReference
-//    private List<EnqueteUniteLogement> enqueteUniteLogements;
 
-//    @JsonIgnore
+    @JsonIgnore
-//    @JsonManagedReference
+    @JsonManagedReference
-//    @OneToMany(mappedBy = "enquete")
+    @OneToMany(mappedBy = "enquete")
-//    private List<EnqueteBatiment> enqueteBatiments;
+    private List<EnqueteBatiment> enqueteBatiments;
 
     @JsonIgnore
     @OneToMany(mappedBy = "enquete")

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)
@@ -44,24 +38,22 @@ public class Parcelle extends BaseEntity implements Serializable {
     private String altitude;
     private String situationGeographique;
     @ColumnDefault("0.0")
-    private Float superficie;
+    private float 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 String numTitreFoncier;
-    private LocalDate dateTitreFoncier ;
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;
     private String autreNumeroTitreFoncier;
-    private String numeroProvisoire;
+    private Long typeDomaineId;
+    private Long numeroProvisoire;
     private Long blocId;
     @ColumnDefault("false")
     private boolean synchronise;
@@ -72,18 +64,6 @@ public class Parcelle extends BaseEntity implements Serializable {
     @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

@@ -10,7 +10,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 +24,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,63 +39,27 @@ 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 String sourceDonnees;
-    private SourceDonnee sourceDonnees;
     private String observations;
-
     @Enumerated(EnumType.STRING)
     private StatutParcelle statutParcelle;
     private Long uploadId;
@@ -115,22 +77,35 @@ public class ParcelleGeom extends BaseEntity implements Serializable {
     private Arrondissement arrondissement;
 
     @ManyToOne //(fetch = FetchType.LAZY)
-    @JsonBackReference
+    //@JsonBackReference
     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
+    //private String elLot;
-    @ManyToOne
+    //private String elLettreParcelle;
-    @JsonBackReference
+    //private String rfuQuartierOuZone;
-    private Parcelle parcelle;
+    //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;
@@ -24,7 +22,6 @@ import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
 import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 
 @EqualsAndHashCode(callSuper = true)
@@ -74,22 +71,12 @@ public class Piece extends BaseEntity implements Serializable {
     @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;
 
 
     @OneToMany(mappedBy = "piece")
-    private List<Upload> uploads=new ArrayList<>();
+    private List<Upload> uploads;
 
     @JsonIgnore
     @ManyToOne
@@ -104,9 +91,4 @@ public class Piece extends BaseEntity implements Serializable {
     private boolean synchronise;
     private String observation;
 
-    private Long nombreFichier;
-
-    public Long getNombreFichier() {
-        return uploads==null? 0l:uploads.size() ;
-    }
 }

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")){
-//        if(!url.contains("8282/api")){
+            url.replace("/api",":8282/api");
-//            url.replace("/api",":8282/api");
+        }
-//        }
+
-        //System.out.println(url);
             return url;
     }
 

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;
@@ -80,12 +79,7 @@ public class Personne extends BaseEntity implements Serializable {
     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;
 

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

@@ -30,11 +30,11 @@ import java.util.Set;
 @Data
 @NoArgsConstructor
 @AllArgsConstructor
-//@SQLDelete(sql =
+@SQLDelete(sql =
-//        "UPDATE structure " +
+        "UPDATE structure " +
-//                "SET deleted = true " +
+                "SET deleted = true " +
-//                "WHERE id = ?")
+                "WHERE id = ?")
-//@Where(clause = " deleted = false")
+@Where(clause = " deleted = false")
 //@JsonIgnoreProperties({"hibernateLazyInitializer", "handler"})
 public class Structure extends BaseEntity implements Serializable {
 
@@ -49,7 +49,7 @@ 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(message = "Veuillez préciser la commune du centre d'impôts")
     @ManyToOne
     private Commune commune;
 
@@ -61,17 +61,4 @@ public class Structure extends BaseEntity implements Serializable {
     )
     private Set<Arrondissement> arrondissements;
 
-    @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/rfu/metier/Batiment.java

@@ -7,14 +7,11 @@ import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 import lombok.NoArgsConstructor;
-import org.hibernate.Internal;
 import org.hibernate.annotations.Where;
 
 import java.io.Serializable;
@@ -37,42 +34,16 @@ public class Batiment extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateConstruction;
     private Long idDerniereEnquete;
-    private Float superficieLouee;
-    private Float superficieAuSol;
-    private Integer nombreEtage;
-    private Integer nombrePiscine;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long montantLocatifAnnuelEstime;
-    private Long valeurBatimentEstime;
-    private Long valeurBatimentReel;
-    private Long valeurBatimentCalcule;
-    private Long montantMensuelLocation;
-    private Integer nbreUniteLogement;
-    private Integer idToitRfu;
 
     @JsonIgnore
     @ManyToOne
     private Parcelle parcelle;
 
-    @ManyToOne
+    private Long parcelleExternalKey;
-    private Usage usage;
-
-
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
 
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;
-  //  private Long enqueteId;
+    private Long enqueteId;
     private Long mobileDataId;
-    private Long parcelleExternalKey;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueParcelle.java

@@ -37,7 +37,6 @@ public class CaracteristiqueParcelle extends BaseEntity implements Serializable
     @ManyToOne
     private Caracteristique caracteristique;
     private String valeur;
-    private String observation;
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;

src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueUniteLogement.java

@@ -47,5 +47,3 @@ public class CaracteristiqueUniteLogement extends BaseEntity implements Serializ
     private Long enqueteId;
     private Long mobileDataId;
 }
-
-

src/main/java/io/gmss/fiscad/entities/rfu/metier/DeclarationNc.java

@@ -32,23 +32,18 @@ public class DeclarationNc extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    @JsonFormat(pattern = "yyyy-MM-dd")
+    @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateDerniereDeclaration;
 
-
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDeclarationNc;
-
     private String nc;
-    private String observation;
+
+    @OneToOne
+    private Structure structure;
 
     @JsonIgnore
     @ManyToOne
-    private Structure structure;
+    private Enquete enquete;
-
-
     private Long  enqueteExternalKey;
 
     @JsonIgnore

src/main/java/io/gmss/fiscad/entities/rfu/metier/DonneesImpositionTfu.java

@@ -8,10 +8,6 @@ import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
-import io.gmss.fiscad.enums.NatureImpot;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -74,22 +70,16 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     private String latitude;
     private int superficieParc;
     private Long superficieAuSolBat;
-    private Long superficieAuSolLoue;
     private Long superficieAuSolUlog;
-    private Boolean batie;
+    private String batieOuiNon;
-    private Boolean exonere;
+    private String exhonereOuiNon;
-    private Boolean batimentExonere;
+    private String batimentExhonereOuiNon;
-    private Boolean uniteLogementExonere;
+    private String uniteLogementExhonereOuiNon;
     private Long valeurLocativeAdm;
-    private Long valeurLocativeAdmTauxPropParc;
-    private Long valeurLocativeAdmSupReel;
-    private Long superficieAuSolTauxPropParc;
-    private Long valeurLocativeAdmMetreCarre;
     private Long montantLoyerAnnuel;
     private Long tfuMetreCarre;
     private Long tfuMinimum;
     private String standingBat;
-    private String categorieUsage;
     private String categorieBat;
     private Long nombrePiscine;
     private Long nombreUlog;
@@ -98,53 +88,14 @@ public class DonneesImpositionTfu extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateEnquete;
     private Long enqueteId;
-
+    private Long structureId;
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "structure_id")
-    private Structure structure ;
-
     private Long secteurId;
-    @ManyToOne(fetch = FetchType.LAZY)
+    private Long zoneRfuId;
-    @JoinColumn(name = "zone_rfu_id")
-    private ZoneRfu zoneRfu ;
-
     @ColumnDefault("0")
-    private Long valeurAdminParcelleNb;
+    private float tauxParcelleNonBati;
-    private Float tauxTfu;
+    private Long valeurAdministrativeParcelleNonBati;
-    private Long tfuPiscine;
-    private Float montantTaxe;
-    private Float tfuCalculeTauxPropParc;
-    private Float tfuSuperficieAuSolReel;
-    private Long valeurAdminParcelleNbMetreCarre;
     @JsonIgnore
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "impositions_tfu_id", nullable = false)
     private ImpositionsTfu impositionsTfu;
-    @Enumerated(EnumType.STRING)
-    private NatureImpot natureImpot;
-    private Long valeurBatiment;
-    private Long valeurParcelle;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "parcelle_id")
-    private Parcelle parcelleImposee ;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "batiment_id")
-    private Batiment batimentImpose ;
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    @JoinColumn(name = "unite_logement_id")
-    private UniteLogement uniteLogementImposee ;
-
-
-    @JsonIgnore
-    @ManyToOne(fetch = FetchType.LAZY)
-    private Personne personne ;
-
-
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteActivite.java

@@ -62,10 +62,10 @@ public class EnqueteActivite extends BaseEntity implements Serializable {
 
     @ManyToOne
     private Batiment batiment;
+    private Long batimentExternalKey;
 
     @OneToOne
     private Parcelle parcelle;
-
     private Long parcelleExternalKey;
 
 
@@ -74,12 +74,11 @@ public class EnqueteActivite extends BaseEntity implements Serializable {
 
     @OneToOne
     private UniteLogement uniteLogement ;
+    private Long uniteLogementExternalKey;
 
-
+    @JsonIgnore
-
+    @ManyToOne
-//    @JsonIgnore
+    private Enquete enquete;
-//    @ManyToOne
-//    private Enquete enquete;
 
     @JsonIgnore
     @ManyToOne
@@ -91,12 +90,6 @@ public class EnqueteActivite extends BaseEntity implements Serializable {
 
     private Long mobileDataId;
 
-
-    private Long batimentExternalKey;
-
-    private Long uniteLogementExternalKey;
-
-
     @Enumerated(EnumType.STRING)
     @JsonIgnore
     private StatutEnregistrement statutEnregistrement;

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteBatiment.java

@@ -12,11 +12,7 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.enums.StatutEnregistrement;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -46,32 +42,24 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-   // private Float surfaceAuSol;
+    private float surfaceAuSol;
     private String autreMenuisierie;
     private String autreMur;
-    private Boolean sbee;
+    private boolean sbee;
     private String numCompteurSbee;
-    private Boolean soneb;
+    private boolean soneb;
     private String numCompteurSoneb;
-    private Integer nbreLotUnite;
+    private int nbreLotUnite;
-    private Integer nbreUniteLogement;
+    private int nbreUniteLocation;
-    private Integer nbrePiece;
+    private float surfaceLouee;
-    private Integer nbreUniteLocation;
+    private int nbreMenage;
-    private Float superficieLouee;
+    private int nbreHabitant;
-    private Float superficieAuSol;
-    private Integer nbreMenage;
-    private Integer nbreHabitant;
     private Long montantMensuelLocation;
     private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelEstime;
-    private Long montantLocatifAnnuelCalcule;
     private Long valeurBatimentEstime;
     private Long valeurBatimentReel;
-    private Long valeurBatimentCalcule;
+    private int nbreMoisLocation;
-    private Integer nombrePiscine;
-    private Integer nbreMoisLocation;
     private String autreCaracteristiquePhysique;
-    private String observation;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateDebutExcemption;
@@ -79,21 +67,6 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateFinExcemption;
 
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateEnquete;
-
- @JsonFormat(pattern = "dd-MM-yyyy")
- @JsonDeserialize(using = LocalDateDeserializer.class)
- private LocalDate dateValidation;
-
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRejet;
-    private String descriptionMotifRejet;
-    @ManyToOne
-    private Exercice exercice;
-
     //@JsonIgnore
     @ManyToOne
     private Personne personne;
@@ -112,15 +85,10 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     private Long batimentExternalKey;
     private Long nbreEtage;
 
-    private String representantNom;
-    private String representantPrenom;
-    private String representantTel;
-    private String representantNpi;
-
    // @JsonIgnore
-//    @ManyToOne(fetch = FetchType.LAZY)
+    @ManyToOne(fetch = FetchType.LAZY)
-//    @JsonBackReference
+    @JsonBackReference
-//    private Enquete enquete;
+    private Enquete enquete;
 
 
 
@@ -139,12 +107,7 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
     @OneToMany(mappedBy = "enqueteBatiment")
     private List<Upload> uploads;
 
-    @Enumerated(EnumType.STRING)
+    //@Enumerated(EnumType.STRING)
-    @JsonIgnore
+    //@JsonIgnore
-    private StatutEnquete statutEnquete;
+    //private StatutEnregistrement statutEnregistrement;
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-    @ManyToOne
-    private Usage usage ;
-
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/EnqueteUniteLogement.java

@@ -11,11 +11,7 @@ import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
 import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import io.gmss.fiscad.entities.user.User;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.enums.StatutEnregistrement;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
@@ -45,74 +41,42 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private Integer nbrePiece;
+    private int nbrePiece;
-    private Integer nbreHabitant;
+    private int nbreHabitant;
-    private Integer nbreMenage;
+    private int nbreMenage;
-    private Boolean enLocation;
+    private boolean enLocation;
-    private Long montantMensuelLocation;
+    private float montantMensuelLoyer;
-    private Integer nbreMoisLocation;
+    private int nbreMoisLocation;
-    private Long montantLocatifAnnuelDeclare;
+    private float montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long montantLocatifAnnuelEstime;
     private Long valeurUniteLogementEstime;
     private Long valeurUniteLogementReel;
-    private Long valeurUniteLogementCalcule;
+    private float surfaceLouee;
-    private Integer nombrePiscine;
+    private float SurfaceAuSol;
-    private Float superficieLouee;
+    private boolean sbee;
-    private Float superficieAuSol;
+    private boolean soneb;
-    private Boolean sbee;
-    private Boolean soneb;
     private String numCompteurSbee;
     private String numCompteurSoneb;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDebutExemption;
+    private LocalDate dateDebutExcemption;
     @JsonFormat(pattern = "dd-MM-yyyy")
     @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateFinExemption;
+    private LocalDate dateFinExcemption;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateEnquete;
 
-    @JsonFormat(pattern = "dd-MM-yyyy")
+    @JsonIgnore
-    @JsonDeserialize(using = LocalDateDeserializer.class)
+    @ManyToOne(fetch = FetchType.LAZY)
-    private LocalDate dateValidation;
+    @JsonBackReference
-
+    private Enquete enquete;
-    @JsonFormat(pattern = "dd-MM-yyyy")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateRejet;
-    private String descriptionMotifRejet;
-    private String observation;
-    private Long uniteLogementExternalKey;
-
-    private String representantNom;
-    private String representantPrenom;
-    private String representantTel;
-    private String representantNpi;
-
-    @ManyToOne
-    private Exercice exercice;
-
-
-
-//    @JsonIgnore
-//    @ManyToOne(fetch = FetchType.LAZY)
-//    @JsonBackReference
-//    private Enquete enquete;
 
 
     @ManyToOne
     private UniteLogement uniteLogement;
 
+
+    private Long uniteLogementExternalKey;
+
     @OneToOne
     private Personne personne;
-    @JsonIgnore
-    @ManyToOne
-    private Tpe terminal;
-    @JsonIgnore
-    @ManyToOne
-    private User user;
-
 
     private Long personneExternalKey;
     private Long mobileDataId;
@@ -121,16 +85,16 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
     @JsonManagedReference
     private List<CaracteristiqueUniteLogement> caracteristiqueUniteLogements;
 
-
+    @JsonIgnore
-
+    @ManyToOne
+    private Tpe terminal;
+    @JsonIgnore
+    @ManyToOne
+    private User user;
     //@JsonIgnore
     @OneToMany(mappedBy = "enqueteUniteLogement")
     private List<Upload> uploads;
     @JsonIgnore
     @Enumerated(EnumType.STRING)
-    private StatutEnquete statutEnquete;
+    private StatutEnregistrement statutEnregistrement;
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-    @ManyToOne
-    private Usage usage ;
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/ImpositionsTfu.java

@@ -6,7 +6,6 @@ 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.Commune;
-import io.gmss.fiscad.entities.infocad.parametre.Structure;
 import io.gmss.fiscad.entities.rfu.parametre.Exercice;
 import io.gmss.fiscad.entities.rfu.parametre.Participer;
 import io.gmss.fiscad.enums.StatusAvis;
@@ -34,39 +33,24 @@ public class ImpositionsTfu extends BaseEntity implements Serializable {
     private Long id;
     @ManyToOne
     private Exercice exercice;
-
     @ManyToOne
     private Commune commune;
-
-    @ManyToOne
-    private Structure structure ;
-
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonDeserialize(using = LocalDateDeserializer.class)
     private LocalDate dateGeneration;
-
+    private String ReferencePieceAdmin;
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateCloture;
-
-    private String referencePieceAdmin;
     private String datePieceAdmin;
-
     @Enumerated(EnumType.STRING)
     private StatusAvis statusAvis;
-
+    private Long nombreAvis;
-    private Integer nombreAvis;
-    private Integer nombreAvisFnb;
-    private Integer nombreAvisBatiment;
-    private Integer nombreAvisUniteLog;
-
     @Column(columnDefinition = "TEXT")
     private String motif;
-
     @JsonIgnore
     @OneToMany(cascade = CascadeType.ALL, fetch = FetchType.EAGER)
     @JoinColumn(name = "impositions_tfu_id")
     private List<DonneesImpositionTfu> donneesImpositionTfus;
 
-
+    public  Long getNombreAvis(){
+        return donneesImpositionTfus==null?0l:donneesImpositionTfus.size();
+    }
 }

src/main/java/io/gmss/fiscad/entities/rfu/metier/SituationFiscaleParcelle.java

@@ -1,45 +0,0 @@
-package io.gmss.fiscad.entities.rfu.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.infocad.metier.Parcelle;
-import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.rfu.parametre.Exercice;
-import io.gmss.fiscad.enums.StatutParcelle;
-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.time.LocalDate;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Where(clause = " deleted = false")
-public class SituationFiscaleParcelle extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    @ManyToOne
-    private Parcelle parcelle ;
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateDernierPaiement;
-    @ManyToOne
-    private Exercice exercice ;
-    private Long montantDu ;
-    private Long montantPaye ;
-    private Long resteAPayer ;
-    @JsonFormat(pattern = "yyyy-MM-dd")
-    @JsonDeserialize(using = LocalDateDeserializer.class)
-    private LocalDate dateSync;
-}

src/main/java/io/gmss/fiscad/entities/rfu/metier/UniteLogement.java

@@ -6,8 +6,6 @@ import com.fasterxml.jackson.databind.annotation.JsonDeserialize;
 import io.gmss.fiscad.deserializer.LocalDateDeserializer;
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.infocad.metier.Tpe;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
-import io.gmss.fiscad.entities.rfu.parametre.Usage;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -41,34 +39,11 @@ public class UniteLogement extends BaseEntity implements Serializable {
     private List<EnqueteUniteLogement> enqueteUniteLogements;
     @ManyToOne
     private Batiment batiment;
-    @ManyToOne
-    private Usage usage;
     private Long batimentExternalKey;
     private Long idDerniereEnquete;
-    private Float SuperficieLouee;
-    private Float SuperficieAuSol;
-    private Long montantMensuelLocation;
-    private Long montantLocatifAnnuelDeclare;
-    private Long montantLocatifAnnuelCalcule;
-    private Long valeurUniteLogementEstime;
-    private Long montantLocatifAnnuelEstime;
-    private Long valeurUniteLogementReel;
-    private Long valeurUniteLogementCalcule;
-    private Integer nombrePiscine;
     @JsonIgnore
     @ManyToOne
     private Tpe terminal;
     private Long enqueteId;
     private Long mobileDataId;
-    @ManyToOne
-    private CategorieBatiment categorieBatiment ;
-    @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 Integer idToitRfu;
-    private Integer nombreEtage;
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/BaremRfuBati.java

@@ -2,7 +2,6 @@ package io.gmss.fiscad.entities.rfu.parametre;
 
 import io.gmss.fiscad.entities.BaseEntity;
 import io.gmss.fiscad.entities.decoupage.Arrondissement;
-import io.gmss.fiscad.entities.decoupage.Quartier;
 import jakarta.persistence.*;
 import lombok.AllArgsConstructor;
 import lombok.Data;
@@ -29,6 +28,4 @@ public class BaremRfuBati extends BaseEntity implements Serializable {
     private CategorieBatiment categorieBatiment;
     @ManyToOne
     private Arrondissement arrondissement;
-    @ManyToOne
-    private Quartier quartier ;
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/BaremRfuNonBati.java

@@ -23,9 +23,7 @@ public class BaremRfuNonBati extends BaseEntity implements Serializable {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
     private Long valeurAdministrative;
-    private Long valeurAdministrativeMetreCarre;
+    private float taux;
-    private Boolean auMetreCarre;
-    private Float taux;
     @ManyToOne
     private Commune commune;
     @ManyToOne

src/main/java/io/gmss/fiscad/entities/rfu/parametre/CategorieBatiment.java

@@ -23,5 +23,4 @@ public class CategorieBatiment extends BaseEntity implements Serializable {
     @Column(unique = true)
     private String code;
     private String nom;
-    private String standing;
 }

src/main/java/io/gmss/fiscad/entities/rfu/parametre/Exercice.java

@@ -25,7 +25,7 @@ public class Exercice extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    private Integer annee;
+    private int annee;
     private boolean estGenerer;
     @JsonFormat(pattern = "yyyy-MM-dd")
     @JsonDeserialize(using = LocalDateDeserializer.class)

src/main/java/io/gmss/fiscad/entities/rfu/parametre/Usage.java

@@ -1,29 +0,0 @@
-package io.gmss.fiscad.entities.rfu.parametre;
-
-import io.gmss.fiscad.entities.BaseEntity;
-import io.gmss.fiscad.enums.CategorieUsage;
-import jakarta.persistence.*;
-import lombok.AllArgsConstructor;
-import lombok.Data;
-import lombok.EqualsAndHashCode;
-import lombok.NoArgsConstructor;
-import org.hibernate.annotations.Where;
-
-import java.io.Serializable;
-
-@EqualsAndHashCode(callSuper = true)
-@Entity
-@Data
-@NoArgsConstructor
-@AllArgsConstructor
-@Where(clause = " deleted = false")
-public class Usage extends BaseEntity implements Serializable {
-    @Id
-    @GeneratedValue(strategy = GenerationType.IDENTITY)
-    private Long id;
-    private String code;
-    private String nom;
-    @Enumerated(EnumType.STRING)
-    private CategorieUsage categorieUsage;
-}
-

src/main/java/io/gmss/fiscad/entities/user/Fonction.java

@@ -32,17 +32,10 @@ import java.time.LocalDate;
 //                "SET deleted = true " +
 //                "WHERE id = ?")
 //@Where(clause = " deleted = false")
-@Table(
-        name = "fonction",
-        uniqueConstraints = {
-                @UniqueConstraint(columnNames = {"code"})
-        }
-)
 public class Fonction extends BaseEntity implements Serializable {
     @Id
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
-    @Column(nullable = false, unique = true)
     private String code ;
     private String nom ;
 

src/main/java/io/gmss/fiscad/enums/CategorieUsage.java

@@ -1,8 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum CategorieUsage {
-
-    HABITATION,
-    PROFESSIONNELLE,
-    MIXTE
-}

src/main/java/io/gmss/fiscad/enums/EtatIdentificationPersonne.java

@@ -1,9 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum EtatIdentificationPersonne {
-    IFU,
-    NPI,
-    IFU_NPI,
-    NEANT,
-    RFU;
-}

src/main/java/io/gmss/fiscad/enums/NatureImpot.java

@@ -1,7 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum NatureImpot {
-    TFU,
-    IRF,
-    SRTB
-}

src/main/java/io/gmss/fiscad/enums/ParametersType.java

@@ -1,22 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum ParametersType {
-    EMAILS_TO,
-    EMAIL_FROM,
-    SMTP_PORT,
-    SMTP_HOST,
-    SMTP_USERNAME,
-    SMTP_PASSWORD,
-    MESSAGE_STATUT,
-    OBJET_RESET_PASSWORD,
-    CORPS_RESET_PASSWORD,
-    OBJET_CREATE_ACCOUNT,
-    CORPS_CREATE_ACCOUNT,
-    TOKEN_IFU_EN_LIGNE,
-    TAUX_TFU,
-    TAUX_VALEUR_LOCATIVE_PROFESSIONNELLE,
-    TAUX_DEFAUT_SUPERFICIE_AU_SOL,
-    TAUX_IRF,
-    TAXE_SRTB,
-    TFU_PAR_PISCINE;
-}

src/main/java/io/gmss/fiscad/enums/SourceDonnee.java

@@ -1,7 +0,0 @@
-package io.gmss.fiscad.enums;
-
-public enum SourceDonnee {
-    RFU,
-    ANDF,
-    SIGIBE
-}

src/main/java/io/gmss/fiscad/enums/StatusAvis.java

@@ -1,13 +1,8 @@
 package io.gmss.fiscad.enums;
 
 public enum StatusAvis {
-    EN_COURS,
+    CREE,
-
+    GENERE,
-    CLOTURE,
+    ANNULE,
-    GENERATION_AUTORISE,
+    VALIDE,
-
-    REJETE,
-    TFU_FNB_GENERE,
-    GENERE
-
 }

src/main/java/io/gmss/fiscad/enums/StatutEnquete.java

@@ -5,6 +5,5 @@ public enum StatutEnquete {
     FINALISE,
     REJETE,
     VALIDE,
-    ECHEC,
+    ECHEC
-    CLOTURE
 }

src/main/java/io/gmss/fiscad/enums/StatutParcelle.java

@@ -1,7 +1,9 @@
 package io.gmss.fiscad.enums;
 
 public enum StatutParcelle {
-    NON_ENQUETE,
+
-    AJOUR,
+    NON_ENQUETER,
-    NON_AJOUR;
+    ENQUETER_NON_BATIE,
+    ENQUETER_BATIE
+
 }

src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurDecoupageServiceImpl.java

@@ -2,18 +2,15 @@ package io.gmss.fiscad.implementations.decoupage;
 
 import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.decoupage.SecteurDecoupage;
-import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.SecteurDecoupageService;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.paylaods.request.crudweb.SecteurDecoupagePaylaodWeb;
-import io.gmss.fiscad.paylaods.response.statistique.ParcelleStatsProjectionUnSecteur;
+import io.gmss.fiscad.paylaods.request.crudweb.SecteurPaylaodWeb;
+import io.gmss.fiscad.paylaods.response.restoration.ParcelleStatsProjectionUnSecteur;
 import io.gmss.fiscad.persistence.repositories.decoupage.SecteurDecoupageRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -29,9 +26,6 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService {
     private final SecteurDecoupageRepository secteurDecoupageRepository;
     private final SecteurService secteurService;
     private final ParcelleRepository parcelleRepository;
-    private final EnqueteRepository enqueteRepository;
-    private final EnqueteBatimentRepository enqueteBatimentRepository;
-    private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
 
 
@@ -118,35 +112,4 @@ public class SecteurDecoupageServiceImpl implements SecteurDecoupageService {
 
         return parcelleStatsProjectionUnSecteurs ;
     }
-
-    @Override
-    public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteDecoupageByUserId(Long userId, String statutEnquete) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-        System.out.println(statutEnquete);
-        return enqueteRepository.findStatsEnqueteBySecteurs(secteurIds,statutEnquete);
-    }
-
-    @Override
-    public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteBatimentDecoupageByUserId(Long userId, String statutEnquete) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-        System.out.println(statutEnquete);
-        return enqueteBatimentRepository.findStatsEnqueteBatimentBySecteurs(secteurIds,statutEnquete);
-    }
-
-    @Override
-    public List<ParcelleStatsProjectionUnSecteur> getStatEnqueteUniteLogementDecoupageByUserId(Long userId, String statutEnquete) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-        return enqueteUniteLogementRepository.findStatsEnqueteBatimentBySecteurs(secteurIds,statutEnquete);
-    }
-
-
 }

src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java

@@ -163,15 +163,8 @@ public class SecteurServiceImpl implements SecteurService {
                         secteurs.addAll(secteurRepository.findDistinctBySection_Id(avoirFonction.getFonction().getSection().getId()));
                     }else if(avoirFonction.getFonction().getStructure()!=null){
                         secteurs.addAll(secteurRepository.findDistinctBySection_Structure_Id(avoirFonction.getFonction().getStructure().getId()));
-                    }else if(avoirFonction.getFonction().getDepartement()!=null){
-                        secteurs.addAll(secteurRepository.findSectionsByDepartement(avoirFonction.getFonction().getDepartement().getId()));
                     }
                 });
         return secteurs;
     }
-
-    @Override
-    public List<Secteur> getListSecteurByDepartementId(Long departementId) {
-        return secteurRepository.findSectionsByDepartement(departementId);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/EnqueteServiceImpl.java

@@ -1,6 +1,5 @@
 package io.gmss.fiscad.implementations.infocad.metier;
 
-import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.infocad.metier.*;
 import io.gmss.fiscad.entities.infocad.parametre.Personne;
 import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
@@ -14,9 +13,7 @@ import io.gmss.fiscad.enums.StatutEnquete;
 import io.gmss.fiscad.exceptions.ApplicationException;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
-import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
 import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
 import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService;
@@ -26,7 +23,6 @@ import io.gmss.fiscad.interfaces.user.UserService;
 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.paylaods.response.* ;
 import io.gmss.fiscad.paylaods.response.FicheResponse.* ;
 import io.gmss.fiscad.paylaods.response.synchronisation.EnqueteNonSyncResponse;
@@ -47,8 +43,6 @@ import io.gmss.fiscad.service.EntityFromPayLoadService;
 import jakarta.persistence.EntityManager;
 import jakarta.persistence.PersistenceContext;
 import jakarta.persistence.Query;
-import jakarta.transaction.Transactional;
-import jakarta.ws.rs.NotAcceptableException;
 import lombok.RequiredArgsConstructor;
 import org.modelmapper.ModelMapper;
 import org.springframework.data.domain.Page;
@@ -83,9 +77,13 @@ public class EnqueteServiceImpl implements EnqueteService {
     private final ParcelleServiceImpl parcelleService;
     private final PersonneRepository personneRepository;
     private final ZoneRfuRepository zoneRfuRepository ;
+    private final EquipeRepository equipeRepository ;
+    private final RueRepository rueRepository ;
+    private final CaracteristiqueParcelleService caracteristiqueParcelleService ;
+    private final PieceService pieceService ;
+    private final UploadRepository uploadRepository ;
+    private final DeclarationNcService declarationNcService ;
     private final EntityFromPayLoadService entityFromPayLoadService ;
-    private final SecteurService secteurService ;
-            ;
 
     @PersistenceContext
     private final EntityManager em;
@@ -93,93 +91,14 @@ public class EnqueteServiceImpl implements EnqueteService {
 
 
     @Override
-    @Transactional
+    public Enquete createEnquete(EnquetePayLoadWeb enquetePayLoadWeb) throws BadRequestException {
-    public EnquetePayLoadWeb createEnquete(EnquetePayLoadWeb enquetePayLoadWeb) throws BadRequestException {
+        Parcelle parcelle=new Parcelle();
-
+        Long rueId;
         Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
         if (!optionalUser.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
         }
-
+        Optional<Personne> optionalProprietaire = personneRepository.findById(enquetePayLoadWeb.getProprietaireId());
-        Optional<Personne> optionalPersonne = personneRepository.findById(enquetePayLoadWeb.getPersonneId());
-        if (!optionalPersonne.isPresent()) {
-            throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
-        }
-
-        if(enquetePayLoadWeb.getParcelleId()!=null) {
-            Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
-            if (!optionalParcelle.isPresent()) {
-                throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
-            }
-        }
-
-
-        Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId());
-        if (!optionalZoneRfu.isPresent()) {
-            throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
-        }
-
-        ParcellePayLoadWeb parcellePayLoadWeb= getParcellePayloadFromEnquetePl(enquetePayLoadWeb);
-
-        if(parcellePayLoadWeb.getId()==null){
-            parcellePayLoadWeb=parcelleService.createParcelle(parcellePayLoadWeb);
-        }else{
-            parcellePayLoadWeb=parcelleService.updateParcelle(parcellePayLoadWeb.getId(),parcellePayLoadWeb);
-        }
-
-        enquetePayLoadWeb.setParcelleId(parcellePayLoadWeb.getId());
-
-        Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
-        ////enregistrement de l'enquete
-        enquete=enqueteRepository.save(enquete);
-
-        return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
-    }
-
-    private ParcellePayLoadWeb getParcellePayloadFromEnquetePl(EnquetePayLoadWeb enquetePayLoadWeb) {
-                ParcellePayLoadWeb parcellePayLoadWeb=new ParcellePayLoadWeb();
-                parcellePayLoadWeb.setId(enquetePayLoadWeb.getParcelleId());
-                parcellePayLoadWeb.setQ(enquetePayLoadWeb.getParcelleQ());
-                parcellePayLoadWeb.setI(enquetePayLoadWeb.getParcelleI());
-                parcellePayLoadWeb.setP(enquetePayLoadWeb.getParcelleP());
-                parcellePayLoadWeb.setNup(enquetePayLoadWeb.getParcelleNup());
-                parcellePayLoadWeb.setNupProvisoire(enquetePayLoadWeb.getNupProvisoire());
-                parcellePayLoadWeb.setNumTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier());
-                parcellePayLoadWeb.setLongitude(enquetePayLoadWeb.getLongitude());
-                parcellePayLoadWeb.setLatitude(enquetePayLoadWeb.getLatitude());
-                parcellePayLoadWeb.setAltitude(enquetePayLoadWeb.getAltitude());
-                parcellePayLoadWeb.setSuperficie(enquetePayLoadWeb.getSuperficie());
-                parcellePayLoadWeb.setObservation(enquetePayLoadWeb.getObservation());
-                parcellePayLoadWeb.setSituationGeographique(enquetePayLoadWeb.getSituationGeographique());
-                parcellePayLoadWeb.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle());
-                parcellePayLoadWeb.setQuartierId(enquetePayLoadWeb.getQuartierId());
-                parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
-                parcellePayLoadWeb.setTypeDomaineId(enquetePayLoadWeb.getTypeDomaineId());
-                parcellePayLoadWeb.setRueId(enquetePayLoadWeb.getRueId());
-                parcellePayLoadWeb.setProprietaireId(enquetePayLoadWeb.getPersonneId());
-                parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
-                parcellePayLoadWeb.setNatureDomaineId(enquetePayLoadWeb.getNatureDomaineId());
-                return parcellePayLoadWeb;
-    }
-
-    @Override
-    public EnquetePayLoadWeb updateEnquete(Long id,EnquetePayLoadWeb enquetePayLoadWeb) throws NotFoundException {
-        if (enquetePayLoadWeb.getId() == null) {
-            throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null.");
-        }
-        if (!enqueteRepository.existsById(enquetePayLoadWeb.getId())) {
-            throw new NotFoundException("Impossible de trouver l'enquête que vous désirez modifier.");
-        }
-
-        if (enquetePayLoadWeb.getParcelleId()==null) {
-            throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante");
-        }
-
-        Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
-        if (!optionalUser.isPresent()) {
-            throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
-        }
-        Optional<Personne> optionalProprietaire = personneRepository.findById(enquetePayLoadWeb.getPersonneId());
         if (!optionalProprietaire.isPresent()) {
             throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
         }
@@ -189,28 +108,172 @@ public class EnqueteServiceImpl implements EnqueteService {
             throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
         }
 
-        if(enquetePayLoadWeb.getParcelleId()!=null) {
+        if(enquetePayLoadWeb.getZoneRfuId()!=null) {
-            Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoadWeb.getParcelleId());
+            Optional<Rue> optionalRue = rueRepository.findById(enquetePayLoadWeb.getZoneRfuId());
-            if (!optionalParcelle.isPresent()) {
+
-                throw new BadRequestException("Echec de l'enregistrement : Parcelle inexistante");
+            if (optionalRue.isPresent()) {
+                rueId = optionalRue.get().getId();
+                enquetePayLoadWeb.getParcellePayLoadWeb().setRueId(rueId);
             }
         }
 
+        Optional<Equipe> optionalEquipe = equipeRepository.findById(enquetePayLoadWeb.getEquipeId());
 
-        ParcellePayLoadWeb parcellePayLoadWeb= getParcellePayloadFromEnquetePl(enquetePayLoadWeb);
+        ///enregistrement de la pacelle
-
+        try {
-        if(parcellePayLoadWeb.getId()==null){
+            if (enquetePayLoadWeb.getParcellePayLoadWeb().getId() == null) {
-            parcellePayLoadWeb=parcelleService.createParcelle(parcellePayLoadWeb);
+                parcelle = parcelleService.createParcelle(enquetePayLoadWeb.getParcellePayLoadWeb());
             } else {
-            parcellePayLoadWeb=parcelleService.updateParcelle(parcellePayLoadWeb.getId(),parcellePayLoadWeb);
+                parcelle = parcelleService.updateParcelle(enquetePayLoadWeb.getParcellePayLoadWeb().getId(),enquetePayLoadWeb.getParcellePayLoadWeb());
+            }
+        }catch (Exception e){
+            e.printStackTrace();
+            throw new ApplicationException("Echec de l'enregistrement : La parcelle non enregistrée.");
+        }
+        ////enregistrement de l'enquete
+        Enquete enquete = new Enquete();
+        enquete.setDateEnquete(LocalDate.now());
+        //enquete.setBloc(optionalBloc.get());
+        enquete.setUser(optionalUser.get());
+        enquete.setParcelle(parcelle);
+        enquete.setLitige(enquetePayLoadWeb.isLitige());
+        enquete.setStatutEnquete(StatutEnquete.EN_COURS);
+        enquete.setObservationParticuliere(enquetePayLoadWeb.getObservation());
+        enquete.setPersonne(optionalProprietaire.orElse(null));
+        enquete.setZoneRfu(optionalZoneRfu.orElse(null));
+        enquete.setAutreAdresse(enquetePayLoadWeb.getAutreAdresse());
+        enquete.setAutreNumeroTitreFoncier(enquetePayLoadWeb.getAutreNumeroTitreFoncier());
+        enquete.setNumeroTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier());
+        enquete.setEquipe(optionalEquipe.orElse(null));
+        enquete.setDateDebutExcemption(enquetePayLoadWeb.getDateDebutExemption());
+        enquete.setDateFinExcemption(enquetePayLoadWeb.getDateFinExemption());
+        enquete.setNbreBatiment(enquetePayLoadWeb.getNbreBatiment());
+        enquete.setNbrePiscine(enquetePayLoadWeb.getNbrePiscine());
+        enquete.setNbreIndivisiaire(enquetePayLoadWeb.getNbreIndivisiaire());
+        enquete.setNbreCoProprietaire(enquetePayLoadWeb.getNbreCoProprietaire());
+        enquete.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle());
+        enquete.setNomRue(enquetePayLoadWeb.getNomRue());
+        enquete.setNumRue(enquetePayLoadWeb.getNumRue());
+        enquete.setSuperficie(enquetePayLoadWeb.getSuperficie());
+        enquete.setMontantMensuelleLocation(enquetePayLoadWeb.getMontantMensuelleLocation());
+        enquete.setMontantAnnuelleLocation(enquetePayLoadWeb.getMontantAnnuelleLocation());
+        enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime());
+        enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel());
+        Enquete finalEnquete=enqueteRepository.save(enquete);
+
+        //////Enregistrement des caractéristiques parcelle
+        enquetePayLoadWeb.getCaracteristiqueParcellePayloadWebs().forEach(caracteristiqueParcellePayloadWeb -> {
+            caracteristiqueParcellePayloadWeb.setEnqueteId(finalEnquete.getId());
+            CaracteristiqueParcelle caracteristiqueParcelle=entityFromPayLoadService.getCaracteristiqueParcelleFromPayLoadWeb(caracteristiqueParcellePayloadWeb);
+            caracteristiqueParcelleService.createCaracteristiqueParcelle(caracteristiqueParcelle);
+        });
+
+        /////Enregistrement des pièce de parcelles
+        enquetePayLoadWeb.getPiecePayLoadWebs().forEach(piecePayLoadWeb -> {
+            piecePayLoadWeb.setEnqueteId(finalEnquete.getId());
+            //Piece piece=entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb);
+            Piece piecefinal = pieceService.createPiece(entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb));
+            piecePayLoadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
+                uploadPayLoadWeb.setEnqueteId(finalEnquete.getId());
+                Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
+                upload.setPiece(piecefinal);
+                uploadRepository.save(upload);
+            });
+        });
+
+        /////Enregistrement des pièce de parcelles
+        enquetePayLoadWeb.getDeclarationNcPayloadWebs().forEach(declarationNcPayloadWeb -> {
+            declarationNcPayloadWeb.setEnqueteId(finalEnquete.getId());
+            DeclarationNc declarationNcfinal=declarationNcService.createDeclarationNc(entityFromPayLoadService.getDeclarationNcFromPayLoadWeb(declarationNcPayloadWeb));
+            declarationNcPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
+                uploadPayLoadWeb.setEnqueteId(finalEnquete.getId());
+                Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
+                upload.setDeclarationNc(declarationNcfinal);
+                uploadRepository.save(upload);
+            });
+        });
+
+        return enquete;
     }
 
-        enquetePayLoadWeb.setParcelleId(parcellePayLoadWeb.getId());
+    @Override
+    public Enquete updateEnquete(Long id,EnquetePayLoadWeb enquetePayLoadWeb) throws NotFoundException {
+        if (enquetePayLoadWeb.getId() == null) {
+            throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null.");
+        }
+        if (!enqueteRepository.existsById(enquetePayLoadWeb.getId())) {
+            throw new NotFoundException("Impossible de trouver l'enquête que vous désirez modifier.");
+        }
 
+        if (enquetePayLoadWeb.getParcellePayLoadWeb()==null) {
+            throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante");
+        }
 
-        Enquete enquete = entityFromPayLoadService.getEnqueteFromPayLoadWeb(enquetePayLoadWeb);
+        Parcelle parcelle=new Parcelle();
-        enquete=enqueteRepository.save(enquete);
+        Long rueId;
-        return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
+        Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
+        if (!optionalUser.isPresent()) {
+            throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
+        }
+        Optional<Personne> optionalProprietaire = personneRepository.findById(enquetePayLoadWeb.getProprietaireId());
+        if (!optionalProprietaire.isPresent()) {
+            throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
+        }
+
+        Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId());
+        if (!optionalZoneRfu.isPresent()) {
+            throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
+        }
+
+        Optional<Rue> optionalRue = rueRepository.findById(enquetePayLoadWeb.getZoneRfuId());
+
+        if (optionalRue.isPresent()) {
+            rueId=optionalRue.get().getId();
+            enquetePayLoadWeb.getParcellePayLoadWeb().setRueId(rueId);
+        }
+
+        Optional<Equipe> optionalEquipe = equipeRepository.findById(enquetePayLoadWeb.getEquipeId());
+
+        ///enregistrement de la pacelle
+        try {
+            if (enquetePayLoadWeb.getParcellePayLoadWeb().getId() == null) {
+                parcelle = parcelleService.createParcelle(enquetePayLoadWeb.getParcellePayLoadWeb());
+            } else {
+                parcelle = parcelleService.updateParcelle(enquetePayLoadWeb.getParcellePayLoadWeb().getId(),enquetePayLoadWeb.getParcellePayLoadWeb());
+            }
+        }catch (Exception e){
+            throw new ApplicationException("Echec de l'enregistrement : La parcelle non enregistrée.");
+        }
+        ////enregistrement de l'enquete
+        Enquete enquete = new Enquete();
+        enquete.setDateEnquete(LocalDate.now());
+        //enquete.setBloc(optionalBloc.get());
+        enquete.setUser(optionalUser.get());
+        enquete.setParcelle(parcelle);
+        enquete.setLitige(enquetePayLoadWeb.isLitige());
+        enquete.setStatutEnquete(StatutEnquete.EN_COURS);
+        enquete.setObservationParticuliere(enquetePayLoadWeb.getObservation());
+        enquete.setPersonne(optionalProprietaire.orElse(null));
+        enquete.setZoneRfu(optionalZoneRfu.orElse(null));
+        enquete.setAutreAdresse(enquetePayLoadWeb.getAutreAdresse());
+        enquete.setAutreNumeroTitreFoncier(enquetePayLoadWeb.getAutreNumeroTitreFoncier());
+        enquete.setNumeroTitreFoncier(enquetePayLoadWeb.getNumeroTitreFoncier());
+        enquete.setEquipe(optionalEquipe.orElse(null));
+        enquete.setDateDebutExcemption(enquetePayLoadWeb.getDateDebutExemption());
+        enquete.setDateFinExcemption(enquetePayLoadWeb.getDateFinExemption());
+        enquete.setNbreBatiment(enquetePayLoadWeb.getNbreBatiment());
+        enquete.setNbrePiscine(enquetePayLoadWeb.getNbrePiscine());
+        enquete.setNbreIndivisiaire(enquetePayLoadWeb.getNbreIndivisiaire());
+        enquete.setNbreCoProprietaire(enquetePayLoadWeb.getNbreCoProprietaire());
+        enquete.setNumEntreeParcelle(enquetePayLoadWeb.getNumEntreeParcelle());
+        enquete.setNomRue(enquetePayLoadWeb.getNomRue());
+        enquete.setNumRue(enquetePayLoadWeb.getNumRue());
+        enquete.setSuperficie(enquetePayLoadWeb.getSuperficie());
+        enquete.setMontantMensuelleLocation(enquetePayLoadWeb.getMontantMensuelleLocation());
+        enquete.setMontantAnnuelleLocation(enquetePayLoadWeb.getMontantAnnuelleLocation());
+        enquete.setValeurParcelleEstime(enquetePayLoadWeb.getValeurParcelleEstime());
+        enquete.setValeurParcelleReel(enquetePayLoadWeb.getValeurParcelleReel());
+        return enqueteRepository.save(enquete);
     }
 
 
@@ -327,36 +390,31 @@ public class EnqueteServiceImpl implements EnqueteService {
     }
 
     @Override
-    public Page<EnquetePayLoadWeb> getEnqueteList(Pageable pageable) {
+    public Page<Enquete> getEnqueteList(Pageable pageable) {
-        return enqueteRepository.findAllEnquetesToDtoPageable(pageable);
+        return enqueteRepository.findAll(pageable);
     }
 
     @Override
-    public List<EnquetePayLoadWeb> getEnqueteList() {
+    public List<Enquete> getEnqueteList() {
-        return enqueteRepository.findAllEnquetesToDto();
+        return enqueteRepository.findAll();
     }
 
     @Override
-    public List<EnquetePayLoadWeb> getEnqueteListByParcelle(Long parcelleId) {
+    public List<Enquete> getEnqueteListByParcelle(Long parcelleId) {
-        return enqueteRepository.findAllEnquetesByParcelleToDto(parcelleId);
+        return enqueteRepository.findAllByParcelle_Id(parcelleId);
     }
 
     @Override
-    public Page<EnquetePayLoadWeb> getEnqueteListByParcellePageable(Long parcelleId, Pageable pageable) {
+    public Optional<Enquete> getEnqueteById(Long id) {
-        return enqueteRepository.findAllEnquetesByParcelleToDtoPageable(parcelleId,pageable);
-    }
-
-    @Override
-    public Optional<EnquetePayLoadWeb> getEnqueteById(Long id) {
         if (enqueteRepository.existsById(id)) {
-            return enqueteRepository.findEnqueteToDto(id);
+            return enqueteRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver l'enquête.");
         }
     }
 
     @Override
-    public EnquetePayLoadWeb validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
+    public Enquete validerEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         if (enqueteTraitementPayLoad == null) {
             throw new BadRequestException("Impossible de valider une enquête ayant un id null.");
         }
@@ -364,22 +422,15 @@ public class EnqueteServiceImpl implements EnqueteService {
         if (!optionalEnquete.isPresent()) {
             throw new NotFoundException("Impossible de trouver l'enquête que vous désirez valider.");
         }
-        if(optionalEnquete.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
-           optionalEnquete.get().getStatutEnquete()==StatutEnquete.REJETE ){
-            throw new NotAcceptableException("Impossible de valider : Le statut actuel "+optionalEnquete.get().getStatutEnquete()+" ne le permet pas.");
-        }
-
         Enquete enquete = optionalEnquete.get();
         enquete.setDateValidation(LocalDate.now());
         enquete.setStatutEnquete(StatutEnquete.VALIDE);
-        enquete.setSynchronise(true);
+        enquete.setSynchronise(false);
-
+        return enqueteRepository.save(enquete);
-        enquete= enqueteRepository.save(enquete);
-        return  enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
     }
 
     @Override
-    public EnquetePayLoadWeb rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
+    public Enquete rejeterEnquete(EnqueteTraitementPayLoad enqueteTraitementPayLoad) {
         if (enqueteTraitementPayLoad.getIdBackend() == null) {
             throw new BadRequestException("Impossible de rejeter une enquête ayant un id null.");
         }
@@ -387,43 +438,38 @@ public class EnqueteServiceImpl implements EnqueteService {
         if (!optionalEnquete.isPresent()) {
             throw new NotFoundException("Impossible de trouver l'enquête que vous désirez rejeter.");
         }
-        if(optionalEnquete.get().getStatutEnquete()==StatutEnquete.CLOTURE ||
-                optionalEnquete.get().getStatutEnquete()==StatutEnquete.VALIDE ){
-            throw new NotAcceptableException("Impossible de rejeter : Le statut actuel "+optionalEnquete.get().getStatutEnquete()+" ne le permet pas.");
-        }
         Enquete enquete = optionalEnquete.get();
         enquete.setDateRejet(LocalDate.now());
         enquete.setDescriptionMotifRejet(enqueteTraitementPayLoad.getMotifRejet());
         enquete.setStatutEnquete(StatutEnquete.REJETE);
         enquete.setSynchronise(false);
-        enquete= enqueteRepository.save(enquete);
+        return enqueteRepository.save(enquete);
-        return enqueteRepository.findEnqueteToDto(enquete.getId()).orElse(null);
     }
 
     @Override
-    public List<EnquetePayLoadWeb> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
+    public List<Enquete> validerEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        List<EnquetePayLoadWeb> enquetePayLoadWebs = new ArrayList<>();
+        List<Enquete> enquetes = new ArrayList<>();
         try {
             for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
-                enquetePayLoadWebs.add(validerEnquete(enqueteTraitementPayLoad));
+                enquetes.add(validerEnquete(enqueteTraitementPayLoad));
             }
         } catch (Exception e) {
-            enquetePayLoadWebs.add(null);
+            enquetes.add(null);
         }
-        return enquetePayLoadWebs;
+        return enquetes;
     }
 
     @Override
-    public List<EnquetePayLoadWeb> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
+    public List<Enquete> rejeterEnquete(List<EnqueteTraitementPayLoad> enqueteTraitementPayLoads) {
-        List<EnquetePayLoadWeb> enquetePayLoadWebs = new ArrayList<>();
+        List<Enquete> enquetes = new ArrayList<>();
         try {
             for (EnqueteTraitementPayLoad enqueteTraitementPayLoad : enqueteTraitementPayLoads) {
-                enquetePayLoadWebs.add(rejeterEnquete(enqueteTraitementPayLoad));
+                enquetes.add(rejeterEnquete(enqueteTraitementPayLoad));
             }
         } catch (Exception e) {
-            enquetePayLoadWebs.add(null);
+            enquetes.add(null);
         }
-        return enquetePayLoadWebs;
+        return enquetes;
     }
 
     @Override
@@ -553,13 +599,13 @@ public class EnqueteServiceImpl implements EnqueteService {
 
         List<CaracteristiqueParcelle> caracteristiqueParcelles = caracteristiqueParcelleRepository.findAllByEnquete_Id(enqueteId);
 
-        //List<EnqueteBatiment> enqueteBatiments = enqueteBatimentRepository.findAllByEnquete_Id(enqueteId);
+        List<EnqueteBatiment> enqueteBatiments = enqueteBatimentRepository.findAllByEnquete_Id(enqueteId);
 
-       // List<EnqueteUniteLogement> enqueteUniteLogements = enqueteUniteLogementRepository.findAllByEnquete_Id(enqueteId);
+        List<EnqueteUniteLogement> enqueteUniteLogements = enqueteUniteLogementRepository.findAllByEnquete_Id(enqueteId);
 
         ficheEnquetesResponse.setCaracteristiquesParcelles(caracteristiqueParcelles);
-       // ficheEnquetesResponse.setEnquetesBatiments(enqueteBatiments);
+        ficheEnquetesResponse.setEnquetesBatiments(enqueteBatiments);
-       // ficheEnquetesResponse.setEnquetesUniteLogements(enqueteUniteLogements);
+        ficheEnquetesResponse.setEnquetesUniteLogements(enqueteUniteLogements);
         ficheEnqueteResponse.setEnquete(ficheEnquetesResponse);
         ficheEnqueteResponse.setActeurConcernes(acteurConcernes);
 
@@ -572,36 +618,4 @@ public class EnqueteServiceImpl implements EnqueteService {
     }
 
 
-    @Override
-    @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByUserIdAndExerciceId(Long userId,Long exerciceId) {
-       Optional<User> optionalUser= userRepository.findById(userId);
-       int nbreEnquete=0;
-       if(optionalUser.isPresent() && optionalUser.get().getStructure()!=null){
-           Long structureId=optionalUser.get().getStructure().getId();
-           nbreEnquete=cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(structureId,exerciceId);
-       }
-        return nbreEnquete;
-    }
-
-    @Override
-    public Page<EnquetePayLoadWeb> getEnqueteListByQuartierByStatutPageableToDto(Long userId, Long quartierId, StatutEnquete statutEnquete, Pageable pageable) {
-        List<Secteur> secteurs= secteurService.getListSecteurUserId(userId);
-        List<Long> secteurIds = secteurs.stream()
-                .map(Secteur::getId)
-                .toList();
-
-        return  enqueteRepository.findAllEnqueteByQuartierByStatutToDtoPageable(quartierId,secteurIds,statutEnquete,pageable);
-    }
-
-    @Override
-    @Transactional
-    public int cloturerEnqueteParcelleBatimentUniteLogementByStructureIdAndExerciceId(Long structureId,Long exerciceId) {
-        Integer nombreParcelleImpacte=enqueteRepository.clotureEnqueteParcelle(structureId,exerciceId);
-        Integer nombreBatiment=enqueteBatimentRepository.clotureEnqueteBatiment(structureId,exerciceId);
-        Integer nombreUniteLogement=enqueteUniteLogementRepository.clotureEnqueteUniteLogement(structureId,exerciceId);
-        return nombreParcelleImpacte;
-    }
-
-
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleGeomServiceImpl.java

@@ -8,7 +8,6 @@ import io.gmss.fiscad.entities.infocad.metier.Upload;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService;
-import io.gmss.fiscad.paylaods.request.crudweb.ParcelleGeomPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.EnqueteCheckResponse;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleGeomRepository;
@@ -80,7 +79,6 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
         return n;
     }
 
-
     private Upload saveGeoJsonUpload(MultipartFile file,String reference,String desc) {
         Upload upload = new Upload();
         String fileName = fileStorageService.storeFile(file);
@@ -178,16 +176,6 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
         return parcelleGeomRepository.findAllByQuartier_Code(codeQuartier);
     }
 
-    @Override
-    public List<ParcelleGeomPaylaodWeb> getParcelleGeomListByQuatierId(Long quartierId) {
-        return parcelleGeomRepository.findAllByQuartierId(quartierId);
-    }
-
-    @Override
-    public Page<ParcelleGeomPaylaodWeb> getParcelleGeomListByQuatierIdPaged(Long quartierId, Pageable pageable) {
-        return  parcelleGeomRepository.findAllByQuartierIdPageable(quartierId,pageable);
-    }
-
     @Override
     public List<ParcelleGeom> getParcelleGeomListUnArrondissement(String codeArrondissement) {
         return parcelleGeomRepository.findAllByQuartier_Arrondissement_Code(codeArrondissement);
@@ -274,9 +262,4 @@ public class ParcelleGeomServiceImpl implements ParcelleGeomService {
     }
 
 
-    @Override
-    public int createParcelleGeomFromGeoJsonApi() throws BadRequestException {
-        return 0;
-    }
-
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/ParcelleServiceImpl.java

@@ -2,17 +2,14 @@ package io.gmss.fiscad.implementations.infocad.metier;
 
 import io.gmss.fiscad.entities.decoupage.Quartier;
 import io.gmss.fiscad.entities.decoupage.Secteur;
-import io.gmss.fiscad.entities.infocad.metier.Enquete;
 import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
 import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.infocad.metier.Rue;
 import io.gmss.fiscad.entities.infocad.parametre.NatureDomaine;
-import io.gmss.fiscad.entities.infocad.parametre.TypeDomaine;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.SecteurService;
 import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
-import io.gmss.fiscad.paylaods.FiltreParcelle;
 import io.gmss.fiscad.paylaods.request.FiltreParcellePayLoad;
 import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb;
 import io.gmss.fiscad.paylaods.response.dataTableResponse.ParcelleDataTableResponse;
@@ -21,12 +18,9 @@ import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository
 import io.gmss.fiscad.persistence.repositories.infocad.metier.RueRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.NatureDomaineRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationGeographiqueRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypeDomaineRepository;
 import io.gmss.fiscad.persistence.specification.ParcelleSpecification;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
 import io.gmss.fiscad.service.GeometryService;
 import jakarta.persistence.Query;
-import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.*;
 import org.springframework.stereotype.Service;
@@ -43,8 +37,6 @@ public class ParcelleServiceImpl implements ParcelleService {
     private final RueRepository rueRepository;
     private final GeometryService geometryService;
     private final SecteurService secteurService;
-    private final TypeDomaineRepository typeDomaineRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
 
 //    @Value("${infocad.geom.srid}")
 //    private String defaultSrid32631;
@@ -55,7 +47,7 @@ public class ParcelleServiceImpl implements ParcelleService {
 
 
     @Override
-    public ParcellePayLoadWeb createParcelle(ParcellePayLoadWeb parcellePayLoadWeb) throws BadRequestException {
+    public Parcelle createParcelle(ParcellePayLoadWeb parcellePayLoadWeb) throws BadRequestException {
         Optional<NatureDomaine> optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoadWeb.getNatureDomaineId());
         if (!optionalNatureDomaine.isPresent()) {
             throw new BadRequestException("Impossible d'enregistrer une parcelle avec une nature de domaine inexistant");
@@ -64,31 +56,36 @@ public class ParcelleServiceImpl implements ParcelleService {
         if (!optionalQuartier.isPresent()) {
             throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
         }
-
-        Optional<TypeDomaine> optionalTypeDomaine = typeDomaineRepository.findById(parcellePayLoadWeb.getTypeDomaineId());
-        if (!optionalTypeDomaine.isPresent()) {
-            throw new BadRequestException("Veuillez préciser le type de domaine");
-        }
-
         Parcelle parcelle = new Parcelle();
-        parcelle = entityFromPayLoadService.getParcelleFromPayload(parcellePayLoadWeb);
+        parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
-        parcelle= parcelleRepository.save(parcelle);
+        parcelle.setQuartier(optionalQuartier.orElse(null));
-        return parcelleRepository.findParcelleToDtoById(parcelle.getId()).orElse(null);
+        parcelle = getParcelleFromPayload(parcelle, parcellePayLoadWeb);
+        return parcelleRepository.save(parcelle);
     }
 
     @Override
-    public ParcellePayLoadWeb updateParcelle(Long id, ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException {
+    public Parcelle updateParcelle(Long id, ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException {
-       if(parcellePayLoadWeb.getId()!=null) {
         Optional<Parcelle> optionalParcelle = parcelleRepository.findById(parcellePayLoadWeb.getId());
         if (!optionalParcelle.isPresent()) {
             throw new NotFoundException("Impossible de trouver la parcelle que vous désirer modifier");
         }
+        Optional<NatureDomaine> optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoadWeb.getNatureDomaineId());
+        if (!optionalNatureDomaine.isPresent()) {
+            throw new BadRequestException("Impossible d'enregistrer une parcelle avec une nature de domaine inexistante");
         }
-
+        Optional<Quartier> optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId());
-       Parcelle parcelle = new Parcelle();
+        if (!optionalQuartier.isPresent()) {
-        parcelle = entityFromPayLoadService.getParcelleFromPayload(parcellePayLoadWeb);
+            throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
-        parcelle= parcelleRepository.save(parcelle);
+        }
-        return parcelleRepository.findParcelleToDtoById(parcelle.getId()).orElse(null);
+//        Optional<SituationGeographique> optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoadWeb.getSituationGeographiqueId());
+//        if (!optionalSituationGeographique.isPresent()) {
+//            throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant");
+//        }
+        Parcelle parcelle=optionalParcelle.get();
+        parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
+        parcelle.setQuartier(optionalQuartier.orElse(null));
+        parcelle = getParcelleFromPayload(optionalParcelle.get(), parcellePayLoadWeb);
+        return parcelleRepository.save(parcelle);
     }
 
     @Override
@@ -120,54 +117,6 @@ public class ParcelleServiceImpl implements ParcelleService {
         return parcelleRepository.findAll();
     }
 
-    @Override
-    public Optional<ParcellePayLoadWeb> getParcelleByIdToDto(Long userId, Long parcelleId) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        return parcelleRepository.findParcelleToDtoById(secteurIds,parcelleId);
-    }
-
-    @Override
-    public List<ParcellePayLoadWeb> getParcelleListToDto(Long userId) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        return parcelleRepository.findAllParcelleToDto(secteurIds);
-    }
-
-    @Override
-    public Page<ParcellePayLoadWeb> getParcelleListPageableToDto(Long userId, Pageable pageable) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        return parcelleRepository.findAllParcelleToDtoPageable(secteurIds,pageable);
-    }
-
-    @Override
-    public List<ParcellePayLoadWeb> getParcelleListByQuartierToDto(Long userId, Long quartierId) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        return parcelleRepository.findAllParcelleByQuartierToDto(quartierId,secteurIds);
-    }
-
-    @Override
-    public Page<ParcellePayLoadWeb> getParcelleListByQuartierPageableToDto(Long userId, Long quartierId, Pageable pageable) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        return parcelleRepository.findAllParcelleByQuartierToDtoPageable(quartierId,secteurIds,pageable);
-    }
-
-    @Override
-    public List<ParcellePayLoadWeb> getParcelleListByRueToDto(Long userId, Long rueId) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        return parcelleRepository.findAllParcelleByRueToDto(rueId,secteurIds);
-    }
-
-    @Override
-    public Page<ParcellePayLoadWeb> getParcelleListByRuePageableToDto(Long userId, Long rueId, Pageable pageable) {
-        List<Long> secteurIds = getSecteurIdListForUser(userId);
-        System.out.println(rueId);
-        secteurIds.forEach(aLong -> {
-            System.out.println(aLong);
-
-        });
-        return parcelleRepository.findAllParcelleByRueToDtoPageable(rueId,secteurIds,pageable);
-    }
-
-
     @Override
     public Optional<Parcelle> getParcelleById(Long id) {
         if (parcelleRepository.existsById(id)) {
@@ -177,37 +126,57 @@ public class ParcelleServiceImpl implements ParcelleService {
         }
     }
 
-
     @Override
-    public Page<ParcellePayLoadWeb> getParcelleByMultiFiltre(Long userId, FiltreParcelle filtreParcelle, Pageable pageable) {
+    public Page<ParcelleDataTableResponse> getParcelleDataTableListByUserId(Long userId,   Pageable pageable) {
-            List<Long> secteurIds = getSecteurIdListForUser(userId);
-        System.out.println(secteurIds.size());
-            if (secteurIds == null || secteurIds.isEmpty()) {
-                throw new IllegalArgumentException("Vous n'êtes pas autorisés à consulter ces parcelles");
-            }
-            return parcelleRepository.filtrerParcellesNative(
-                    filtreParcelle,
-                    secteurIds,
-                    pageable
-            );
 
-    }
-
-    @Override
-    @Transactional
-    public Integer majParcelleBatieNonbatie() {
-        return parcelleRepository.updateParcelleBatieTrue()+parcelleRepository.updateParcelleBatieFalse();
-    }
-
-
-    private List<Long> getSecteurIdListForUser(Long userId) {
         List<Secteur> secteurs = secteurService.getListSecteurUserId(userId);
         List<Long> secteurIds = secteurs.stream()
                 .map(Secteur::getId)
                 .toList();
-        return  secteurIds;
+        Page<ParcelleDataTableResponse> parcelleDataTableResponses=parcelleRepository.getParcelleDataTableResponse(secteurIds,pageable);
+
+        return parcelleDataTableResponses ;
     }
 
+    @Override
+    public Page<ParcelleDataTableResponse> getParcelleDataTableListByMultiFiltre(Long userId, FiltreParcellePayLoad filtreParcellePayLoad, Pageable pageable) {
+        List<Secteur> secteurs = secteurService.getListSecteurUserId(userId);
+        List<Long> secteurIds = secteurs.stream()
+                .map(Secteur::getId)
+                .toList();
+//
+//        return parcelleRepository.findAll(
+//                ParcelleSpecification.filtre(filtreParcellePayLoad, secteurIds),
+//                pageable
+//        );
+
+
+
+        Page<ParcelleDataTableResponse> parcelleDataTableResponses=parcelleRepository.getParcelleDataTableResponse(secteurIds,pageable);
+
+        return parcelleDataTableResponses ;
+    }
+
+    private Parcelle getParcelleFromPayload(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb) {
+        if(parcellePayLoadWeb.getRueId()!=null) {
+            Optional<Rue> optionalRue = rueRepository.findById(parcellePayLoadWeb.getRueId());
+            parcelle.setRue(optionalRue.orElse(null));
+        }
+        parcelle.setP(parcellePayLoadWeb.getP());
+        parcelle.setI(parcellePayLoadWeb.getI());
+        parcelle.setQ(parcellePayLoadWeb.getQ());
+        parcelle.setNup(parcellePayLoadWeb.getNup());
+        parcelle.setLatitude(parcellePayLoadWeb.getLatitude());
+        parcelle.setLongitude(parcellePayLoadWeb.getLongitude());
+        parcelle.setAltitude(parcellePayLoadWeb.getAltitude());
+        parcelle.setSituationGeographique(parcellePayLoadWeb.getSituationGeographique());
+        parcelle.setNupProvisoire(parcellePayLoadWeb.getNupProvisoire());
+        parcelle.setAutreNumeroTitreFoncier(parcellePayLoadWeb.getNumTitreFoncier());
+        parcelle.setObservation(parcellePayLoadWeb.getObservation());
+        parcelle.setSuperficie(parcellePayLoadWeb.getSuperficie());
+
+        return parcelle;
+    }
 
 //    private Parcelle getParcelle(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb, Optional<SituationGeographique> optionalSituationGeographique, Optional<NatureDomaine> optionalNatureDomaine) {
 //        StringBuilder coordonnees = new StringBuilder();

src/main/java/io/gmss/fiscad/implementations/infocad/metier/PersonneServiceImpl.java

@@ -2,17 +2,12 @@ package io.gmss.fiscad.implementations.infocad.metier;
 
 
 import io.gmss.fiscad.entities.infocad.parametre.*;
-import io.gmss.fiscad.enums.EtatIdentificationPersonne;
-import io.gmss.fiscad.enums.Origine;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 
 import io.gmss.fiscad.interfaces.infocad.metier.PersonneService;
 import io.gmss.fiscad.paylaods.dto.*;
-import io.gmss.fiscad.paylaods.request.IfuEnLigneRechercheBody;
-import io.gmss.fiscad.paylaods.request.RecherchePersonneResquestBody;
 import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb;
-import io.gmss.fiscad.paylaods.response.ifuenligne.IfuEnLigneContribuableResponse;
 import io.gmss.fiscad.persistence.repositories.decoupage.CommuneRepository;
 import io.gmss.fiscad.persistence.repositories.decoupage.NationaliteRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.MembreGroupeRepository;
@@ -22,7 +17,6 @@ import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneReposit
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.ProfessionRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.SituationMatrimonialeRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.TypePersonneRepository;
-import io.gmss.fiscad.service.CallAPIService;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
 import jakarta.persistence.EntityNotFoundException;
 import lombok.RequiredArgsConstructor;
@@ -30,13 +24,9 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
-import java.time.format.DateTimeFormatter;
-import java.util.ArrayList;
-import java.util.Date;
 import java.util.List;
 import java.util.Optional;
-import java.time.ZoneId;
+
 @Service
 @RequiredArgsConstructor
 public class PersonneServiceImpl implements PersonneService {
@@ -51,19 +41,26 @@ public class PersonneServiceImpl implements PersonneService {
     private final ProfessionRepository professionRepository;
     private final SituationMatrimonialeRepository situationMatrimonialeRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
-    private final CallAPIService callAPIService;
-
 
     @Override
-    public PersonnePayLoadWeb createPersonne(PersonnePayLoadWeb personnePayLoadWeb) throws BadRequestException {
+    public Personne createPersonne(PersonnePayLoadWeb personnePayLoadWeb) throws BadRequestException {
-
+//        Optional<TypePersonne> optionalTypePersonne = typePersonneRepository.findById(personnePayLoadWeb.getTypePersonneId());
+//
+//        Optional<Commune> optionalCommune = communeRepository.findById(personnePayLoadWeb.getCommuneId());
+//
+//
+//        Optional<Nationalite> optionalNationalite = nationaliteRepository.findById(personnePayLoadWeb.getNationaliteId());
+//
+//        Optional<SituationMatrimoniale> optionalQuartier = situationMatrimonialeRepository.findById(personnePayLoadWeb.getSituationMatrimonialeId());
+//
+//        Optional<Profession> optionalProfession = professionRepository.findById(personnePayLoadWeb.getProfessionId());
+//
         Personne personne = entityFromPayLoadService.getPersonneFromPayLoadWeb(personnePayLoadWeb);
-        personne =personneRepository.save(personne);
+        return personneRepository.save(personne);
-        return personneRepository.findBypersonneId(personne.getId()).orElse(null);
     }
 
     @Override
-    public PersonnePayLoadWeb updatePersonne(Long id, PersonnePayLoadWeb personnePayLoadWeb) throws NotFoundException {
+    public Personne updatePersonne(Long id, PersonnePayLoadWeb personnePayLoadWeb) throws NotFoundException {
         if (personnePayLoadWeb.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null.");
         }
@@ -72,8 +69,7 @@ public class PersonneServiceImpl implements PersonneService {
         }
 
         Personne personne = entityFromPayLoadService.getPersonneFromPayLoadWeb(personnePayLoadWeb);
-        personne =personneRepository.save(personne);
+        return personneRepository.save(personne);
-        return personneRepository.findBypersonneId(personne.getId()).orElse(null);
     }
 
     @Override
@@ -82,18 +78,18 @@ public class PersonneServiceImpl implements PersonneService {
     }
 
     @Override
-    public Page<PersonnePayLoadWeb> getPersonneList(Pageable pageable) {
+    public Page<Personne> getPersonneList(Pageable pageable) {
         return null;
     }
 
     @Override
-    public List<PersonnePayLoadWeb> getPersonneList() {
+    public List<Personne> getPersonneList() {
         return null;
     }
 
     @Override
-    public Optional<PersonnePayLoadWeb> getPersonneById(Long id) {
+    public Optional<Personne> getPersonneById(Long id) {
-        return personneRepository.findBypersonneId(id);
+        return personneRepository.findById(id);
     }
 
     @Override
@@ -193,200 +189,5 @@ public class PersonneServiceImpl implements PersonneService {
                 membres
         );
     }
-
-//    @Override
-//    public List<PersonnePayLoadWeb> recherchePersonne(RecherchePersonneResquestBody recherchePersonneResquestBody) {
-//
-//
-//
-//        List<PersonnePayLoadWeb> personnePayLoadWebsRfuLoggil = new ArrayList<>();
-//        personnePayLoadWebsRfuLoggil = recherchePersonneLocal(recherchePersonneResquestBody);
-//
-//        try{
-//
-//            LocalDate date = recherchePersonneResquestBody.getDateNaissance();
-//            String dateNaissance = date != null
-//                    ? date.format(DateTimeFormatter.ISO_LOCAL_DATE)
-//                    : null;
-//
-//            IfuEnLigneRechercheBody ifuEnLigneRechercheBody =new IfuEnLigneRechercheBody();
-//          //  ifuEnLigneRechercheBody.setIfu(recherchePersonneResquestBody.getIfu());
-//            ifuEnLigneRechercheBody.setNom(recherchePersonneResquestBody.getNom());
-//            ifuEnLigneRechercheBody.setPrenom(recherchePersonneResquestBody.getPrenom());
-//            ifuEnLigneRechercheBody.setDateNaissance(dateNaissance);
-//
-//            List<IfuEnLigneContribuableResponse> ifuEnLigneContribuableResponses =callAPIService.callApiRechercheContribIfuEnLigne(ifuEnLigneRechercheBody);
-//            System.out.println(ifuEnLigneContribuableResponses);
-//            if(ifuEnLigneContribuableResponses!=null && !ifuEnLigneContribuableResponses.isEmpty()){
-//                //List<PersonnePayLoadWeb> finalPersonnePayLoadWebsRfuLoggil = personnePayLoadWebsRfuLoggil;
-//                ifuEnLigneContribuableResponses.forEach(ifuEnLigneContribuableResponse -> {
-//                    PersonnePayLoadWeb personnePayLoadWeb=new PersonnePayLoadWeb();
-//                    personnePayLoadWeb.setSource(Origine.SIGIBE);
-//                    personnePayLoadWeb.setNpi(ifuEnLigneContribuableResponse.getNpi());
-//                    personnePayLoadWeb.setIfu(ifuEnLigneContribuableResponse.getIfu());
-//                    personnePayLoadWeb.setNomMere(ifuEnLigneContribuableResponse.getMotherlastname());
-//                    personnePayLoadWeb.setNom(ifuEnLigneContribuableResponse.getLastname());
-//                    personnePayLoadWeb.setPrenom(ifuEnLigneContribuableResponse.getFirstname());
-//                    personnePayLoadWeb.setPrenomMere(ifuEnLigneContribuableResponse.getBjmotherfirstname());
-//
-//                    Date birthdate = ifuEnLigneContribuableResponse.getBirthdate();
-//                    LocalDate localDate = birthdate != null
-//                            ? birthdate.toInstant()
-//                            .atZone(ZoneId.systemDefault())
-//                            .toLocalDate()
-//                            : null;
-//                    personnePayLoadWeb.setDateNaissanceOuConsti(localDate);
-//                    personnePayLoadWeb.setTel1(ifuEnLigneContribuableResponse.getPhonenumber());
-//                    personnePayLoadWeb.setLieuNaissance(ifuEnLigneContribuableResponse.getBirthplace());
-//                    personnePayLoadWeb.setSexe(ifuEnLigneContribuableResponse.getSexe());
-//
-//                    personnePayLoadWebsRfuLoggil.add(personnePayLoadWeb);
-//                });
-//            }
-//        }catch (Exception e){
-//            e.printStackTrace();
-//        }
-//
-//        return personnePayLoadWebsRfuLoggil;
-//    }
-
-
-    @Override
-    public List<PersonnePayLoadWeb> recherchePersonne(RecherchePersonneResquestBody request) {
-        try {
-
-            if(request.getIfu()!=null && !request.getIfu().equals("")){
-                List<PersonnePayLoadWeb> personnePayLoadWebs =personneRepository.findAllPersonneByIfuToDto(request.getIfu());
-                if(!personnePayLoadWebs.isEmpty())
-                    return personnePayLoadWebs;
-            }
-
-            if(request.getNpi()!=null && !request.getNpi().equals("")){
-
-                List<PersonnePayLoadWeb> personnePayLoadWebs = personneRepository.findAllPersonneByNpiToDto(request.getNpi());
-                if(!personnePayLoadWebs.isEmpty())
-                    return personnePayLoadWebs;
-            }
-
-            List<PersonnePayLoadWeb> result=new ArrayList<>();
-
-            result = recherchePersonneLocal(request);
-
-            if (result != null && !result.isEmpty()) {
-                return result;
-            }
-            // Conversion date en String format yyyy-MM-dd
-            String dateNaissance = Optional.ofNullable(request.getDateNaissance())
-                    .map(d -> d.format(DateTimeFormatter.ISO_LOCAL_DATE))
-                    .orElse(null);
-            // Construction du body IFU
-            IfuEnLigneRechercheBody ifuRequest = new IfuEnLigneRechercheBody();
-            ifuRequest.setNom(request.getNom());
-            ifuRequest.setPrenom(request.getPrenom());
-            ifuRequest.setDateNaissance(dateNaissance);
-
-            List<IfuEnLigneContribuableResponse> responses =
-                    callAPIService.callApiRechercheContribIfuEnLigne(ifuRequest);
-
-            if (responses == null || responses.isEmpty()) {
-                return result;
-            }
-
-            for (IfuEnLigneContribuableResponse r : responses) {
-
-                PersonnePayLoadWeb personne = new PersonnePayLoadWeb();
-                personne.setEtatIdentificationPersonne(EtatIdentificationPersonne.IFU);
-                personne.setNpi(r.getNpi());
-                personne.setIfu(r.getIfu());
-                personne.setNomMere(r.getMotherlastname());
-                personne.setNom(r.getLastname());
-                personne.setPrenom(r.getFirstname());
-                personne.setPrenomMere(r.getBjmotherfirstname());
-                personne.setTel1(r.getPhonenumber());
-                personne.setLieuNaissance(r.getBirthplace());
-                personne.setSexe(r.getSexe());
-
-                // Conversion Date → LocalDate
-                Date birthdate = r.getBirthdate();
-                LocalDate localDate = birthdate != null
-                        ? birthdate.toInstant()
-                        .atZone(ZoneId.systemDefault())
-                        .toLocalDate()
-                        : null;
-                personne.setDateNaissanceOuConsti(localDate);
-                personne.setEtatIdentificationPersonne(EtatIdentificationPersonne.IFU);
-                result.add(personne);
-            }
-            return result;
-        } catch (Exception e) {
-            return new ArrayList<>();
-        }
-
-    }
-
-
-//    private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody recherchePersonneResquestBody) {
-//        System.out.println("NOUS SOMMES DANS RECHERCHE NOM ET PRENOM :"+recherchePersonneResquestBody.getNom()+" "+recherchePersonneResquestBody.getPrenom());
-//        List<PersonnePayLoadWeb> personnePayLoadWebs=
-//                personneRepository.findByFiltersInBaseIfuNpiCorrecte(
-//                        recherchePersonneResquestBody.getNom()==null?null: "%"+recherchePersonneResquestBody.getNom().trim().toUpperCase()+"%",
-//                        recherchePersonneResquestBody.getPrenom()==null?null: "%"+recherchePersonneResquestBody.getPrenom().trim().toUpperCase()+"%",
-//                        recherchePersonneResquestBody.getRaisonSociale()==null?null: "%"+recherchePersonneResquestBody.getRaisonSociale().trim().toUpperCase()+"%",
-//                        recherchePersonneResquestBody.getNomMere()==null?null: "%"+recherchePersonneResquestBody.getNomMere().trim().toUpperCase()+"%"
-//                        );
-//        return personnePayLoadWebs ;
-//    }
-
-    private List<PersonnePayLoadWeb> recherchePersonneLocal(RecherchePersonneResquestBody request) {
-        String nom = normalizeLikeParam(request.getNom());
-        String prenom = normalizeLikeParam(request.getPrenom());
-        String raisonSociale = normalizeLikeParam(request.getRaisonSociale());
-        String nomMere = normalizeLikeParam(request.getNomMere());
-
-        return personneRepository.findByFiltersInBaseIfuNpiCorrecte(
-                nom,
-                prenom,
-                raisonSociale,
-                nomMere
-        );
-    }
-    private String normalizeLikeParam(String value) {
-        if (value == null) return null;
-
-        String cleaned = value.trim();
-
-        if (cleaned.isEmpty()) return null;
-
-        return "%" + cleaned.toUpperCase() + "%";
-    }
-    private List<PersonnePayLoadWeb> recherchePersonneSigibe(RecherchePersonneResquestBody recherchePersonneResquestBody) {
-        // callAPIService.callGetIfuEnLigneToken();
-
-
-        return null;
-    }
-
-    private List<PersonnePayLoadWeb> recherchePersonneAnip(RecherchePersonneResquestBody recherchePersonneResquestBody) {
-        // callAPIService.callGetIfuEnLigneToken();
-
-
-        return null;
-    }
-
-
-    private String like(String value) {
-        if (value == null) {
-            return null;
-        }
-
-        value = value.trim();
-
-        if (value.isEmpty()) {
-            return null;
-        }
-
-        return "%" + value + "%";
-    }
-
 }
 

src/main/java/io/gmss/fiscad/implementations/infocad/metier/PieceServiceImpl.java

@@ -1,138 +1,44 @@
 package io.gmss.fiscad.implementations.infocad.metier;
 
-import lombok.AllArgsConstructor;
-
-
 import io.gmss.fiscad.entities.infocad.metier.Piece;
-import io.gmss.fiscad.entities.rfu.metier.DeclarationNc;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
-import io.gmss.fiscad.paylaods.request.crudweb.PiecePayLoadWeb;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
-import org.springframework.data.repository.query.Param;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
 @Service
 public class PieceServiceImpl implements PieceService {
-    private final PieceRepository pieceRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-    private final EnqueteRepository enqueteRepository;
-    private final PersonneRepository personneRepository;
     @Override
-    public PiecePayLoadWeb createPiece(PiecePayLoadWeb piecePayLoadWeb) throws BadRequestException {
+    public Piece createPiece(Piece piece) throws BadRequestException {
-        if (piecePayLoadWeb.getId() != null) {
+        return null;
-            throw new BadRequestException("Impossible de créer une nouvelle déclaration NC ayant un id non null.");
-        }
-
-        Piece piece= entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb);
-        piece =pieceRepository.save(piece);
-        return pieceRepository.findPieceToDto(piece.getId()).orElse(null);
     }
 
     @Override
-    public PiecePayLoadWeb updatePiece(Long id, PiecePayLoadWeb piecePayLoadWeb) throws NotFoundException {
+    public Piece updatePiece(Long id, Piece piece) throws NotFoundException {
-        if (piecePayLoadWeb.getId() == null) {
+        return null;
-            throw new BadRequestException("La piece n'existe pas.");
-        }
-
-        if (!pieceRepository.existsById(piecePayLoadWeb.getId())) {
-            throw new NotFoundException("La piece n'existe pas");
-        }
-
-        Piece piece= entityFromPayLoadService.getPieceFromPayLoadWeb(piecePayLoadWeb);
-        piece =pieceRepository.save(piece);
-        return pieceRepository.findPieceToDto(piece.getId()).orElse(null);
     }
 
     @Override
     public void deletePiece(Long id) throws NotFoundException {
-        Optional<Piece> pieceOptional = pieceRepository.findById(id);
+
-        if (pieceOptional.isPresent()) {
-            pieceRepository.deleteById(pieceOptional.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver la piece à supprimer .");
-        }
     }
 
     @Override
-    public Page<PiecePayLoadWeb> getPieceListToDtoPageable(Pageable pageable) {
+    public Page<Piece> getPieceList(Pageable pageable) {
-        return pieceRepository.findAllToDtoPageable(pageable);
+        return null;
     }
 
     @Override
-    public List<PiecePayLoadWeb> getPieceListToDto() {
+    public List<Piece> getPieceList() {
-        return pieceRepository.findAllPieceToDto();
+        return null;
     }
 
     @Override
-    public Optional<PiecePayLoadWeb> getPieceByToDto(Long id) {
+    public Optional<Piece> getPieceById(Long id) {
-        return pieceRepository.findPieceToDto(id);
+        return Optional.empty();
-    }
-
-    @Override
-    public List<PiecePayLoadWeb> getAllPieceByEnqueteToDto(Long id) {
-        return pieceRepository.findByFilters(
-                null,
-                null,
-                null,
-                null,
-                id,
-                null,
-                null,
-                null,
-                null);
-    }
-
-    @Override
-    public Page<PiecePayLoadWeb> getAllPieceByEnqueteToDtoPageable(Long id,Pageable pageable) {
-        return pieceRepository.findByFiltersPageable(
-                null,
-                null,
-                null,
-                null,
-                id,
-                null,
-                null,
-                null,
-                null,
-                pageable);
-    }
-
-    @Override
-    public List<PiecePayLoadWeb> getAllPieceByEnqueteBatimentToDto(Long id) {
-        return pieceRepository.findByFilters(
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                id,
-                null);
-    }
-
-    @Override
-    public List<PiecePayLoadWeb> getAllPieceByEnqueteUniteLogementToDto(Long id) {
-        return pieceRepository.findByFilters(
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                null,
-                id);
     }
 }

src/main/java/io/gmss/fiscad/implementations/infocad/metier/UploadServiceImpl.java

@@ -1,103 +0,0 @@
-package io.gmss.fiscad.implementations.infocad.metier;
-
-import io.gmss.fiscad.entities.infocad.metier.Piece;
-import io.gmss.fiscad.entities.infocad.metier.Upload;
-import io.gmss.fiscad.entities.rfu.metier.Batiment;
-import io.gmss.fiscad.exceptions.BadRequestException;
-import io.gmss.fiscad.exceptions.NotFoundException;
-import io.gmss.fiscad.interfaces.infocad.metier.UploadService;
-import io.gmss.fiscad.paylaods.request.crudweb.UploadPayLoadWeb;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.PieceRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.UploadRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import io.gmss.fiscad.service.FileStorageService;
-import lombok.AllArgsConstructor;
-import org.springframework.data.domain.Page;
-import org.springframework.data.domain.Pageable;
-import org.springframework.stereotype.Service;
-import org.springframework.web.bind.annotation.RequestParam;
-import org.springframework.web.multipart.MultipartFile;
-
-import java.util.List;
-import java.util.Optional;
-@AllArgsConstructor
-@Service
-public class UploadServiceImpl implements UploadService {
-    private final EntityFromPayLoadService  entityFromPayLoadService;
-    private final UploadRepository uploadRepository;
-    private final PieceRepository pieceRepository;
-    private final FileStorageService fileStorageService;
-    @Override
-    public UploadPayLoadWeb createUpload(UploadPayLoadWeb uploadPayLoadWeb) throws BadRequestException {
-        if (uploadPayLoadWeb.getId() != null) {
-            throw new BadRequestException("Impossible de créer un nouveau upload ayant un id non null.");
-        }
-        Upload upload= entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
-        upload=  uploadRepository.save(upload);
-        return uploadRepository.findByIdToDto(upload.getId()).orElse(null);
-    }
-
-
-    @Override
-    public Upload createUpload(MultipartFile file, @RequestParam Long pieceId) throws BadRequestException {
-        Upload upload = new Upload();
-        if(pieceId!=null && !pieceRepository.existsById(pieceId)) {
-            throw new NotFoundException("La piece n'existe pas");
-        }
-        Optional<Piece> optionalPiece = pieceRepository.findById(pieceId);
-        String fileName = fileStorageService.storeFile(file);
-        upload.setPiece(optionalPiece.orElse(null));
-        upload.setFileName(fileName);
-        upload.setRename(fileName);
-        upload.setMimeType(file.getContentType());
-        upload.setSize(file.getSize());
-        upload.setOriginalFileName(file.getOriginalFilename());
-        upload = uploadRepository.save(upload) ;
-        return upload;
-    }
-
-    @Override
-    public UploadPayLoadWeb updateUpload(Long id, UploadPayLoadWeb uploadPayLoadWeb) throws NotFoundException {
-        return null;
-    }
-
-    @Override
-    public void deleteUpload(Long id) throws NotFoundException {
-        Optional<Upload> optionalUpload = uploadRepository.findById(id);
-        if (optionalUpload.isPresent()) {
-            uploadRepository.deleteById(optionalUpload.get().getId());
-        } else {
-            throw new NotFoundException("Impossible de trouver le fichier spécifié dans notre base de données.");
-        }
-    }
-
-    @Override
-    public Page<UploadPayLoadWeb> getUploadListToDtoPageable(Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public List<UploadPayLoadWeb> getUploadListToDto() {
-        return null;
-    }
-
-    @Override
-    public Optional<UploadPayLoadWeb> getUploadByToDto(Long id) {
-        return Optional.empty();
-    }
-
-    @Override
-    public List<UploadPayLoadWeb> getAllUploadByPieceToDto(Long id) {
-        return uploadRepository.findByPieceId(id);
-    }
-
-    @Override
-    public Page<UploadPayLoadWeb> getAllUploadByPieceDtoPageable(Long id, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public List<Upload> getAllUploadByPiece(Long id) {
-        return uploadRepository.findAllByPiece_Id(id);
-    }
-}

src/main/java/io/gmss/fiscad/implementations/infocad/parametre/BlocServiceImpl.java

@@ -9,7 +9,6 @@ import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.decoupage.ArrondissementService;
 import io.gmss.fiscad.interfaces.infocad.parametre.BlocService;
 import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
-import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.BlocRepository;
 import io.gmss.fiscad.service.StringService;
 import org.springframework.data.domain.Page;
@@ -78,7 +77,7 @@ public class BlocServiceImpl implements BlocService {
             }
         }
 
-        Optional<StructurePaylaodWeb> structureOptional = structureService.getStructureById(structure_id);
+        Optional<Structure> structureOptional = structureService.getStructureById(structure_id);
         if (structureOptional.isPresent()) {
             builder.append(structureOptional.get().getCode());
             builder.append(bloc.getArrondissement().getCode());

src/main/java/io/gmss/fiscad/implementations/infocad/parametre/StructureServiceImpl.java

@@ -1,25 +1,19 @@
 package io.gmss.fiscad.implementations.infocad.parametre;
 
-import io.gmss.fiscad.entities.decoupage.Commune;
-import io.gmss.fiscad.entities.decoupage.Secteur;
 import io.gmss.fiscad.entities.decoupage.Section;
 import io.gmss.fiscad.entities.infocad.parametre.Structure;
-import io.gmss.fiscad.entities.user.AvoirFonction;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.infocad.parametre.StructureService;
 import io.gmss.fiscad.paylaods.request.crudweb.StructurePaylaodWeb;
 import io.gmss.fiscad.paylaods.response.StructureResponse;
 import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository;
-import io.gmss.fiscad.persistence.repositories.user.AvoirFonctionRepository;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
-import java.time.LocalDate;
-import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
 @AllArgsConstructor
@@ -28,36 +22,65 @@ public class StructureServiceImpl implements StructureService {
 
     private final StructureRepository structureRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
-    private final AvoirFonctionRepository avoirFonctionRepository;
 
+//    @Override
+//    public StructurePaylaodWeb createStructure(StructurePaylaodWeb structurePaylaodWeb) throws BadRequestException {
+//        if (structure.getId() != null) {
+//            throw new BadRequestException("Impossible de créer une structure ayant un id non null.");
+//        }
+//        StringBuilder builder = new StringBuilder();
+//        builder.append("C");
+//        builder.append(structureRepository.getLastRecordId() + 1);
+//        structure.setCode(builder.toString());
+//        return structureRepository.save(structure);
+//    }
+//
+//    @Override
+//    public Structure updateStructure(Long id, Structure structure) throws NotFoundException {
+//
+//        System.out.println("structure = " + structure);
+//
+//        if (structure.getId() == null) {
+//            throw new BadRequestException("Impossible de mettre à jour une structure ayant un id null.");
+//        }
+//        if (!structureRepository.existsById(structure.getId())) {
+//            throw new NotFoundException("Impossible de trouver la structure spécifiée dans notre base de données.");
+//        }
+//        try {
+//            structureRepository.save(structure);
+//
+//        }catch (Exception e){
+//            e.printStackTrace();
+//        }
+//
+//        Structure structure1 = structureRepository.getById(structure.getId());
+//
+//        return structure1;
+//    }
+//
     @Override
     public StructurePaylaodWeb createStructure(StructurePaylaodWeb structurePaylaodWeb) throws BadRequestException {
         if (structurePaylaodWeb.getId() != null) {
             throw new BadRequestException("Impossible de créer un nouveau centre ayant un id non null.");
         }
         Structure structure= entityFromPayLoadService.getStructureFromPayLoadWeb(structurePaylaodWeb);
-        structure=structureRepository.save(structure);
+        structureRepository.save(structure);
         return structureRepository.findStructureToDtoById(structure.getId()).orElse(null);
     }
 
     @Override
     public StructurePaylaodWeb updateStructure(Long id, StructurePaylaodWeb structurePaylaodWeb) throws NotFoundException {
         if (structurePaylaodWeb.getId() == null) {
-            throw new BadRequestException("ID obligatoire pour une mise à jour.");
+            throw new BadRequestException("Impossible de mettre à jour un nouveau centre ayant un id null.");
         }
 
-        System.out.println(structurePaylaodWeb.getId());
+        if (!structureRepository.existsById(structurePaylaodWeb.getId())) {
-        Optional<Structure> optionalStructure = structureRepository.findById(structurePaylaodWeb.getId());
+            throw new NotFoundException("Impossible de trouver le centre spécifiée.");
-        if(optionalStructure.isEmpty()){
-            throw new NotFoundException("Structure inexistante.");
         }
-
         Structure structure= entityFromPayLoadService.getStructureFromPayLoadWeb(structurePaylaodWeb);
-        structureRepository.save(structure);
+        structure = structureRepository.save(structure);
-
+       // structureRepository.findStructureToDtoById(structure.getId()).orElse(null);
-        return structureRepository
+        return structureRepository.findStructureToDtoById(structure.getId()).orElse(null);
-                .findStructureToDtoById(structure.getId())
-                .orElse(null);
     }
 
     @Override
@@ -91,33 +114,16 @@ public class StructureServiceImpl implements StructureService {
     }
 
     @Override
-    public Optional<StructurePaylaodWeb> getStructureById(Long id) {
+    public Optional<StructurePaylaodWeb> getStructureByIdToDto(Long id) {
         return structureRepository.findStructureToDtoById(id);
     }
 
     @Override
-    public List<Structure> getListStructureUserId(Long userId) {
+    public Optional<Structure> getStructureById(Long id) {
-        List<AvoirFonction> avoirFonctions= avoirFonctionRepository.findAvoirFonctionByUser_Id(userId);
+        if (structureRepository.existsById(id)) {
-        List<Structure> structures = new ArrayList<>();
+            return structureRepository.findById(id);
-        avoirFonctions.stream()
+        } else {
-                .filter(af -> af.getDateFin() == null || af.getDateFin().isAfter(LocalDate.now()))
+            throw new NotFoundException("Impossible de trouver la structure spécifiée dans la base de données.");
-                .forEach(avoirFonction -> {
-                    if(avoirFonction.getFonction().getStructure()!=null){
-                        structures.addAll(List.of(avoirFonction.getFonction().getStructure()));
-                    }else if (avoirFonction.getFonction().getDepartement()!=null){
-                        structures.addAll(structureRepository.findDistinctByCommune_Departement_Id(avoirFonction.getFonction().getDepartement().getId()));
         }
-                });
-        return structures;
     }
-
-
-
-//    public List<Long> getStructureIdListForUser(Long userId) {
-//        List<Structure> structures = secteurService.getListSecteurUserId(userId);
-//        List<Long> secteurIds = secteurs.stream()
-//                .map(Secteur::getId)
-//                .toList();
-//        return  secteurIds;
-//    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/BatimentServiceImpl.java

@@ -1,15 +1,11 @@
 package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.fiscad.entities.infocad.metier.Parcelle;
 import io.gmss.fiscad.entities.rfu.metier.Batiment;
-import io.gmss.fiscad.entities.rfu.parametre.CategorieBatiment;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
 import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
-import io.gmss.fiscad.persistence.repositories.infocad.metier.ParcelleRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.BatimentRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.parametre.CategorieBatimentRepository;
 import io.gmss.fiscad.service.EntityFromPayLoadService;
 import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
@@ -23,59 +19,30 @@ import java.util.Optional;
 public class BatimentServiceImpl implements BatimentService {
 
     private final BatimentRepository batimentRepository;
-    private final ParcelleRepository parcelleRepository;
-    private final CategorieBatimentRepository categorieBatimentRepository;
     private final EntityFromPayLoadService entityFromPayLoadService;
 
 
     @Override
-    public BatimentPaylaodWeb createBatiment(BatimentPaylaodWeb batimentPaylaodWeb) throws BadRequestException {
+    public Batiment createBatiment(BatimentPaylaodWeb batimentPaylaodWeb) throws BadRequestException {
         if (batimentPaylaodWeb.getId() != null) {
             throw new BadRequestException("Impossible de créer un nouveau batiment ayant un id non null.");
         }
-        if (batimentPaylaodWeb.getParcelleId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
-        }else {
-            if(!parcelleRepository.existsById(batimentPaylaodWeb.getParcelleId()))
-                throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
-        }
-
-        if (batimentPaylaodWeb.getCategorieBatimentId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
-        }else {
-            if(!categorieBatimentRepository.existsById(batimentPaylaodWeb.getCategorieBatimentId()))
-                throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
-        }
        Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb);
-        batiment=  batimentRepository.save(batiment);
+
-        System.out.println(batiment.getId());
+        return batimentRepository.save(batiment);
-        return batimentRepository.findBatimentAvecOccupantCourantToDto(batiment.getId()).orElse(null);
     }
 
     @Override
-    public BatimentPaylaodWeb updateBatiment(Long id,BatimentPaylaodWeb batimentPaylaodWeb) throws NotFoundException {
+    public Batiment updateBatiment(Long id,BatimentPaylaodWeb batimentPaylaodWeb) throws NotFoundException {
         if (batimentPaylaodWeb.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour un nouveau batiment ayant un id null.");
         }
         if (!batimentRepository.existsById(batimentPaylaodWeb.getId())) {
             throw new NotFoundException("Impossible de trouver le batiment spécifié dans notre base de données.");
         }
-        if (batimentPaylaodWeb.getParcelleId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
-        }else {
-            if(!parcelleRepository.existsById(batimentPaylaodWeb.getParcelleId()))
-                throw new BadRequestException("Impossible de créer un nouveau batiment: La parcelle doit être précisée.");
-        }
-
-        if (batimentPaylaodWeb.getCategorieBatimentId() == null) {
-            throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
-        }else {
-            if(!categorieBatimentRepository.existsById(batimentPaylaodWeb.getCategorieBatimentId()))
-                throw new BadRequestException("Impossible de créer un nouveau batiment: La catégorie doit être précisée.");
-        }
         Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb);
-        batiment=  batimentRepository.save(batiment);
+
-        return batimentRepository.findBatimentAvecOccupantCourantToDto(batiment.getId()).orElse(null);
+        return batimentRepository.save(batiment);
     }
 
     @Override
@@ -89,43 +56,23 @@ public class BatimentServiceImpl implements BatimentService {
     }
 
     @Override
-    public Page<BatimentPaylaodWeb> getBatimentList(Pageable pageable) {
+    public Page<Batiment> getBatimentList(Pageable pageable) {
-        return batimentRepository.findAllBatimentsAvecOccupantCourantToDtoPageble(pageable);
+        return batimentRepository.findAll(pageable);
     }
 
     @Override
-    public List<BatimentPaylaodWeb> getBatimentList() {
+    public List<Batiment> getBatimentList() {
-        return batimentRepository.findAllBatimentsAvecOccupantCourantToDto();
+        return batimentRepository.findAll();
-    }
-
-    @Override
-    public Page<BatimentPaylaodWeb> getBatimentListByParcellePageable(Long parcelleId, Pageable pageable) {
-        return batimentRepository.findAllBatimentsAvecOccupantCourantByParcelleToDtoPageble(parcelleId,pageable);
-    }
-
-    @Override
-    public List<BatimentPaylaodWeb> getBatimentListByParcelle(Long parcelleId) {
-        return batimentRepository.findAllBatimentsAvecOccupantCourantByParcelleToDto(parcelleId);
     }
 
 
     @Override
-    public Optional<BatimentPaylaodWeb> getBatimentById(Long id) {
+    public Optional<Batiment> getBatimentById(Long id) {
         if (batimentRepository.existsById(id)) {
-            return batimentRepository.findBatimentAvecOccupantCourantToDto(id);
+            return batimentRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver la caractéristique spécifiée dans la base de données.");
         }
 
     }
-
-    @Override
-    public Page<BatimentPaylaodWeb> getBatimentListByquartierPageable(Long quartierId, Pageable pageable) {
-        return batimentRepository.findAllBatimentsAvecOccupantCourantByQuartierToDtoPageble(quartierId,pageable);
-    }
-
-    @Override
-    public List<BatimentPaylaodWeb> getBatimentListByquartier(Long quartierId) {
-        return batimentRepository.findAllBatimentsAvecOccupantCourantByQuartierToDto(quartierId);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueBatimentServiceImpl.java

@@ -1,56 +1,43 @@
 package io.gmss.fiscad.implementations.rfu.metier;
 
 import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
-import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
-import io.gmss.fiscad.paylaods.request.crudweb.CaracteristiqueBatimentPayloadWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueBatimentRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteBatimentRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
+
 @Service
 public class CaracteristiqueBatimentServiceImpl implements CaracteristiqueBatimentService {
 
     private final CaracteristiqueBatimentRepository caracteristiqueBatimentRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-    private final EnqueteBatimentRepository enqueteBatimentRepository;
 
+    public CaracteristiqueBatimentServiceImpl(CaracteristiqueBatimentRepository caracteristiqueBatimentRepository) {
+        this.caracteristiqueBatimentRepository = caracteristiqueBatimentRepository;
+    }
 
     @Override
-    public CaracteristiqueBatimentPayloadWeb createCaracteristiqueBatiment(CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) throws BadRequestException {
+    public CaracteristiqueBatiment createCaracteristiqueBatiment(CaracteristiqueBatiment caracteristiqueBatiment) throws BadRequestException {
-        if (caracteristiqueBatimentPayloadWeb.getId() != null) {
+        if (caracteristiqueBatiment.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle caracteristique de batiment ayant un id non null.");
         }
-        if (!enqueteBatimentRepository.existsById(caracteristiqueBatimentPayloadWeb.getEnqueteBatimentId())) {
+        return caracteristiqueBatimentRepository.save(caracteristiqueBatiment);
-            throw new BadRequestException("Veuillez préciser l'enquete");
-        }
-
-        CaracteristiqueBatiment caracteristiqueBatiment= entityFromPayLoadService.getCaracteristiqueBatimentFromPayLoadWeb(caracteristiqueBatimentPayloadWeb);
-        caracteristiqueBatiment =caracteristiqueBatimentRepository.save(caracteristiqueBatiment);
-        return caracteristiqueBatimentRepository.findCaracteristiqueBatimentToDto(caracteristiqueBatiment.getId()).orElse(null);
-
     }
 
     @Override
-    public CaracteristiqueBatimentPayloadWeb updateCaracteristiqueBatiment(Long id, CaracteristiqueBatimentPayloadWeb caracteristiqueBatimentPayloadWeb) throws NotFoundException {
+    public CaracteristiqueBatiment updateCaracteristiqueBatiment(Long id, CaracteristiqueBatiment caracteristiqueBatiment) throws NotFoundException {
-        if (caracteristiqueBatimentPayloadWeb.getId() == null) {
+        if (caracteristiqueBatiment.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle caracteristique de batiment ayant un id null.");
         }
-        if (!caracteristiqueBatimentRepository.existsById(caracteristiqueBatimentPayloadWeb.getId())) {
+        if (!caracteristiqueBatimentRepository.existsById(caracteristiqueBatiment.getId())) {
             throw new NotFoundException("Impossible de trouver la nouvelle caracteristique de batiment spécifié dans notre base de données.");
         }
-        CaracteristiqueBatiment caracteristiqueBatiment= entityFromPayLoadService.getCaracteristiqueBatimentFromPayLoadWeb(caracteristiqueBatimentPayloadWeb);
+        return caracteristiqueBatimentRepository.save(caracteristiqueBatiment);
-        caracteristiqueBatiment =caracteristiqueBatimentRepository.save(caracteristiqueBatiment);
-        return caracteristiqueBatimentRepository.findCaracteristiqueBatimentToDto(caracteristiqueBatiment.getId()).orElse(null);
     }
 
     @Override
@@ -64,33 +51,23 @@ public class CaracteristiqueBatimentServiceImpl implements CaracteristiqueBatime
     }
 
     @Override
-    public Page<CaracteristiqueBatimentPayloadWeb> getCaracteristiqueBatimentList(Pageable pageable) {
+    public Page<CaracteristiqueBatiment> getCaracteristiqueBatimentList(Pageable pageable) {
-        return caracteristiqueBatimentRepository.findAllCaracteristiqueBatimentToDtoPageable(pageable);
+        return caracteristiqueBatimentRepository.findAll(pageable);
     }
 
     @Override
-    public List<CaracteristiqueBatimentPayloadWeb> getCaracteristiqueBatimentList() {
+    public List<CaracteristiqueBatiment> getCaracteristiqueBatimentList() {
-        return caracteristiqueBatimentRepository.findAllCaracteristiqueBatimentToDto();
+        return caracteristiqueBatimentRepository.findAll();
     }
 
+
     @Override
-    public Optional<CaracteristiqueBatimentPayloadWeb> getCaracteristiqueBatimentToDto(Long id) {
+    public Optional<CaracteristiqueBatiment> getCaracteristiqueBatimentById(Long id) {
         if (caracteristiqueBatimentRepository.existsById(id)) {
-            return caracteristiqueBatimentRepository.findCaracteristiqueBatimentToDto(id);
+            return caracteristiqueBatimentRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver la caractéristique spécifiée dans la base de données.");
         }
-    }
-
-    @Override
-    public Page<CaracteristiqueBatimentPayloadWeb> getCaracteristiqueBatimentListByEnqueteBatimentPageable(Long enqueteBatimentId, Pageable pageable) {
-        return caracteristiqueBatimentRepository.findAllCaracteristiqueBatimentByEnqueteBatimentToDtoPageable(enqueteBatimentId,pageable);
-    }
-
-    @Override
-    public List<CaracteristiqueBatimentPayloadWeb> getCaracteristiqueBatimentListByEnqueteBatiment(Long enqueteBatimentId) {
-        return caracteristiqueBatimentRepository.findAllCaracteristiqueBatimentByEnqueteBatimentToDto(enqueteBatimentId);
-    }
-
 
     }
+}

src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueParcelleServiceImpl.java

@@ -4,46 +4,40 @@ import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
-import io.gmss.fiscad.paylaods.request.crudweb.CaracteristiqueParcellePayloadWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueParcelleRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
+
 @Service
 public class CaracteristiqueParcelleServiceImpl implements CaracteristiqueParcelleService {
 
     private final CaracteristiqueParcelleRepository caracteristiqueParcelleRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-
 
+    public CaracteristiqueParcelleServiceImpl(CaracteristiqueParcelleRepository caracteristiqueParcelleRepository) {
+        this.caracteristiqueParcelleRepository = caracteristiqueParcelleRepository;
+    }
 
     @Override
-    public CaracteristiqueParcellePayloadWeb createCaracteristiqueParcelle(CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) throws BadRequestException {
+    public CaracteristiqueParcelle createCaracteristiqueParcelle(CaracteristiqueParcelle caracteristiqueParcelle) throws BadRequestException {
-        if (caracteristiqueParcellePayloadWeb.getId() != null) {
+        if (caracteristiqueParcelle.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle caracteristique de parcelle ayant un id non null.");
         }
-        CaracteristiqueParcelle caracteristiqueParcelle= entityFromPayLoadService.getCaracteristiqueParcelleFromPayLoadWeb(caracteristiqueParcellePayloadWeb);
+        return caracteristiqueParcelleRepository.save(caracteristiqueParcelle);
-        caracteristiqueParcelle =caracteristiqueParcelleRepository.save(caracteristiqueParcelle);
-        return caracteristiqueParcelleRepository.findCaracteristiqueParcelleToDto(caracteristiqueParcelle.getId()).orElse(null);
     }
 
     @Override
-    public CaracteristiqueParcellePayloadWeb updateCaracteristiqueParcelle(Long id, CaracteristiqueParcellePayloadWeb caracteristiqueParcellePayloadWeb) throws NotFoundException {
+    public CaracteristiqueParcelle updateCaracteristiqueParcelle(Long id, CaracteristiqueParcelle caracteristiqueParcelle) throws NotFoundException {
-        if (caracteristiqueParcellePayloadWeb.getId() == null) {
+        if (caracteristiqueParcelle.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle caracteristique de parcelle ayant un id null.");
         }
-        if (!caracteristiqueParcelleRepository.existsById(caracteristiqueParcellePayloadWeb.getId())) {
+        if (!caracteristiqueParcelleRepository.existsById(caracteristiqueParcelle.getId())) {
             throw new NotFoundException("Impossible de trouver la nouvelle caracteristique de parcelle spécifié dans notre base de données.");
         }
-        CaracteristiqueParcelle caracteristiqueParcelle= entityFromPayLoadService.getCaracteristiqueParcelleFromPayLoadWeb(caracteristiqueParcellePayloadWeb);
+        return caracteristiqueParcelleRepository.save(caracteristiqueParcelle);
-        caracteristiqueParcelle =caracteristiqueParcelleRepository.save(caracteristiqueParcelle);
-        return caracteristiqueParcelleRepository.findCaracteristiqueParcelleToDto(caracteristiqueParcelle.getId()).orElse(null);
     }
 
     @Override
@@ -68,22 +62,12 @@ public class CaracteristiqueParcelleServiceImpl implements CaracteristiqueParcel
 
 
     @Override
-    public Optional<CaracteristiqueParcellePayloadWeb> getCaracteristiqueParcelleById(Long id) {
+    public Optional<CaracteristiqueParcelle> getCaracteristiqueParcelleById(Long id) {
         if (caracteristiqueParcelleRepository.existsById(id)) {
-            return caracteristiqueParcelleRepository.findCaracteristiqueParcelleToDto(id);
+            return caracteristiqueParcelleRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver la caractéristique spécifiée dans la base de données.");
         }
 
     }
-
-    @Override
-    public Page<CaracteristiqueParcellePayloadWeb> getCaracteristiqueParcelleByEnqueteListPageable(Long id,Pageable pageable) {
-        return caracteristiqueParcelleRepository.findAllCaracteristiqueParcelleByEnqueteToDtoPageable(id,pageable);
-    }
-
-    @Override
-    public List<CaracteristiqueParcellePayloadWeb> getCaracteristiqueParcelleByEnqueteList(Long enqueteId) {
-        return caracteristiqueParcelleRepository.findAllCaracteristiqueParcelleByEnqueteToDto(enqueteId);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/CaracteristiqueUniteLogementServiceImpl.java

@@ -1,56 +1,43 @@
 package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
 import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
-import io.gmss.fiscad.paylaods.request.crudweb.CaracteristiqueUniteLogementPayloadWeb;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.CaracteristiqueUniteLogementRepository;
-import io.gmss.fiscad.persistence.repositories.rfu.metier.EnqueteUniteLogementRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
+
 @Service
 public class CaracteristiqueUniteLogementServiceImpl implements CaracteristiqueUniteLogementService {
 
     private final CaracteristiqueUniteLogementRepository caracteristiqueUniteLogementRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
-    private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
-
 
+    public CaracteristiqueUniteLogementServiceImpl(CaracteristiqueUniteLogementRepository caracteristiqueUniteLogementRepository) {
+        this.caracteristiqueUniteLogementRepository = caracteristiqueUniteLogementRepository;
+    }
 
     @Override
-    public CaracteristiqueUniteLogementPayloadWeb createCaracteristiqueUniteLogement(CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) throws BadRequestException {
+    public CaracteristiqueUniteLogement createCaracteristiqueUniteLogement(CaracteristiqueUniteLogement caracteristiqueUniteLogement) throws BadRequestException {
-        if (caracteristiqueUniteLogementPayloadWeb.getId() != null) {
+        if (caracteristiqueUniteLogement.getId() != null) {
             throw new BadRequestException("Impossible de créer une nouvelle caracteristique d'unité de logement ayant un id non null.");
         }
-        if (!enqueteUniteLogementRepository.existsById(caracteristiqueUniteLogementPayloadWeb.getEnqueteUniteLogementId())) {
+        return caracteristiqueUniteLogementRepository.save(caracteristiqueUniteLogement);
-            throw new BadRequestException("Veuillez préciser l'enquete.");
-        }
-
-        CaracteristiqueUniteLogement caracteristiqueUniteLogement= entityFromPayLoadService.getCaracteristiqueUniteLogementFromPayLoadWeb(caracteristiqueUniteLogementPayloadWeb);
-        caracteristiqueUniteLogement =caracteristiqueUniteLogementRepository.save(caracteristiqueUniteLogement);
-        return caracteristiqueUniteLogementRepository.findCaracteristiqueUniteLogementToDto(caracteristiqueUniteLogement.getId()).orElse(null);
     }
 
     @Override
-    public CaracteristiqueUniteLogementPayloadWeb updateCaracteristiqueUniteLogement(Long id, CaracteristiqueUniteLogementPayloadWeb caracteristiqueUniteLogementPayloadWeb) throws NotFoundException {
+    public CaracteristiqueUniteLogement updateCaracteristiqueUniteLogement(Long id, CaracteristiqueUniteLogement caracteristiqueUniteLogement) throws NotFoundException {
-        if (caracteristiqueUniteLogementPayloadWeb.getId() == null) {
+        if (caracteristiqueUniteLogement.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle caracteristique d'unité de logement ayant un id null.");
         }
-        if (!caracteristiqueUniteLogementRepository.existsById(caracteristiqueUniteLogementPayloadWeb.getId())) {
+        if (!caracteristiqueUniteLogementRepository.existsById(caracteristiqueUniteLogement.getId())) {
             throw new NotFoundException("Impossible de trouver la nouvelle caracteristique d'unité de logement spécifiée dans notre base de données.");
         }
-        CaracteristiqueUniteLogement caracteristiqueUniteLogement= entityFromPayLoadService.getCaracteristiqueUniteLogementFromPayLoadWeb(caracteristiqueUniteLogementPayloadWeb);
+        return caracteristiqueUniteLogementRepository.save(caracteristiqueUniteLogement);
-        caracteristiqueUniteLogement =caracteristiqueUniteLogementRepository.save(caracteristiqueUniteLogement);
-        return caracteristiqueUniteLogementRepository.findCaracteristiqueUniteLogementToDto(caracteristiqueUniteLogement.getId()).orElse(null);
     }
 
     @Override
@@ -64,33 +51,23 @@ public class CaracteristiqueUniteLogementServiceImpl implements CaracteristiqueU
     }
 
     @Override
-    public Page<CaracteristiqueUniteLogementPayloadWeb> getCaracteristiqueUniteLogementList(Pageable pageable) {
+    public Page<CaracteristiqueUniteLogement> getCaracteristiqueUniteLogementList(Pageable pageable) {
-        return caracteristiqueUniteLogementRepository.findAllCaracteristiqueUniteLogementToDtoPageable(pageable);
+        return caracteristiqueUniteLogementRepository.findAll(pageable);
     }
 
     @Override
-    public List<CaracteristiqueUniteLogementPayloadWeb> getCaracteristiqueUniteLogementList() {
+    public List<CaracteristiqueUniteLogement> getCaracteristiqueUniteLogementList() {
-        return caracteristiqueUniteLogementRepository.findAllCaracteristiqueUniteLogementToDto();
+        return caracteristiqueUniteLogementRepository.findAll();
     }
 
 
     @Override
-    public Optional<CaracteristiqueUniteLogementPayloadWeb> getCaracteristiqueUniteLogementById(Long id) {
+    public Optional<CaracteristiqueUniteLogement> getCaracteristiqueUniteLogementById(Long id) {
         if (caracteristiqueUniteLogementRepository.existsById(id)) {
-            return caracteristiqueUniteLogementRepository.findCaracteristiqueUniteLogementToDto(id);
+            return caracteristiqueUniteLogementRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver la caracteristique d'unité de logement spécifiée dans la base de données.");
         }
 
     }
-
-    @Override
-    public Page<CaracteristiqueUniteLogementPayloadWeb> getCaracteristiqueUniteLogementListByEul(Long eul, Pageable pageable) {
-        return caracteristiqueUniteLogementRepository.findAllCaracteristiqueUniteLogementByEnqueteUloToDtoPageable(eul,pageable);
-    }
-
-    @Override
-    public List<CaracteristiqueUniteLogementPayloadWeb> getCaracteristiqueUniteLogementListbyEul(Long eul) {
-        return caracteristiqueUniteLogementRepository.findAllCaracteristiqueUniteLogementByEnqueteUloToDto(eul);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/DeclarationNcServiceImpl.java

@@ -1,66 +1,43 @@
 package io.gmss.fiscad.implementations.rfu.metier;
 
-import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueUniteLogement;
 import io.gmss.fiscad.entities.rfu.metier.DeclarationNc;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService;
-import io.gmss.fiscad.paylaods.request.crudweb.DeclarationNcPayloadWeb;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.PersonneRepository;
-import io.gmss.fiscad.persistence.repositories.infocad.parametre.StructureRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.metier.DeclarationNcRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
-import lombok.AllArgsConstructor;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 
 import java.util.List;
 import java.util.Optional;
-@AllArgsConstructor
+
 @Service
 public class DeclarationNcServiceImpl implements DeclarationNcService {
 
     private final DeclarationNcRepository declarationNcRepository;
-    private final StructureRepository structureRepository;
-    private final PersonneRepository personneRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
 
-
+    public DeclarationNcServiceImpl(DeclarationNcRepository declarationNcRepository) {
-    @Override
+        this.declarationNcRepository = declarationNcRepository;
-    public DeclarationNcPayloadWeb createDeclarationNc(DeclarationNcPayloadWeb declarationNcPayloadWeb) throws BadRequestException {
-        if (declarationNcPayloadWeb.getId() != null) {
-            throw new BadRequestException("Impossible de créer une nouvelle déclaration NC ayant un id non null.");
-        }
-        if (!personneRepository.existsById(declarationNcPayloadWeb.getPersonneId())) {
-            throw new BadRequestException("Veuillez préciser le contribuable.");
-        }
-        if (!structureRepository.existsById(declarationNcPayloadWeb.getStructureId())) {
-            throw new BadRequestException("Veuillez préciser le centre.");
-        }
-
-        DeclarationNc declarationNc= entityFromPayLoadService.getDeclarationNcFromPayLoadWeb(declarationNcPayloadWeb);
-        declarationNc =declarationNcRepository.save(declarationNc);
-        return declarationNcRepository.findDeclarationNcToDto(declarationNc.getId()).orElse(null);
     }
 
     @Override
-    public DeclarationNcPayloadWeb updateDeclarationNc(Long id, DeclarationNcPayloadWeb  declarationNcPayloadWeb) throws NotFoundException {
+    public DeclarationNc createDeclarationNc(DeclarationNc declarationNc) throws BadRequestException {
-        if (declarationNcPayloadWeb.getId() == null) {
+        if (declarationNc.getId() != null) {
+            throw new BadRequestException("Impossible de créer une nouvelle enquete de batiment ayant un id non null.");
+        }
+        return declarationNcRepository.save(declarationNc);
+    }
+
+    @Override
+    public DeclarationNc updateDeclarationNc(Long id, DeclarationNc declarationNc) throws NotFoundException {
+        if (declarationNc.getId() == null) {
             throw new BadRequestException("Impossible de mettre à jour une nouvelle enquete de batiment ayant un id null.");
         }
-        if (!declarationNcRepository.existsById(declarationNcPayloadWeb.getId())) {
+        if (!declarationNcRepository.existsById(declarationNc.getId())) {
             throw new NotFoundException("Impossible de trouver la nouvelle enquete de batiment spécifiée dans notre base de données.");
         }
-        if (!personneRepository.existsById(declarationNcPayloadWeb.getPersonneId())) {
+        return declarationNcRepository.save(declarationNc);
-            throw new BadRequestException("Veuillez préciser le contribuable.");
-        }
-        if (!structureRepository.existsById(declarationNcPayloadWeb.getStructureId())) {
-            throw new BadRequestException("Veuillez préciser le centre.");
-        }
-        DeclarationNc declarationNc= entityFromPayLoadService.getDeclarationNcFromPayLoadWeb(declarationNcPayloadWeb);
-        declarationNc =declarationNcRepository.save(declarationNc);
-        return declarationNcRepository.findDeclarationNcToDto(declarationNc.getId()).orElse(null);
     }
 
     @Override
@@ -74,36 +51,23 @@ public class DeclarationNcServiceImpl implements DeclarationNcService {
     }
 
     @Override
-    public Page<DeclarationNcPayloadWeb> getDeclarationNcList(Pageable pageable) {
+    public Page<DeclarationNc> getDeclarationNcList(Pageable pageable) {
-        return declarationNcRepository.findAllDeclarationNcToDtoPageable(pageable);
+        return declarationNcRepository.findAll(pageable);
     }
 
     @Override
-    public List<DeclarationNcPayloadWeb> getDeclarationNcList() {
+    public List<DeclarationNc> getDeclarationNcList() {
-        return declarationNcRepository.findAllDeclarationNcToDto();
+        return declarationNcRepository.findAll();
     }
 
 
-
-
-
     @Override
-    public Optional<DeclarationNcPayloadWeb> getDeclarationNcById(Long id) {
+    public Optional<DeclarationNc> getDeclarationNcById(Long id) {
         if (declarationNcRepository.existsById(id)) {
-            return declarationNcRepository.findDeclarationNcToDto(id);
+            return declarationNcRepository.findById(id);
         } else {
             throw new NotFoundException("Impossible de trouver la nouvelle enquete de batiment spécifiée dans la base de données.");
         }
 
     }
-
-    @Override
-    public Page<DeclarationNcPayloadWeb> getDeclarationNcByPersonneList(Long personneId, Pageable pageable) {
-        return declarationNcRepository.findAllDeclarationNcByPersonneToDtoPageable(personneId,pageable);
-    }
-
-    @Override
-    public List<DeclarationNcPayloadWeb> getDeclarationNcByPersonneList(Long personneId) {
-        return declarationNcRepository.findAllDeclarationNcByPersonneToDto(personneId);
-    }
 }

src/main/java/io/gmss/fiscad/implementations/rfu/metier/DonneesImpositionTfuServiceImpl.java

@@ -4,12 +4,9 @@ import io.gmss.fiscad.entities.decoupage.Arrondissement;
 import io.gmss.fiscad.entities.rfu.metier.DonneesImpositionTfu;
 import io.gmss.fiscad.entities.rfu.metier.ImpositionsTfu;
 import io.gmss.fiscad.entities.rfu.parametre.BaremRfuNonBati;
-import io.gmss.fiscad.enums.StatusAvis;
 import io.gmss.fiscad.exceptions.BadRequestException;
 import io.gmss.fiscad.exceptions.NotFoundException;
 import io.gmss.fiscad.interfaces.rfu.metier.DonneesImpositionTfuService;
-import io.gmss.fiscad.paylaods.request.crudweb.DonneesImpositionPaylaodWeb;
-import io.gmss.fiscad.paylaods.request.crudweb.ImpositionsTfuPaylaodWeb;
 import io.gmss.fiscad.paylaods.response.DonneesImpositionTfuResponse;
 import io.gmss.fiscad.persistence.repositories.decoupage.ArrondissementRepository;
 import io.gmss.fiscad.persistence.repositories.infocad.metier.EnqueteRepository;
@@ -18,7 +15,6 @@ import io.gmss.fiscad.persistence.repositories.rfu.metier.DonneesImpositionTfuRe
 import io.gmss.fiscad.persistence.repositories.rfu.metier.ImpositionsTfuRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.BaremRfuNonBatiRepository;
 import io.gmss.fiscad.persistence.repositories.rfu.parametre.ExerciceRepository;
-import io.gmss.fiscad.service.EntityFromPayLoadService;
 import jakarta.transaction.Transactional;
 import lombok.AllArgsConstructor;
 import org.springframework.dao.DataIntegrityViolationException;
@@ -40,7 +36,6 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
     private final BaremRfuNonBatiRepository baremRfuNonBatiRepository;
     private final ExerciceRepository exerciceRepository;
     private final ArrondissementRepository arrondissementRepository;
-    private final EntityFromPayLoadService entityFromPayLoadService;
 
 
 
@@ -96,51 +91,91 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
 
     @Override
     @Transactional
-    public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleNonBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
+    public Long genererDonneesFiscales(ImpositionsTfu impositionsTfu) {
-        Integer nb= donneesImpositionTfuRepository.genererDonneesTfuNonBatie(impositionsTfuPaylaodWeb.getId(),userId);
+        List<DonneesImpositionTfuResponse> donneesImpositionTfuResponses= donneesImpositionTfuRepository.findAllDonneesImpositionTfu(impositionsTfu.getCommune().getId(),impositionsTfu.getExercice().getAnnee());
+        Long n=0l;
+        for (DonneesImpositionTfuResponse donneesImpositionTfuResponse: donneesImpositionTfuResponses){
+            DonneesImpositionTfu donneesImpositionTfu=new DonneesImpositionTfu();
+            donneesImpositionTfu.setImpositionsTfu(impositionsTfu);
+            donneesImpositionTfu.setZoneRfuId(donneesImpositionTfuResponse.getZoneRfuId());
+            donneesImpositionTfu.setCodeQuartierVillage(donneesImpositionTfuResponse.getCodeQuartierVillage());
+            donneesImpositionTfu.setNomQuartierVillage(donneesImpositionTfuResponse.getNomQuartierVillage());
+            donneesImpositionTfu.setCodeArrondissement(donneesImpositionTfuResponse.getCodeArrondissement());
+            donneesImpositionTfu.setNomArrondissement(donneesImpositionTfuResponse.getNomArrondissement());
+            donneesImpositionTfu.setCodeCommune(donneesImpositionTfuResponse.getCodeCommune());
+            donneesImpositionTfu.setNomCommune(donneesImpositionTfuResponse.getNomCommune());
+            donneesImpositionTfu.setCodeDepartement(donneesImpositionTfuResponse.getCodeDepartement());
+            donneesImpositionTfu.setNomDepartement(donneesImpositionTfuResponse.getNomDepartement());
+            donneesImpositionTfu.setQ(donneesImpositionTfuResponse.getQ());
+            donneesImpositionTfu.setIlot(donneesImpositionTfuResponse.getIlot());
+            donneesImpositionTfu.setParcelle(donneesImpositionTfuResponse.getParcelle());
+            donneesImpositionTfu.setLatitude(donneesImpositionTfuResponse.getLatitude());
+            donneesImpositionTfu.setLongitude(donneesImpositionTfuResponse.getLongitude());
+            donneesImpositionTfu.setNup(donneesImpositionTfuResponse.getNup());
+            donneesImpositionTfu.setNupProvisoire(donneesImpositionTfuResponse.getNupProvisoire());
+            donneesImpositionTfu.setSuperficieParc(donneesImpositionTfuResponse.getSuperficieParc());
+            donneesImpositionTfu.setAdresseProp(donneesImpositionTfuResponse.getAdresseProp());
+            donneesImpositionTfu.setAnnee(donneesImpositionTfuResponse.getAnnee());
+            donneesImpositionTfu.setAdresseSc(donneesImpositionTfuResponse.getAdresseSc());
+            donneesImpositionTfu.setBatieOuiNon(donneesImpositionTfuResponse.getBatieOuiNon());
+            donneesImpositionTfu.setTfuMinimum(donneesImpositionTfuResponse.getTfuMinimum());
+            donneesImpositionTfu.setCategorieBat(donneesImpositionTfuResponse.getCategorieBat());
+            donneesImpositionTfu.setDateEnquete(donneesImpositionTfuResponse.getDateEnquete());
+            donneesImpositionTfu.setEmailProp(donneesImpositionTfuResponse.getEmailProp());
+            donneesImpositionTfu.setEmailSc(donneesImpositionTfuResponse.getEmailSc());
+            donneesImpositionTfu.setMontantLoyerAnnuel(donneesImpositionTfuResponse.getMontantLoyerAnnuel());
+            donneesImpositionTfu.setEnqueteId(donneesImpositionTfuResponse.getEnqueteId());
+            donneesImpositionTfu.setExhonereOuiNon(donneesImpositionTfuResponse.getExhonereOuiNon());
+            donneesImpositionTfu.setIfu(donneesImpositionTfuResponse.getIfu());
+            donneesImpositionTfu.setNombreBat(donneesImpositionTfuResponse.getNombreBat());
+            donneesImpositionTfu.setNombrePiscine(donneesImpositionTfuResponse.getNombrePiscine());
+            donneesImpositionTfu.setNombreUlog(donneesImpositionTfuResponse.getNombreUlog());
+            donneesImpositionTfu.setNomProp(donneesImpositionTfuResponse.getNomProp());
+            donneesImpositionTfu.setNomSc(donneesImpositionTfuResponse.getNomSc());
+            donneesImpositionTfu.setNpi(donneesImpositionTfuResponse.getNpi());
+            donneesImpositionTfu.setNumBatiment(donneesImpositionTfuResponse.getNumBatiment()==null?"":donneesImpositionTfuResponse.getNumBatiment());
+            donneesImpositionTfu.setNumUniteLogement(donneesImpositionTfuResponse.getNumUniteLogement()==null?"":donneesImpositionTfuResponse.getNumUniteLogement());
+            donneesImpositionTfu.setPrenomProp(donneesImpositionTfuResponse.getPrenomProp());
+            donneesImpositionTfu.setPrenomSc(donneesImpositionTfuResponse.getPrenomSc());
+            donneesImpositionTfu.setRaisonSociale(donneesImpositionTfuResponse.getRaisonSociale());
+            donneesImpositionTfu.setSecteurId(donneesImpositionTfuResponse.getSecteurId());
+            donneesImpositionTfu.setStandingBat(donneesImpositionTfuResponse.getStandingBat());
+            donneesImpositionTfu.setStructureId(donneesImpositionTfuResponse.getStructureId());
+            donneesImpositionTfu.setSuperficieAuSolBat(donneesImpositionTfuResponse.getSuperficieAuSolBat());
+            donneesImpositionTfu.setSuperficieAuSolUlog(donneesImpositionTfuResponse.getSuperficieAuSolUlog());
+            donneesImpositionTfu.setTelProp(donneesImpositionTfuResponse.getTelProp());
+            donneesImpositionTfu.setTelSc(donneesImpositionTfuResponse.getTelSc());
+            donneesImpositionTfu.setTfuMetreCarre(donneesImpositionTfuResponse.getTfuMetreCarre());
+            donneesImpositionTfu.setTitreFoncier(donneesImpositionTfuResponse.getTitreFoncier());
+            donneesImpositionTfu.setValeurLocativeAdm(donneesImpositionTfuResponse.getValeurLocativeAdm());
+            donneesImpositionTfu.setBatimentExhonereOuiNon(donneesImpositionTfuResponse.getBatimentExhonereOuiNon());
+            donneesImpositionTfu.setUniteLogementExhonereOuiNon(donneesImpositionTfuResponse.getUniteLogementExhonereOuiNon());
+            try {
+                Optional<BaremRfuNonBati> baremRfuNonBatiOptional=baremRfuNonBatiRepository.findAllByCommune_IdAndZoneRfu_Id(impositionsTfu.getCommune().getId(),donneesImpositionTfu.getZoneRfuId());
+                 if(baremRfuNonBatiOptional.isPresent()){
+                     donneesImpositionTfu.setValeurAdministrativeParcelleNonBati(baremRfuNonBatiOptional.get().getValeurAdministrative());
+                     donneesImpositionTfu.setTauxParcelleNonBati(baremRfuNonBatiOptional.get().getTaux());
+                 }
 
-        ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.TFU_FNB_GENERE);
-
-        impositionsTfu.setNombreAvisFnb(nb);
 
+                donneesImpositionTfuRepository.save(donneesImpositionTfu);
+                n++;
+            }catch (DataIntegrityViolationException e) {
+                if (e.getCause() instanceof org.hibernate.exception.ConstraintViolationException constraintEx &&
+                        constraintEx.getSQLException().getSQLState().equals("23505")) {
+                    System.out.println("Doublon détecté (clé unique) !");
+                } else {
+                    throw e;
+                }
+            }
+        }
         impositionsTfuRepository.save(impositionsTfu);
-
+        return n;
-        return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
     }
 
     @Override
-    @Transactional
+    public List<DonneesImpositionTfu> getDonneesFiscalesByImposition(Long impositionsId) {
-    public ImpositionsTfuPaylaodWeb genererDonneesFiscalesParcelleBatie(ImpositionsTfuPaylaodWeb impositionsTfuPaylaodWeb, Long userId) {
+        return donneesImpositionTfuRepository.findAllByImpositionsTfu_Id(impositionsId);
-
-        Integer nbb= donneesImpositionTfuRepository.genererDonneesTfuBatie(impositionsTfuPaylaodWeb.getId(),userId);
-
-        Integer nbulo= donneesImpositionTfuRepository.genererDonneesTfuBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
-
-//        Integer nbirfbt= donneesImpositionTfuRepository.genererDonneesIrfBatie(impositionsTfuPaylaodWeb.getId(),userId);
-//
-//        Integer nbirfulo= donneesImpositionTfuRepository.genererDonneesIrfBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
-//
-//        Integer nbsrtbbt= donneesImpositionTfuRepository.genererDonneesSrtbBatie(impositionsTfuPaylaodWeb.getId(),userId);
-//
-//        Integer nbsrtbulo= donneesImpositionTfuRepository.genererDonneesSrtbBatieUniteLogement(impositionsTfuPaylaodWeb.getId(),userId);
-
-
-        ImpositionsTfu impositionsTfu = entityFromPayLoadService.getImpositionsTfuFromPayLoadWeb(impositionsTfuPaylaodWeb);
-        impositionsTfu.setStatusAvis(StatusAvis.GENERE);
-
-        impositionsTfu.setNombreAvis(nbb+nbulo+ (impositionsTfu.getNombreAvisFnb()==null?0:impositionsTfu.getNombreAvisFnb()));
-        impositionsTfu.setNombreAvisBatiment(nbb);
-        impositionsTfu.setNombreAvisUniteLog(nbulo);
-
-        impositionsTfuRepository.save(impositionsTfu);
-
-        return impositionsTfuRepository.findByIdToDto(impositionsTfu.getId()).orElse(null);
-    }
-
-    @Override
-    public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImposition(Long impositionsId) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuId(impositionsId);
     }
 
     @Override
@@ -152,59 +187,4 @@ public class DonneesImpositionTfuServiceImpl implements DonneesImpositionTfuServ
             return null;
         }
     }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdPageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdPageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdNonBatiePageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdNonBatiePageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieBatimentPageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionTfuIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByImpositionTfuIdBatieUniteLogPageable(impositionsTfuId,pageable);
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionIrfIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionIrfIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionSrtbIdBatieBatimentPageable(Long impositionsTfuId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByImpositionSrtbIdBatieUniteLogPageable(Long impositionsTfuId, Pageable pageable) {
-        return null;
-    }
-
-    @Override
-    public Page<DonneesImpositionPaylaodWeb> getDonneesFiscalesByExerciceAndStructureIdPageable(Long exerciceId, Long structureId, Pageable pageable) {
-        return donneesImpositionTfuRepository.findAllByExericeIdStructureIdPageable(exerciceId,structureId,pageable);
-    }
-
-    @Override
-    public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByExerciceAndStructureId(Long exerciceId, Long structureId,Long quartierId) {
-        return donneesImpositionTfuRepository.findAllByExericeIdStructureId(exerciceId,structureId,quartierId);
-    }
-
-    @Override
-    public List<DonneesImpositionPaylaodWeb> getDonneesFiscalesByPersonneId(Long personneId) {
-        return donneesImpositionTfuRepository.findAllByPersonneId(personneId);
-    }
 }