judaur2005/fiscad
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

features/crud_entites #70

Merged
judaur2005 merged 2 commits from features/crud_entites into develop 2026-01-13 20:33:18 +00:00
Conversation 0 Commits 2 Files Changed 174 +2460 -760
174 changed files with 2460 additions and 760 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
db-init/01-enable-postgis.sql
View File

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

2
src/main/java/io/gmss/fiscad/configuration/OpenApiConfig.java
View File

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

2
src/main/java/io/gmss/fiscad/controllers/decoupage/SecteurController.java
View File

@@ -4,7 +4,7 @@ import io.gmss.fiscad.entities.decoupage.Secteur;
import io.gmss.fiscad.exceptions.*;
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.SecteurPayload;
import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
import org.slf4j.Logger;

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

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

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

@@ -1,9 +1,13 @@
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.exceptions.*;
import io.gmss.fiscad.interfaces.infocad.metier.EnqueteService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad;
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
@@ -28,7 +32,7 @@ import java.util.List;
@SecurityRequirement(name = "bearer")
@Tag(name = "Enquête")
@CrossOrigin(origins = "*")
@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
//@PreAuthorize("hasRole('ADMIN') or hasRole('SUPERVISEUR') or hasRole('ENQUETEUR')")
public class EnqueteController {
private final EnqueteService enqueteService;
@@ -41,20 +45,51 @@ public class EnqueteController {
@PostMapping("/create")
public ResponseEntity<?> createStructure(@RequestBody @Valid @Validated EnquetePayLoad enquetePayLoad) {
// try{
// enquete = enqueteService.createEnquete(enquete);
// return new ResponseEntity<>(
// new ApiResponse<>(true, structure, "Structure créé avec succès."),
// HttpStatus.OK
// );
// }catch (Exception e){
// return new ResponseEntity<>(
// new ApiResponse<>(false, e.getMessage()),
// HttpStatus.OK
// );
// }
return null;
public ResponseEntity<?> createEnquete(@RequestBody @Valid @Validated EnquetePayLoadWeb enquetePayLoadWeb) {
try {
Enquete enquete = enqueteService.createEnquete(enquetePayLoadWeb);
return new ResponseEntity<>(
new ApiResponse<>(true, enquete, "Enquete batiment créé avec succès."),
HttpStatus.OK
);
} catch (HttpClientErrorException.MethodNotAllowed e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
FileStorageException e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
} catch (NullPointerException e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
} catch (Exception e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
}
}
@PutMapping("/update/{id}")
public ResponseEntity<?> updateEnquete(@PathVariable Long id, @RequestBody EnquetePayLoadWeb enquetePayLoadWeb) {
try {
return new ResponseEntity<>(
new ApiResponse<>(true, enqueteService.updateEnquete(id,enquetePayLoadWeb), "Enquete batiment mise à jour avec succès."),
HttpStatus.OK
);
} catch (HttpClientErrorException.MethodNotAllowed e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "Method POST/GET is required."), HttpStatus.OK);
} catch (NotFoundException | BadRequestException | MyFileNotFoundException | ResourceNotFoundException |
FileStorageException e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, e.getMessage()), HttpStatus.OK);
} catch (NullPointerException e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "Null value has been detected {" + e.getMessage() + "}."), HttpStatus.OK);
} catch (Exception e) {
logger.error(e.getLocalizedMessage());
return new ResponseEntity<>(new ApiResponse(false, null, "An error has been occur and the content is {" + e.getMessage() + "}."), HttpStatus.OK);
}
}
@PutMapping("/validation")

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

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

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

@@ -5,6 +5,7 @@ import io.gmss.fiscad.entities.rfu.metier.Batiment;
import io.gmss.fiscad.exceptions.*;
import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -36,9 +37,9 @@ public class BatimentController {
}
@PostMapping("/create")
public ResponseEntity<?> createBatiment(@RequestBody @Valid @Validated Batiment batiment) {
public ResponseEntity<?> createBatiment(@RequestBody @Valid @Validated BatimentPaylaodWeb batimentPaylaodWeb) {
try {
batiment = batimentService.createBatiment(batiment);
Batiment batiment = batimentService.createBatiment(batimentPaylaodWeb);
return new ResponseEntity<>(
new ApiResponse<>(true, batiment, "Batiment créé avec succès."),
HttpStatus.OK
@@ -60,10 +61,10 @@ public class BatimentController {
}
@PutMapping("/update/{id}")
public ResponseEntity<?> updateBatiment(@PathVariable Long id, @RequestBody Batiment batiment) {
public ResponseEntity<?> updateBatiment(@PathVariable Long id, @RequestBody BatimentPaylaodWeb batimentPaylaodWeb) {
try {
return new ResponseEntity<>(
new ApiResponse<>(true, batimentService.updateBatiment(id, batiment), "Batiment mise à jour avec succès."),
new ApiResponse<>(true, batimentService.updateBatiment(id,batimentPaylaodWeb), "Batiment mise à jour avec succès."),
HttpStatus.OK
);
} catch (HttpClientErrorException.MethodNotAllowed e) {

179
src/main/java/io/gmss/fiscad/controllers/rfu/metier/EnqueteActiviteController.java Normal file
View File

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

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

@@ -5,6 +5,7 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.fiscad.exceptions.*;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -35,9 +36,9 @@ public class EnqueteBatimentController {
}
@PostMapping("/create")
public ResponseEntity<?> createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatiment enqueteBatiment) {
public ResponseEntity<?> createEnqueteBatiment(@RequestBody @Valid @Validated EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
try {
enqueteBatiment = enqueteBatimentService.createEnqueteBatiment(enqueteBatiment);
EnqueteBatiment enqueteBatiment = enqueteBatimentService.createEnqueteBatiment(enqueteBatimentPayloadWeb);
return new ResponseEntity<>(
new ApiResponse<>(true, enqueteBatiment, "Enquete batiment créé avec succès."),
HttpStatus.OK
@@ -59,10 +60,10 @@ public class EnqueteBatimentController {
}
@PutMapping("/update/{id}")
public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatiment enqueteBatiment) {
public ResponseEntity<?> updateEnqueteBatiment(@PathVariable Long id, @RequestBody EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) {
try {
return new ResponseEntity<>(
new ApiResponse<>(true, enqueteBatimentService.updateEnqueteBatiment(id, enqueteBatiment), "Enquete batiment mise à jour avec succès."),
new ApiResponse<>(true, enqueteBatimentService.updateEnqueteBatiment(id, enqueteBatimentPayloadWeb), "Enquete batiment mise à jour avec succès."),
HttpStatus.OK
);
} catch (HttpClientErrorException.MethodNotAllowed e) {

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

@@ -5,6 +5,7 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.fiscad.exceptions.*;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
import io.gmss.fiscad.paylaods.ApiResponse;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
import io.swagger.v3.oas.annotations.security.SecurityRequirement;
import io.swagger.v3.oas.annotations.tags.Tag;
import jakarta.validation.Valid;
@@ -35,9 +36,9 @@ public class EnqueteUniteLogementController {
}
@PostMapping("/create")
public ResponseEntity<?> createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogement enqueteUniteLogement) {
public ResponseEntity<?> createEnqueteUniteLogement(@RequestBody @Valid @Validated EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
try {
enqueteUniteLogement = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogement);
EnqueteUniteLogement enqueteUniteLogement = enqueteUniteLogementService.createEnqueteUniteLogement(enqueteUniteLogementPayloadWeb);
return new ResponseEntity<>(
new ApiResponse<>(true, enqueteUniteLogement, "Enquete unite logement créé avec succès."),
HttpStatus.OK
@@ -59,10 +60,10 @@ public class EnqueteUniteLogementController {
}
@PutMapping("/update/{id}")
public ResponseEntity<?> updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogement enqueteUniteLogement) {
public ResponseEntity<?> updateEnqueteUniteLogement(@PathVariable Long id, @RequestBody EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) {
try {
return new ResponseEntity<>(
new ApiResponse<>(true, enqueteUniteLogementService.updateEnqueteUniteLogement(id, enqueteUniteLogement), "Enquete unite logement mise à jour avec succès."),
new ApiResponse<>(true, enqueteUniteLogementService.updateEnqueteUniteLogement(id, enqueteUniteLogementPayloadWeb), "Enquete unite logement mise à jour avec succès."),
HttpStatus.OK
);
} catch (HttpClientErrorException.MethodNotAllowed e) {

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

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

15
src/main/java/io/gmss/fiscad/controllers/synchronisation/SynchronisationController.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/BaseEntity.java
View File

@@ -23,7 +23,7 @@ public class BaseEntity implements Serializable {
@CreatedDate
@JsonIgnore
private Instant createdAt;
private Instant createdAt ;
@LastModifiedDate
@JsonIgnore
private Instant updatedAt;

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

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

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

@@ -17,16 +17,13 @@ import io.gmss.fiscad.entities.rfu.parametre.Campagne;
import io.gmss.fiscad.entities.rfu.parametre.Equipe;
import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.StatusEnquete;
import io.gmss.fiscad.enums.StatutEnquete;
import io.gmss.fiscad.enums.StatutEnregistrement;
import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
import jakarta.persistence.*;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.EqualsAndHashCode;
import lombok.NoArgsConstructor;
import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import java.io.Serializable;
import java.time.LocalDate;
@@ -68,7 +65,7 @@ public class Enquete extends BaseEntity implements Serializable {
@OneToMany(mappedBy = "enquete")
private List<ActeurConcerne> acteurConcernes;
@JsonIgnore
//@JsonIgnore
@ManyToOne
private Parcelle parcelle;
@@ -86,7 +83,7 @@ public class Enquete extends BaseEntity implements Serializable {
@ManyToOne
private Equipe equipe;
@JsonIgnore
// @JsonIgnore
@ManyToOne
@JoinColumn(name = "proprietaire_id")
private Personne personne ;
@@ -97,7 +94,7 @@ public class Enquete extends BaseEntity implements Serializable {
private String autreNumeroTitreFoncier;
private Long personneId;
@Enumerated(EnumType.STRING)
private StatusEnquete statusEnquete;
private StatutEnquete statutEnquete;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateValidation;
@@ -164,9 +161,13 @@ public class Enquete extends BaseEntity implements Serializable {
private int nbreCoProprietaire;
private int nbreIndivisiaire;
private String autreAdresse;
private String surface;
private float superficie ;
private int nbreBatiment;
private int nbrePiscine;
private Long montantMensuelleLocation;
private Long montantAnnuelleLocation;
private Long valeurParcelleEstime;
private Long valeurParcelleReel;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
@@ -178,9 +179,11 @@ public class Enquete extends BaseEntity implements Serializable {
@JsonIgnore
@OneToMany(mappedBy = "enquete")
@JsonManagedReference
private List<EnqueteUniteLogement> enqueteUniteLogements;
@JsonIgnore
@JsonManagedReference
@OneToMany(mappedBy = "enquete")
private List<EnqueteBatiment> enqueteBatiments;
@@ -188,8 +191,8 @@ public class Enquete extends BaseEntity implements Serializable {
@OneToMany(mappedBy = "enquete")
private List<CaracteristiqueParcelle> caracteristiqueParcelles;
@Enumerated(EnumType.STRING)
private StatutEnregistrement statutEnregistrement;
//@Enumerated(EnumType.STRING)
//private StatutEnregistrement statutEnregistrement;
public Long getTerminalId() {
@@ -220,7 +223,7 @@ public class Enquete extends BaseEntity implements Serializable {
public String getDepartement() {
if (this.bloc != null) {
Arrondissement arrondissement = this.bloc.getArrondissement();
if (arrondissement != null) {
if (arrondissement != null && arrondissement.getCommune()!=null && arrondissement.getCommune().getDepartement()!=null) {
return arrondissement.getCommune().getDepartement().getNom();
} else return "";
} else return "";
@@ -229,7 +232,7 @@ public class Enquete extends BaseEntity implements Serializable {
public String getCommune() {
if (this.bloc != null) {
Arrondissement arrondissement = this.bloc.getArrondissement();
if (arrondissement != null) {
if (arrondissement != null && arrondissement.getCommune()!=null) {
return arrondissement.getCommune().getNom();
} else return "";
} else return "";
@@ -247,7 +250,7 @@ public class Enquete extends BaseEntity implements Serializable {
public String getTypeDomaine() {
if (this.parcelle != null) {
NatureDomaine natureDomaine = this.parcelle.getNatureDomaine();
if (natureDomaine != null) {
if (natureDomaine != null && natureDomaine.getTypeDomaine()!=null ) {
return natureDomaine.getTypeDomaine().getLibelle();
} else return "";
} else return "";
@@ -260,7 +263,7 @@ public class Enquete extends BaseEntity implements Serializable {
}
public String getStructureEnqueteur() {
if (this.user != null) {
if (this.user != null && this.user.getStructure()!=null) {
return this.user.getStructure().getNom();
} else return "";
}

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

@@ -25,7 +25,6 @@ import java.util.List;
// "WHERE id = ?")
//@Where(clause = " deleted = false")
public class Parcelle extends BaseEntity implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@@ -36,9 +35,10 @@ public class Parcelle extends BaseEntity implements Serializable {
private String numeroParcelle;
private String longitude;
private String latitude;
private String altitude;
private String situationGeographique;
@ColumnDefault("0")
private int superficie;
@ColumnDefault("0.0")
private float superficie;
@ManyToOne
private NatureDomaine natureDomaine;
@JsonIgnore
@@ -52,7 +52,6 @@ public class Parcelle extends BaseEntity implements Serializable {
@ManyToOne
private Tpe terminal;
private String autreNumeroTitreFoncier;
private Long typeDomaineId;
private Long numeroProvisoire;
private Long blocId;
@@ -60,6 +59,9 @@ public class Parcelle extends BaseEntity implements Serializable {
private boolean synchronise;
private Long idDerniereEnquete;
private Long mobileDataId;
private String numEnterParcelle;
@ManyToOne
private Rue rue ;
// @JsonIgnore
// @OneToMany(mappedBy = "parcelle")
// private List<Batiment> batiments;

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

@@ -44,6 +44,10 @@ public class Piece extends BaseEntity implements Serializable {
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateExpiration;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateEtablissement;
@ManyToOne
private TypePiece typePiece;
private Long mobileDataId;
@@ -52,15 +56,21 @@ public class Piece extends BaseEntity implements Serializable {
private Personne personne;
private Long personneExternalKey;
@JsonIgnore
@JsonBackReference
@ManyToOne(fetch = FetchType.LAZY)
private ActeurConcerne acteurConcerne;
private Long acteurConcerneExternalKey;
// @JsonIgnore
// @JsonBackReference
// @ManyToOne(fetch = FetchType.LAZY)
// private ActeurConcerne acteurConcerne;
// private Long acteurConcerneExternalKey;
@ManyToOne
private SourceDroit sourceDroit;
@JsonIgnore
@JsonBackReference
@ManyToOne(fetch = FetchType.LAZY)
private Enquete enquete ;
@ManyToOne
private ModeAcquisition modeAcquisition;
@@ -75,7 +85,7 @@ public class Piece extends BaseEntity implements Serializable {
private Long max_numero_piece_id;
private Long max_numero_acteur_concerne_id;
private Long enqueteId;
//private Long enqueteId;
private Long blocId;
@ColumnDefault("false")
private boolean synchronise;

30
src/main/java/io/gmss/fiscad/entities/infocad/metier/Rue.java Normal file
View File

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

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

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

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

@@ -20,6 +20,8 @@ import org.hibernate.annotations.SQLDelete;
import org.hibernate.annotations.Where;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.ArrayList;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@@ -38,11 +40,12 @@ public class Personne extends BaseEntity implements Serializable {
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private String ifu;
private String nomOuSigle;
private String prenomOuRaisonSociale;
private String nom;
private String prenom;
private String raisonSociale;
private String numRavip;
private String npi;
private String dateNaissanceOuConsti;
private LocalDate dateNaissanceOuConsti;
private String lieuNaissance;
private String tel1;
private String tel2;
@@ -87,10 +90,11 @@ public class Personne extends BaseEntity implements Serializable {
private Long mobileDataId;
public List<Upload> getUploads() {
return uploads.stream().filter(upload -> upload.getPiece() == null && upload.getMembreGroupe() == null).toList();
return uploads==null ? new ArrayList<>():uploads.stream().filter(upload -> upload.getPiece() == null && upload.getMembreGroupe() == null).toList();
}
public List<Piece> getPieces() {
return pieces.stream().filter(piece -> piece.getActeurConcerne() == null).toList();
return pieces==null ? new ArrayList<>():pieces.stream().filter(piece -> piece.getPersonne() != null).toList();
}
}

37
src/main/java/io/gmss/fiscad/entities/infocad/parametre/TypeRue.java Normal file
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataActeurConcerne.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataBatiment.java
View File

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

4
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueBatiment.java
View File

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

4
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueParcelle.java
View File

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

4
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataCaracteristiqueUniteLogement.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataDeclarationNc.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnquete.java
View File

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

4
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteActivite.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteBatiment.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataEnqueteUniteLogement.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataMembreGroupe.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelle.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataParcelleTest.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPersonne.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataPiece.java
View File

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

4
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUniteLogement.java
View File

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

2
src/main/java/io/gmss/fiscad/entities/metadata/MobileDataUpload.java
View File

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

4
src/main/java/io/gmss/fiscad/entities/rfu/metier/Batiment.java
View File

@@ -25,7 +25,6 @@ import java.util.List;
@AllArgsConstructor
@Where(clause = " deleted = false")
public class Batiment extends BaseEntity implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@@ -35,10 +34,13 @@ public class Batiment extends BaseEntity implements Serializable {
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateConstruction;
private Long idDerniereEnquete;
@JsonIgnore
@ManyToOne
private Parcelle parcelle;
private Long parcelleExternalKey;
@JsonIgnore
@ManyToOne
private Tpe terminal;

1
src/main/java/io/gmss/fiscad/entities/rfu/metier/CaracteristiqueBatiment.java
View File

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

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

@@ -30,13 +30,17 @@ public class CaracteristiqueUniteLogement extends BaseEntity implements Serializ
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private EnqueteUniteLogement enqueteUniteLogement;
private Long enqueteUniteLogementExternalKey;
@ManyToOne
private Caracteristique caracteristique;
private String valeur;
private String observation;
@JsonIgnore
@ManyToOne
private Tpe terminal;

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

@@ -57,6 +57,7 @@ public class EnqueteActivite extends BaseEntity implements Serializable {
private String NumeroRccm;
@OneToOne
private Personne personne;
private Long personneExternalKey;
@ManyToOne

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

@@ -53,7 +53,10 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
private float surfaceLouee;
private int nbreMenage;
private int nbreHabitant;
private float valeurMensuelleLocation;
private Long montantMensuelLocation;
private Long montantLocatifAnnuelDeclare;
private Long valeurBatimentEstime;
private Long valeurBatimentReel;
private int nbreMoisLocation;
private String autreCaracteristiquePhysique;
@JsonFormat(pattern = "dd-MM-yyyy")
@@ -62,20 +65,30 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateFinExcemption;
@OneToOne
private Personne personne;
private Long personneExternalKey;
//@JsonIgnore
@ManyToOne
private Batiment batiment;
private Long batimentExternalKey;
private Personne personne;
private Long personneExternalKey;
@JsonIgnore
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Batiment batiment;
private Long batimentExternalKey;
private Long nbreEtage;
// @JsonIgnore
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Enquete enquete;
@JsonManagedReference ///pour couper la récurcivité
@OneToMany(mappedBy = "enqueteBatiment")
@JsonManagedReference ///pour couper la récurcivité
private List<CaracteristiqueBatiment> caracteristiqueBatiments;
@JsonIgnore
@@ -89,7 +102,7 @@ public class EnqueteBatiment extends BaseEntity implements Serializable {
@OneToMany(mappedBy = "enqueteBatiment")
private List<Upload> uploads;
@Enumerated(EnumType.STRING)
@JsonIgnore
private StatutEnregistrement statutEnregistrement;
//@Enumerated(EnumType.STRING)
//@JsonIgnore
//private StatutEnregistrement statutEnregistrement;
}

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

@@ -1,5 +1,6 @@
package io.gmss.fiscad.entities.rfu.metier;
import com.fasterxml.jackson.annotation.JsonBackReference;
import com.fasterxml.jackson.annotation.JsonFormat;
import com.fasterxml.jackson.annotation.JsonIgnore;
import com.fasterxml.jackson.annotation.JsonManagedReference;
@@ -40,15 +41,17 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private Long id;
private float surface;
private int nbrePiece;
private int nbreHabitant;
private int nbreMenage;
private boolean enLocation;
private float montantMensuelLoyer;
private int nbreMoisEnLocation;
private int nbreMoisLocation;
private float montantLocatifAnnuelDeclare;
private Long valeurUniteLogementEstime;
private Long valeurUniteLogementReel;
private float surfaceLouee;
private float SurfaceAuSol;
private boolean sbee;
private boolean soneb;
private String numCompteurSbee;
@@ -59,16 +62,25 @@ public class EnqueteUniteLogement extends BaseEntity implements Serializable {
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateFinExcemption;
@JsonIgnore
@ManyToOne
@ManyToOne(fetch = FetchType.LAZY)
@JsonBackReference
private Enquete enquete;
@ManyToOne
private UniteLogement uniteLogement;
private Long uniteLogementExternalKey;
@OneToOne
private Personne personne;
private Long personneExternalKey;
private Long mobileDataId;
@OneToMany(mappedBy = "enqueteUniteLogement")
@JsonManagedReference
private List<CaracteristiqueUniteLogement> caracteristiqueUniteLogements;

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

@@ -1,6 +1,9 @@
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.Tpe;
import jakarta.persistence.*;
@@ -11,6 +14,7 @@ import lombok.NoArgsConstructor;
import org.hibernate.annotations.Where;
import java.io.Serializable;
import java.time.LocalDate;
import java.util.List;
@EqualsAndHashCode(callSuper = true)
@@ -27,6 +31,9 @@ public class UniteLogement extends BaseEntity implements Serializable {
private String nul;
private String numeroEtage;
private String code;
@JsonFormat(pattern = "dd-MM-yyyy")
@JsonDeserialize(using = LocalDateDeserializer.class)
private LocalDate dateConstruction;
@JsonIgnore
@OneToMany(mappedBy = "uniteLogement")
private List<EnqueteUniteLogement> enqueteUniteLogements;

1
src/main/java/io/gmss/fiscad/entities/rfu/parametre/Caracteristique.java
View File

@@ -39,6 +39,7 @@ public class Caracteristique extends BaseEntity implements Serializable {
private Tpe terminal;
@ManyToOne
private CategorieBatiment categorieBatiment;
@ManyToOne(fetch = FetchType.LAZY)
private Arrondissement arrondissement;
}

1
src/main/java/io/gmss/fiscad/entities/user/User.java
View File

@@ -52,6 +52,7 @@ public class User extends BaseEntity implements Serializable {
inverseJoinColumns = @JoinColumn(name = "roles_id")
)
private Set<Role> roles;
@ManyToOne
private Structure structure;
// @JsonIgnore

3
src/main/java/io/gmss/fiscad/enums/StatusEnquete.java → src/main/java/io/gmss/fiscad/enums/StatutEnquete.java
View File

@@ -1,10 +1,9 @@
package io.gmss.fiscad.enums;
public enum StatusEnquete {
public enum StatutEnquete {
EN_COURS,
FINALISE,
REJETE,
VALIDE,
//SYNCHRONISE
ECHEC
}

7
src/main/java/io/gmss/fiscad/enums/StatutEnregistrement.java
View File

@@ -1,6 +1,9 @@
package io.gmss.fiscad.enums;
public enum StatutEnregistrement {
NOUVELLE_INSERTION,
MISE_A_JOUR
SAISIE_EN_COURS,
SAISIE,
VALIDATION_EN_COURS,
VALIDE,
REJETE
}

11
src/main/java/io/gmss/fiscad/exceptions/ApplicationException.java Executable file
View File

@@ -0,0 +1,11 @@
package io.gmss.fiscad.exceptions;
import org.springframework.http.HttpStatus;
import org.springframework.web.bind.annotation.ResponseStatus;
@ResponseStatus(HttpStatus.NOT_ACCEPTABLE)
public class ApplicationException extends RuntimeException {
public ApplicationException(String message) {
super(message);
}
}

4
src/main/java/io/gmss/fiscad/implementations/decoupage/SecteurServiceImpl.java
View File

@@ -7,8 +7,8 @@ import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.decoupage.SecteurService;
import io.gmss.fiscad.paylaods.request.SecteurDecoupagePayload;
import io.gmss.fiscad.paylaods.request.SecteurPayload;
import io.gmss.fiscad.paylaods.request.synchronisation.SecteurDecoupagePayload;
import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload;
import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository;
import io.gmss.fiscad.repositories.decoupage.QuartierRepository;
import io.gmss.fiscad.repositories.decoupage.SecteurRepository;

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

@@ -1,36 +1,47 @@
package io.gmss.fiscad.implementations.infocad.metier;
import io.gmss.fiscad.entities.infocad.metier.ActeurConcerne;
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.*;
import io.gmss.fiscad.entities.infocad.parametre.Bloc;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
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 io.gmss.fiscad.entities.rfu.parametre.Equipe;
import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.StatusEnquete;
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.infocad.metier.EnqueteService;
import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueParcelleService;
import io.gmss.fiscad.interfaces.rfu.metier.DeclarationNcService;
import io.gmss.fiscad.interfaces.rfu.parametre.CaracteristiqueService;
import io.gmss.fiscad.interfaces.user.UserService;
import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
//import io.gmss.fiscad.paylaods.request.synchronisation.EnquetePayLoad ;
//import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb ;
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
import io.gmss.fiscad.paylaods.response.*;
import io.gmss.fiscad.paylaods.response.FicheResponse.*;
import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
import io.gmss.fiscad.paylaods.response.* ;
import io.gmss.fiscad.paylaods.response.FicheResponse.* ;
import io.gmss.fiscad.repositories.decoupage.ArrondissementRepository;
import io.gmss.fiscad.repositories.decoupage.CommuneRepository;
import io.gmss.fiscad.repositories.decoupage.SecteurRepository;
import io.gmss.fiscad.repositories.infocad.metier.ActeurConcerneRepository;
import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository;
import io.gmss.fiscad.repositories.infocad.metier.*;
import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
import io.gmss.fiscad.repositories.infocad.parametre.StructureRepository;
import io.gmss.fiscad.repositories.rfu.metier.CaracteristiqueParcelleRepository;
import io.gmss.fiscad.repositories.rfu.metier.EnqueteBatimentRepository;
import io.gmss.fiscad.repositories.rfu.metier.EnqueteUniteLogementRepository;
import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository;
import io.gmss.fiscad.repositories.rfu.parametre.EquipeRepository;
import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository;
import io.gmss.fiscad.repositories.user.UserRepository;
import io.gmss.fiscad.service.EntityFromPayLoadService;
import jakarta.persistence.EntityManager;
import jakarta.persistence.PersistenceContext;
import jakarta.persistence.Query;
@@ -65,36 +76,209 @@ public class EnqueteServiceImpl implements EnqueteService {
private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
private final SecteurRepository secteurRepository;
private final StructureRepository structureRepository;
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 ;
@PersistenceContext
private final EntityManager em;
@Override
public Enquete createEnquete(EnquetePayLoad enquetePayLoad) throws BadRequestException {
Optional<User> optionalUser = userRepository.findById(enquetePayLoad.getUserId());
public Enquete createEnquete(EnquetePayLoadWeb enquetePayLoadWeb) throws BadRequestException {
Parcelle parcelle=new Parcelle();
Long rueId;
Optional<User> optionalUser = userRepository.findById(enquetePayLoadWeb.getEnqueteurId());
if (!optionalUser.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une enquête avec un enquêteur inexistant");
throw new BadRequestException("Echec de l'enregistrement : Enquêteur inexistant");
}
Optional<Bloc> optionalBloc = blocRepository.findById(enquetePayLoad.getBlocId());
if (!optionalBloc.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une enquête avec un bloc inexistant");
Optional<Personne> optionalProprietaire = personneRepository.findById(enquetePayLoadWeb.getProprietaireId());
if (!optionalProprietaire.isPresent()) {
throw new BadRequestException("Echec de l'enregistrement : Propriétaire inexistant");
}
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoad.getParcelleId());
if (!optionalParcelle.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante");
Optional<ZoneRfu> optionalZoneRfu = zoneRfuRepository.findById(enquetePayLoadWeb.getZoneRfuId());
if (!optionalZoneRfu.isPresent()) {
throw new BadRequestException("Echec de l'enregistrement : zone inexistante");
}
if(enquetePayLoadWeb.getZoneRfuId()!=null) {
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){
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.setBloc(optionalBloc.get());
enquete.setUser(optionalUser.get());
enquete.setParcelle(optionalParcelle.get());
enquete.setLitige(enquetePayLoad.isLitige());
enquete.setStatusEnquete(StatusEnquete.EN_COURS);
enquete.setObservationParticuliere(enquetePayLoad.getObservationParticuliere());
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.setNumEnterParcelle(enquetePayLoadWeb.getNumEnterParcelle());
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;
}
@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");
}
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());
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.setNumEnterParcelle(enquetePayLoadWeb.getNumEnterParcelle());
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);
}
@Override
public List<EnqueteResponse> getEnqueteCommuneArrondBloc() {
return enqueteRepository.getEnqueteComArrondBloc();
@@ -196,36 +380,6 @@ public class EnqueteServiceImpl implements EnqueteService {
return enqueteFiltreResponses;
}
@Override
public Enquete updateEnquete(EnquetePayLoad enquetePayLoad) throws NotFoundException {
if (enquetePayLoad.getIdBackend() == null) {
throw new BadRequestException("Impossible de mettre à jour une enquête ayant un id null.");
}
if (!enqueteRepository.existsById(enquetePayLoad.getIdBackend())) {
throw new NotFoundException("Impossible de trouver l'enquête que vous désirez modifier.");
}
Optional<User> optionalUser = userRepository.findById(enquetePayLoad.getUserId());
if (!optionalUser.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une enquête avec un enquêteur inexistant");
}
Optional<Bloc> optionalBloc = blocRepository.findById(enquetePayLoad.getBlocId());
if (!optionalBloc.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une enquête avec un bloc inexistant");
}
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(enquetePayLoad.getParcelleId());
if (!optionalParcelle.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une enquête avec une parcelle inexistante");
}
Enquete enquete = enqueteRepository.findById(enquetePayLoad.getParcelleId()).get();
enquete.setBloc(optionalBloc.get());
enquete.setUser(optionalUser.get());
enquete.setParcelle(optionalParcelle.get());
enquete.setLitige(enquetePayLoad.isLitige());
enquete.setDateFinalisation(enquetePayLoad.getDateFinalisation());
enquete.setStatusEnquete(enquetePayLoad.getStatusEnquete());
enquete.setObservationParticuliere(enquetePayLoad.getObservationParticuliere());
return enqueteRepository.save(enquete);
}
@Override
public void deleteEnquete(Long id) throws NotFoundException {
@@ -267,7 +421,7 @@ public class EnqueteServiceImpl implements EnqueteService {
}
Enquete enquete = optionalEnquete.get();
enquete.setDateValidation(LocalDate.now());
enquete.setStatusEnquete(StatusEnquete.VALIDE);
enquete.setStatutEnquete(StatutEnquete.VALIDE);
enquete.setSynchronise(false);
return enqueteRepository.save(enquete);
}
@@ -284,7 +438,7 @@ public class EnqueteServiceImpl implements EnqueteService {
Enquete enquete = optionalEnquete.get();
enquete.setDateRejet(LocalDate.now());
enquete.setDescriptionMotifRejet(enqueteTraitementPayLoad.getMotifRejet());
enquete.setStatusEnquete(StatusEnquete.REJETE);
enquete.setStatutEnquete(StatutEnquete.REJETE);
enquete.setSynchronise(false);
return enqueteRepository.save(enquete);
}
@@ -325,7 +479,7 @@ public class EnqueteServiceImpl implements EnqueteService {
throw new NotFoundException("Impossible de trouver l'enquête que vous désirez finaliser.");
}
optionalEnquete.get().setDateFinalisation(LocalDate.now());
optionalEnquete.get().setStatusEnquete(StatusEnquete.FINALISE);
optionalEnquete.get().setStatutEnquete(StatutEnquete.FINALISE);
return enqueteRepository.save(optionalEnquete.get());
}
@@ -340,7 +494,7 @@ public class EnqueteServiceImpl implements EnqueteService {
}
optionalEnquete.get().setDateLitigeResolu(LocalDate.now());
optionalEnquete.get().setLitige(false);
optionalEnquete.get().setStatusEnquete(StatusEnquete.EN_COURS);
optionalEnquete.get().setStatutEnquete(StatutEnquete.EN_COURS);
return enqueteRepository.save(optionalEnquete.get());
}

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

@@ -11,7 +11,7 @@ import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService;
import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService;
import io.gmss.fiscad.paylaods.request.UploadPayLoad;
import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad;
import io.gmss.fiscad.paylaods.response.EnqueteCheckResponse;
import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
import io.gmss.fiscad.repositories.infocad.metier.ParcelleGeomRepository;

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

@@ -2,84 +2,84 @@ package io.gmss.fiscad.implementations.infocad.metier;
import io.gmss.fiscad.entities.decoupage.Quartier;
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.SituationGeographique;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.infocad.metier.ParcelleService;
import io.gmss.fiscad.paylaods.request.ParcellePayLoad;
import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb;
import io.gmss.fiscad.repositories.decoupage.QuartierRepository;
import io.gmss.fiscad.repositories.infocad.metier.ParcelleRepository;
import io.gmss.fiscad.repositories.infocad.metier.RueRepository;
import io.gmss.fiscad.repositories.infocad.parametre.NatureDomaineRepository;
import io.gmss.fiscad.repositories.infocad.parametre.SituationGeographiqueRepository;
import io.gmss.fiscad.service.GeometryService;
import lombok.AllArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
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;
@Service
@AllArgsConstructor
public class ParcelleServiceImpl implements ParcelleService {
private final NatureDomaineRepository natureDomaineRepository;
private final QuartierRepository quartierRepository;
private final SituationGeographiqueRepository situationGeographiqueRepository;
private final ParcelleRepository parcelleRepository;
private final RueRepository rueRepository;
private final GeometryService geometryService;
@Value("${infocad.geom.srid}")
private String defaultSrid32631;
@Value("${infocad.geom.sridfixe}")
private String defaultSrid;
// @Value("${infocad.geom.srid}")
// private String defaultSrid32631;
// @Value("${infocad.geom.sridfixe}")
// private String defaultSrid;
public ParcelleServiceImpl(NatureDomaineRepository natureDomaineRepository, QuartierRepository quartierRepository, SituationGeographiqueRepository situationGeographiqueRepository, ParcelleRepository parcelleRepository, GeometryService geometryService) {
this.natureDomaineRepository = natureDomaineRepository;
this.quartierRepository = quartierRepository;
this.situationGeographiqueRepository = situationGeographiqueRepository;
this.parcelleRepository = parcelleRepository;
this.geometryService = geometryService;
}
@Override
public Parcelle createParcelle(ParcellePayLoad parcellePayLoad) throws BadRequestException {
Optional<NatureDomaine> optionalNatureDomaine = natureDomaineRepository.findById(parcellePayLoad.getNatureDomaineId());
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");
}
Optional<Quartier> optionalQuartier = quartierRepository.findById(parcellePayLoad.getQuartierId());
Optional<Quartier> optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId());
if (!optionalQuartier.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
}
Optional<SituationGeographique> optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoad.getSituationGeographiqueId());
if (!optionalSituationGeographique.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant");
}
Parcelle parcelle = getParcelle(parcellePayLoad, optionalSituationGeographique, optionalNatureDomaine);
Parcelle parcelle = new Parcelle();
parcelle.setNatureDomaine(optionalNatureDomaine.orElse(null));
parcelle.setQuartier(optionalQuartier.orElse(null));
parcelle = getParcelleFromPayload(parcelle, parcellePayLoadWeb);
return parcelleRepository.save(parcelle);
}
@Override
public Parcelle updateParcelle(ParcellePayLoad parcellePayLoad) throws NotFoundException {
Optional<Parcelle> optionalParcelle = parcelleRepository.findById(parcellePayLoad.getIdBackend());
public Parcelle updateParcelle(Long id, ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException {
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(parcellePayLoad.getNatureDomaineId());
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(parcellePayLoad.getQuartierId());
Optional<Quartier> optionalQuartier = quartierRepository.findById(parcellePayLoadWeb.getQuartierId());
if (!optionalQuartier.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une parcelle avec un quartier/village inexistant");
}
Optional<SituationGeographique> optionalSituationGeographique = situationGeographiqueRepository.findById(parcellePayLoad.getSituationGeographiqueId());
if (!optionalSituationGeographique.isPresent()) {
throw new BadRequestException("Impossible d'enregistrer une parcelle avec une situation géographique inexistant");
}
Parcelle parcelle = getParcelle(optionalParcelle.get(), parcellePayLoad, optionalSituationGeographique, optionalNatureDomaine);
// 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);
}
@@ -112,74 +112,60 @@ public class ParcelleServiceImpl implements ParcelleService {
}
}
private Parcelle getParcelle(ParcellePayLoad parcellePayLoad, Optional<SituationGeographique> optionalSituationGeographique, Optional<NatureDomaine> optionalNatureDomaine) {
StringBuilder coordonnees = new StringBuilder();
Parcelle parcelle = new Parcelle();
parcelle.setP(parcellePayLoad.getP());
parcelle.setI(parcellePayLoad.getI());
parcelle.setQ(parcellePayLoad.getQ());
parcelle.setNup(parcellePayLoad.getNup());
parcelle.setLatitude(parcellePayLoad.getLatitude());
parcelle.setLongitude(parcellePayLoad.getLongitude());
//parcelle.setSituationGeographique(optionalSituationGeographique.get());
parcelle.setSituationGeographique(parcellePayLoad.getSituationGeographique());
parcelle.setNatureDomaine(optionalNatureDomaine.get());
parcelle.setNupProvisoire(parcellePayLoad.getNupProvisoire());
// parcelle.setGeomSrid(parcellePayLoad.getGeomSrid());
//////////spatial
// try {
// Point point=null;
// if (parcellePayLoad.getLatitude() != null && parcellePayLoad.getLongitude() != null){
// coordonnees.append(parcelle.getLongitude()).append(" ").append(parcelle.getLatitude());
// point = geometryService.toGeometryPoint(coordonnees.toString(), parcelle.getGeomSrid());//Integer.parseInt(defaultSrid));
// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid32631)) {
// parcelle.setGeometry32631(point);
// parcelle. setGeometry(null);
// }
// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid)) {
// parcelle.setGeometry(point);
// parcelle.setGeometry32631(null);
// }
// }
// }catch (Exception e){
//
// }
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, ParcellePayLoad parcellePayLoad, Optional<SituationGeographique> optionalSituationGeographique, Optional<NatureDomaine> optionalNatureDomaine) {
StringBuilder coordonnees = new StringBuilder();
parcelle.setP(parcellePayLoad.getP());
parcelle.setI(parcellePayLoad.getI());
parcelle.setQ(parcellePayLoad.getQ());
parcelle.setNup(parcellePayLoad.getNup());
parcelle.setLatitude(parcellePayLoad.getLatitude());
parcelle.setLongitude(parcellePayLoad.getLongitude());
//parcelle.setSituationGeographique(optionalSituationGeographique.get());
parcelle.setSituationGeographique(parcellePayLoad.getSituationGeographique());
parcelle.setNatureDomaine(optionalNatureDomaine.get());
parcelle.setNupProvisoire(parcellePayLoad.getNupProvisoire());
//parcelle.setGeomSrid(parcellePayLoad.getGeomSrid());
//////////spatial
// try {
// Point point=null;
// if (parcellePayLoad.getLatitude() != null && parcellePayLoad.getLongitude() != null && parcellePayLoad.getGeomSrid() != 0){
// coordonnees.append(parcelle.getLongitude()).append(" ").append(parcelle.getLatitude());
// point = geometryService.toGeometryPoint(coordonnees.toString(), parcelle.getGeomSrid());//Integer.parseInt(defaultSrid));
// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid32631)) {
// parcelle.setGeometry32631(point);
// parcelle.setGeometry(null);
// }
// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid)) {
// parcelle.setGeometry(point);
// parcelle.setGeometry32631(null);
// }
// }
// }catch (Exception e){
//
// }
return parcelle;
}
// private Parcelle getParcelle(Parcelle parcelle, ParcellePayLoadWeb parcellePayLoadWeb, Optional<SituationGeographique> optionalSituationGeographique, Optional<NatureDomaine> optionalNatureDomaine) {
// StringBuilder coordonnees = new StringBuilder();
// 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.setSituationGeographique(optionalSituationGeographique.get());
// parcelle.setSituationGeographique(parcellePayLoadWeb.getSituationGeographique());
// parcelle.setNatureDomaine(optionalNatureDomaine.get());
// parcelle.setNupProvisoire(parcellePayLoadWeb.getNupProvisoire());
// //parcelle.setGeomSrid(parcellePayLoadWeb.getGeomSrid());
// //////////spatial
//// try {
//// Point point=null;
//// if (parcellePayLoadWeb.getLatitude() != null && parcellePayLoadWeb.getLongitude() != null && parcellePayLoadWeb.getGeomSrid() != 0){
//// coordonnees.append(parcelle.getLongitude()).append(" ").append(parcelle.getLatitude());
//// point = geometryService.toGeometryPoint(coordonnees.toString(), parcelle.getGeomSrid());//Integer.parseInt(defaultSrid));
//// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid32631)) {
//// parcelle.setGeometry32631(point);
//// parcelle.setGeometry(null);
//// }
//// if(parcelle.getGeomSrid()==Integer.parseInt(defaultSrid)) {
//// parcelle.setGeometry(point);
//// parcelle.setGeometry32631(null);
//// }
//// }
//// }catch (Exception e){
////
//// }
// return parcelle;
// }
}

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

@@ -1,16 +1,26 @@
package io.gmss.fiscad.implementations.infocad.metier;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.decoupage.Commune;
import io.gmss.fiscad.entities.decoupage.Nationalite;
import io.gmss.fiscad.entities.decoupage.Quartier;
import io.gmss.fiscad.entities.infocad.parametre.*;
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.crudweb.PersonnePayLoadWeb;
import io.gmss.fiscad.repositories.decoupage.CommuneRepository;
import io.gmss.fiscad.repositories.decoupage.NationaliteRepository;
import io.gmss.fiscad.repositories.infocad.metier.MembreGroupeRepository;
import io.gmss.fiscad.repositories.infocad.metier.PieceRepository;
import io.gmss.fiscad.repositories.infocad.metier.UploadRepository;
import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
import io.gmss.fiscad.repositories.infocad.parametre.ProfessionRepository;
import io.gmss.fiscad.repositories.infocad.parametre.SituationMatrimonialeRepository;
import io.gmss.fiscad.repositories.infocad.parametre.TypePersonneRepository;
import io.gmss.fiscad.service.EntityFromPayLoadService;
import jakarta.persistence.EntityNotFoundException;
import lombok.RequiredArgsConstructor;
import org.springframework.data.domain.Page;
@@ -28,15 +38,41 @@ public class PersonneServiceImpl implements PersonneService {
private final UploadRepository uploadRepository;
private final PieceRepository pieceRepository;
private final MembreGroupeRepository membreGroupeRepository;
private final TypePersonneRepository typePersonneRepository;
private final CommuneRepository communeRepository;
private final NationaliteRepository nationaliteRepository;
private final ProfessionRepository professionRepository;
private final SituationMatrimonialeRepository situationMatrimonialeRepository;
private final EntityFromPayLoadService entityFromPayLoadService;
@Override
public Personne createPersonne(Personne personne) throws BadRequestException {
return null;
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);
return personneRepository.save(personne);
}
@Override
public Personne updatePersonne(Long id, Personne personne) throws NotFoundException {
return null;
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.");
}
if (!personneRepository.existsById(personnePayLoadWeb.getId())) {
throw new NotFoundException("Impossible de trouver la personne que vous désirez modifier.");
}
Personne personne = entityFromPayLoadService.getPersonneFromPayLoadWeb(personnePayLoadWeb);
return personneRepository.save(personne);
}
@Override
@@ -56,7 +92,7 @@ public class PersonneServiceImpl implements PersonneService {
@Override
public Optional<Personne> getPersonneById(Long id) {
return Optional.empty();
return personneRepository.findById(id);
}
@Override
@@ -73,7 +109,7 @@ public class PersonneServiceImpl implements PersonneService {
.toList();
System.out.println(uploadsDirects.size());
// 3. Pièces et leurs Uploads
List<PieceDTO> pieces = pieceRepository.findByPersonne_IdAndActeurConcerneIsNull(id)
List<PieceDTO> pieces = pieceRepository.findByPersonne_IdAndEnqueteIsNull(id)
.stream().map(piece -> {
List<UploadDTO> uploads = piece.getUploads().stream()
.map(u -> new UploadDTO(u.getId(), u.getExternalKey(), u.getObservation(), u.isSynchronise(), u.getFileName(), u.getOriginalFileName(), u.getURIFile(), u.getCheckSum(), u.getSize(), u.getMimeType()))
@@ -99,7 +135,7 @@ public class PersonneServiceImpl implements PersonneService {
if(mg.getTypeRepresentation() == null){
return new MembreGroupeDTO(
mg.getId(),
new PersonneSimpleDTO(pRep.getId(), pRep.getNomOuSigle(), pRep.getPrenomOuRaisonSociale()),
new PersonneSimpleDTO(pRep.getId(), pRep.getNom(), pRep.getPrenom(),pRep.getRaisonSociale()),
null,
new PositionRepresentationDTO(mg.getPositionRepresentation().getId(), mg.getPositionRepresentation().getLibelle()),
uploads
@@ -107,7 +143,7 @@ public class PersonneServiceImpl implements PersonneService {
}else{
return new MembreGroupeDTO(
mg.getId(),
new PersonneSimpleDTO(pRep.getId(), pRep.getNomOuSigle(), pRep.getPrenomOuRaisonSociale()),
new PersonneSimpleDTO(pRep.getId(), pRep.getNom(), pRep.getPrenom(),pRep.getRaisonSociale()),
new TypeRepresentationDTO(mg.getTypeRepresentation().getId(), mg.getTypeRepresentation().getLibelle()),
new PositionRepresentationDTO(mg.getPositionRepresentation().getId(), mg.getPositionRepresentation().getLibelle()),
uploads
@@ -121,8 +157,9 @@ public class PersonneServiceImpl implements PersonneService {
return new PersonneCompletDTO(
personne.getId(),
personne.getIfu(),
personne.getNomOuSigle(),
personne.getPrenomOuRaisonSociale(),
personne.getNom(),
personne.getPrenom(),
personne.getRaisonSociale(),
personne.getNumRavip(),
personne.getNpi(),
personne.getDateNaissanceOuConsti(),

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

@@ -6,10 +6,11 @@ import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.infocad.metier.PieceService;
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;
@Service
public class PieceServiceImpl implements PieceService {
@Override
public Piece createPiece(Piece piece) throws BadRequestException {

43
src/main/java/io/gmss/fiscad/implementations/infocad/metier/RueServiceImpl.java Normal file
View File

@@ -0,0 +1,43 @@
package io.gmss.fiscad.implementations.infocad.metier;
import io.gmss.fiscad.entities.infocad.metier.Rue;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.infocad.metier.RueService;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Optional;
public class RueServiceImpl implements RueService {
@Override
public Rue createRue(Rue rue) throws BadRequestException {
return null;
}
@Override
public Rue updateRue(Long id, Rue rue) throws NotFoundException {
return null;
}
@Override
public void deleteRue(Long id) throws NotFoundException {
}
@Override
public Page<Rue> getRueList(Pageable pageable) {
return null;
}
@Override
public List<Rue> getRueList() {
return null;
}
@Override
public Optional<Rue> getRueById(Long id) {
return Optional.empty();
}
}

72
src/main/java/io/gmss/fiscad/implementations/infocad/parametre/TypeRueServiceImpl.java Normal file
View File

@@ -0,0 +1,72 @@
package io.gmss.fiscad.implementations.infocad.parametre;
import io.gmss.fiscad.entities.infocad.parametre.TypeRue;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.infocad.parametre.TypeRueService;
import io.gmss.fiscad.repositories.infocad.parametre.TypeRueRepository;
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;
@Service
public class TypeRueServiceImpl implements TypeRueService {
private final TypeRueRepository typeRueRepository;
public TypeRueServiceImpl(TypeRueRepository typeRueRepository) {
this.typeRueRepository = typeRueRepository;
}
@Override
public TypeRue createTypeRue(TypeRue typeRue) throws BadRequestException {
if (typeRue.getId() != null) {
throw new BadRequestException("Impossible de créer un nouveau type de rue ayant un id non null.");
}
return typeRueRepository.save(typeRue);
}
@Override
public TypeRue updateTypeRue(Long id, TypeRue typeRue) throws NotFoundException {
if (typeRue.getId() == null) {
throw new BadRequestException("Impossible de mettre à jour un nouveau type de rue ayant un id null.");
}
if (!typeRueRepository.existsById(typeRue.getId())) {
throw new NotFoundException("Impossible de trouver le type de rue spécifié dans notre base de données.");
}
return typeRueRepository.save(typeRue);
}
@Override
public void deleteTypeRue(Long id) throws NotFoundException {
Optional<TypeRue> typeRueOptional = typeRueRepository.findById(id);
if (typeRueOptional.isPresent()) {
typeRueRepository.deleteById(typeRueOptional.get().getId());
} else {
throw new NotFoundException("Impossible de trouver le type de rue spécifié dans notre base de données.");
}
}
@Override
public Page<TypeRue> getTypeRueList(Pageable pageable) {
return typeRueRepository.findAll(pageable);
}
@Override
public List<TypeRue> getTypeRueList() {
return typeRueRepository.findAll();
}
@Override
public Optional<TypeRue> getTypeRueById(Long id) {
if (typeRueRepository.existsById(id)) {
return typeRueRepository.findById(id);
} else {
throw new NotFoundException("Impossible de trouver le type de rue spécifié dans la base de données.");
}
}
}

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

@@ -4,39 +4,44 @@ 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.rfu.metier.BatimentService;
import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
import io.gmss.fiscad.repositories.rfu.metier.BatimentRepository;
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 BatimentServiceImpl implements BatimentService {
private final BatimentRepository batimentRepository;
private final EntityFromPayLoadService entityFromPayLoadService;
public BatimentServiceImpl(BatimentRepository batimentRepository) {
this.batimentRepository = batimentRepository;
}
@Override
public Batiment createBatiment(Batiment batiment) throws BadRequestException {
if (batiment.getId() != null) {
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.");
}
Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb);
return batimentRepository.save(batiment);
}
@Override
public Batiment updateBatiment(Long id, Batiment batiment) throws NotFoundException {
if (batiment.getId() == null) {
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(batiment.getId())) {
if (!batimentRepository.existsById(batimentPaylaodWeb.getId())) {
throw new NotFoundException("Impossible de trouver le batiment spécifié dans notre base de données.");
}
Batiment batiment= entityFromPayLoadService.getBatimentFromPayLoadWeb(batimentPaylaodWeb);
return batimentRepository.save(batiment);
}

38
src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteActiviteServiceImpl.java
View File

@@ -4,39 +4,53 @@ import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteActiviteService;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb;
import io.gmss.fiscad.repositories.rfu.metier.EnqueteActiviteRepository;
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 EnqueteActiviteServiceImpl implements EnqueteActiviteService {
private final EnqueteActiviteRepository enqueteActiviteRepository;
public EnqueteActiviteServiceImpl(EnqueteActiviteRepository enqueteActiviteRepository) {
this.enqueteActiviteRepository = enqueteActiviteRepository;
}
private final EntityFromPayLoadService entityFromPayLoadService;
@Override
public EnqueteActivite createEnqueteActivite(EnqueteActivite enqueteActivite) throws BadRequestException {
if (enqueteActivite.getId() != null) {
throw new BadRequestException("Impossible de créer une nouvelle activité ayant un id non null.");
public EnqueteActivite createEnqueteActivite(EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws BadRequestException {
if (enqueteActivitePayLoadWeb.getId() != null) {
throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId());
}
if (enqueteActivitePayLoadWeb.getPersonneId() != null) {
throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId());
}
if (enqueteActivitePayLoadWeb.getId() != null) {
throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId());
}
if (enqueteActivitePayLoadWeb.getId() != null) {
throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId());
}
if (enqueteActivitePayLoadWeb.getId() != null) {
throw new BadRequestException("Il ne s'agit pas ici d'une nouvelle activité : " + enqueteActivitePayLoadWeb.getId());
}
EnqueteActivite enqueteActivite = entityFromPayLoadService.getEnqueteActivitePayLoadWeb(enqueteActivitePayLoadWeb);
return enqueteActiviteRepository.save(enqueteActivite);
}
@Override
public EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivite enqueteActivite) throws NotFoundException {
if (enqueteActivite.getId() == null) {
public EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws NotFoundException {
if (enqueteActivitePayLoadWeb.getId() == null) {
throw new BadRequestException("Impossible de mettre à jour une nouvelle activité ayant un id null.");
}
if (!enqueteActiviteRepository.existsById(enqueteActivite.getId())) {
throw new NotFoundException("Impossible de trouver la nouvelle activité spécifiée dans notre base de données.");
if (!enqueteActiviteRepository.existsById(enqueteActivitePayLoadWeb.getId())) {
throw new NotFoundException("Impossible de trouver l'enquête activité spécifiée dans notre base de données.");
}
EnqueteActivite enqueteActivite = entityFromPayLoadService.getEnqueteActivitePayLoadWeb(enqueteActivitePayLoadWeb);
return enqueteActiviteRepository.save(enqueteActivite);
}

142
src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteBatimentServiceImpl.java
View File

@@ -1,42 +1,162 @@
package io.gmss.fiscad.implementations.rfu.metier;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.metier.Upload;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.rfu.metier.Batiment;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueParcelle;
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.rfu.metier.BatimentService;
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueBatimentService;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteBatimentService;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
import io.gmss.fiscad.repositories.infocad.metier.UploadRepository;
import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
import io.gmss.fiscad.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 javax.swing.text.html.Option;
import java.util.List;
import java.util.Optional;
@AllArgsConstructor
@Service
public class EnqueteBatimentServiceImpl implements EnqueteBatimentService {
private final EnqueteBatimentRepository enqueteBatimentRepository;
private final BatimentService batimentService;
private final EnqueteRepository enqueteRepository;
private final PersonneRepository personneRepository;
private final EntityFromPayLoadService entityFromPayLoadService;
private final CaracteristiqueBatimentService caracteristiqueBatimentService;
private final UploadRepository uploadRepository;
public EnqueteBatimentServiceImpl(EnqueteBatimentRepository enqueteBatimentRepository) {
this.enqueteBatimentRepository = enqueteBatimentRepository;
}
@Override
public EnqueteBatiment createEnqueteBatiment(EnqueteBatiment enqueteBatiment) throws BadRequestException {
if (enqueteBatiment.getId() != null) {
throw new BadRequestException("Impossible de créer une nouvelle enquete de batiment ayant un id non null.");
public EnqueteBatiment createEnqueteBatiment(EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws BadRequestException {
EnqueteBatiment enqueteBatiment=new EnqueteBatiment();
Batiment batiment=new Batiment();
Enquete enquete=new Enquete();
if(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb().getId()==null){
batiment= batimentService.createBatiment(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb()));
}else{
batiment= batimentService.updateBatiment(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb().getId(),enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb()));
}
return enqueteBatimentRepository.save(enqueteBatiment);
if(enqueteBatimentPayloadWeb.getEnqueteId()==null){
throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête");
}
Optional<Personne> optionalPersonne=Optional.empty();
if(enqueteBatimentPayloadWeb.getPersonneId()!=null){
optionalPersonne=personneRepository.findById(enqueteBatimentPayloadWeb.getPersonneId());
}
Optional<Enquete> optionalEnquete = enqueteRepository.findById(enqueteBatimentPayloadWeb.getEnqueteId());
enqueteBatiment.setEnquete(optionalEnquete.orElse(null));
enqueteBatiment.setBatiment(batiment);
enqueteBatiment.setPersonne(optionalPersonne.orElse(null));
enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayloadWeb.getAutreCaracteristiquePhysique());
enqueteBatiment.setAutreMur(enqueteBatimentPayloadWeb.getAutreMur());
enqueteBatiment.setAutreMenuisierie(enqueteBatimentPayloadWeb.getAutreMenuisierie());
enqueteBatiment.setDateDebutExcemption(enqueteBatimentPayloadWeb.getDateDebutExcemption());
enqueteBatiment.setDateFinExcemption(enqueteBatimentPayloadWeb.getDateFinExcemption());
enqueteBatiment.setNbreHabitant(enqueteBatimentPayloadWeb.getNbreHabitant());
enqueteBatiment.setNbreLotUnite(enqueteBatimentPayloadWeb.getNbreLotUnite());
enqueteBatiment.setNbreMenage(enqueteBatimentPayloadWeb.getNbreMenage());
enqueteBatiment.setNbreMoisLocation(enqueteBatimentPayloadWeb.getNbreMoisLocation());
enqueteBatiment.setNbreUniteLocation(enqueteBatimentPayloadWeb.getNbreUniteLocation());
enqueteBatiment.setNumCompteurSbee(enqueteBatimentPayloadWeb.getNumCompteurSbee());
enqueteBatiment.setNumCompteurSoneb(enqueteBatimentPayloadWeb.getNumCompteurSoneb());
enqueteBatiment.setSbee(enqueteBatimentPayloadWeb.isSbee());
enqueteBatiment.setSoneb(enqueteBatimentPayloadWeb.isSoneb());
enqueteBatiment.setSurfaceAuSol(enqueteBatimentPayloadWeb.getSurfaceAuSol());
enqueteBatiment.setSurfaceLouee(enqueteBatimentPayloadWeb.getSurfaceLouee());
enqueteBatiment.setMontantMensuelLocation(enqueteBatimentPayloadWeb.getMontantMensuelLocation());
enqueteBatiment.setValeurBatimentReel(enqueteBatimentPayloadWeb.getValeurBatimentReel());
enqueteBatiment.setValeurBatimentEstime(enqueteBatimentPayloadWeb.getValeurBatimentEstime());
enqueteBatiment.setMontantLocatifAnnuelDeclare(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelDeclare());
enqueteBatiment.setNbreEtage(enqueteBatimentPayloadWeb.getNbreEtage());
enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment);
//////Enregistrement des caractéristiques batiment
Long enqueteBatimentId = enqueteBatiment.getId();
enqueteBatimentPayloadWeb.getCaracteristiqueBatimentPayloadWebs().forEach(caracteristiqueBatimentPayloadWeb -> {
caracteristiqueBatimentPayloadWeb.setEnqueteBatimentId(enqueteBatimentId);
CaracteristiqueBatiment caracteristiqueBatiment=entityFromPayLoadService.getCaracteristiqueBatimentFromPayLoadWeb(caracteristiqueBatimentPayloadWeb);
caracteristiqueBatimentService.createCaracteristiqueBatiment(caracteristiqueBatiment);
});
EnqueteBatiment finalEnqueteBatiment = enqueteBatiment;
enqueteBatimentPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
optionalEnquete.ifPresent(value -> uploadPayLoadWeb.setEnqueteId(value.getId()));
Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
upload.setEnqueteBatiment(finalEnqueteBatiment);
uploadRepository.save(upload);
});
return enqueteBatiment ;
}
@Override
public EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatiment enqueteBatiment) throws NotFoundException {
if (enqueteBatiment.getId() == null) {
public EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws NotFoundException {
if (enqueteBatimentPayloadWeb.getId() == null) {
throw new BadRequestException("Impossible de mettre à jour une nouvelle enquete de batiment ayant un id null.");
}
if (!enqueteBatimentRepository.existsById(enqueteBatiment.getId())) {
if (!enqueteBatimentRepository.existsById(enqueteBatimentPayloadWeb.getId())) {
throw new NotFoundException("Impossible de trouver la nouvelle enquete de batiment spécifiée dans notre base de données.");
}
if(enqueteBatimentPayloadWeb.getEnqueteId()==null){
throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête");
}
Optional<Enquete> optionalEnquete = enqueteRepository.findById(enqueteBatimentPayloadWeb.getEnqueteId());
EnqueteBatiment enqueteBatiment=new EnqueteBatiment();
Batiment batiment=new Batiment();
if(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb().getId()==null){
batiment= batimentService.createBatiment(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb()));
}else{
batiment= batimentService.updateBatiment(id,enqueteBatimentPayloadWeb.getBatimentPaylaodWeb());//entityFromPayLoadService.getBatimentFromPayLoadWeb(enqueteBatimentPayloadWeb.getBatimentPaylaodWeb()));
}
Optional<Personne> optionalPersonne=Optional.empty();
if(enqueteBatimentPayloadWeb.getPersonneId()!=null){
optionalPersonne=personneRepository.findById(enqueteBatimentPayloadWeb.getPersonneId());
}
enqueteBatiment.setEnquete(optionalEnquete.orElse(null));
enqueteBatiment.setBatiment(batiment);
enqueteBatiment.setPersonne(optionalPersonne.orElse(null));
enqueteBatiment.setAutreCaracteristiquePhysique(enqueteBatimentPayloadWeb.getAutreCaracteristiquePhysique());
enqueteBatiment.setAutreMur(enqueteBatimentPayloadWeb.getAutreMur());
enqueteBatiment.setAutreMenuisierie(enqueteBatimentPayloadWeb.getAutreMenuisierie());
enqueteBatiment.setDateDebutExcemption(enqueteBatimentPayloadWeb.getDateDebutExcemption());
enqueteBatiment.setDateFinExcemption(enqueteBatimentPayloadWeb.getDateFinExcemption());
enqueteBatiment.setNbreHabitant(enqueteBatimentPayloadWeb.getNbreHabitant());
enqueteBatiment.setNbreLotUnite(enqueteBatimentPayloadWeb.getNbreLotUnite());
enqueteBatiment.setNbreMenage(enqueteBatimentPayloadWeb.getNbreMenage());
enqueteBatiment.setNbreMoisLocation(enqueteBatimentPayloadWeb.getNbreMoisLocation());
enqueteBatiment.setNbreUniteLocation(enqueteBatimentPayloadWeb.getNbreUniteLocation());
enqueteBatiment.setNumCompteurSbee(enqueteBatimentPayloadWeb.getNumCompteurSbee());
enqueteBatiment.setNumCompteurSoneb(enqueteBatimentPayloadWeb.getNumCompteurSoneb());
enqueteBatiment.setSbee(enqueteBatimentPayloadWeb.isSbee());
enqueteBatiment.setSoneb(enqueteBatimentPayloadWeb.isSoneb());
enqueteBatiment.setSurfaceAuSol(enqueteBatimentPayloadWeb.getSurfaceAuSol());
enqueteBatiment.setSurfaceLouee(enqueteBatimentPayloadWeb.getSurfaceLouee());
enqueteBatiment.setMontantMensuelLocation(enqueteBatimentPayloadWeb.getMontantMensuelLocation());
enqueteBatiment.setValeurBatimentReel(enqueteBatimentPayloadWeb.getValeurBatimentReel());
enqueteBatiment.setValeurBatimentEstime(enqueteBatimentPayloadWeb.getValeurBatimentEstime());
enqueteBatiment.setMontantLocatifAnnuelDeclare(enqueteBatimentPayloadWeb.getMontantLocatifAnnuelDeclare());
enqueteBatiment= enqueteBatimentRepository.save(enqueteBatiment);
return enqueteBatimentRepository.save(enqueteBatiment);
}

136
src/main/java/io/gmss/fiscad/implementations/rfu/metier/EnqueteUniteLogementServiceImpl.java
View File

@@ -1,43 +1,153 @@
package io.gmss.fiscad.implementations.rfu.metier;
import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.metier.Upload;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.entities.rfu.metier.*;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.rfu.metier.CaracteristiqueUniteLogementService;
import io.gmss.fiscad.interfaces.rfu.metier.EnqueteUniteLogementService;
import io.gmss.fiscad.interfaces.rfu.metier.UniteLogementService;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
import io.gmss.fiscad.repositories.infocad.metier.UploadRepository;
import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
import io.gmss.fiscad.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 EnqueteUniteLogementServiceImpl implements EnqueteUniteLogementService {
private final EnqueteUniteLogementRepository enqueteUniteLogementRepository;
private final UniteLogementService uniteLogementService;
private final EntityFromPayLoadService entityFromPayLoadService ;
private final PersonneRepository personneRepository ;
private final EnqueteRepository enqueteRepository ;
private final UploadRepository uploadRepository ;
private final CaracteristiqueUniteLogementService caracteristiqueUniteLogementService ;
public EnqueteUniteLogementServiceImpl(EnqueteUniteLogementRepository enqueteUniteLogementRepository) {
this.enqueteUniteLogementRepository = enqueteUniteLogementRepository;
}
@Override
public EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogement enqueteUniteLogement) throws BadRequestException {
if (enqueteUniteLogement.getId() != null) {
throw new BadRequestException("Impossible de créer une nouvelle enquete de d'unité de logement ayant un id non null.");
public EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws BadRequestException {
EnqueteUniteLogement enqueteUniteLogement=new EnqueteUniteLogement();
UniteLogement uniteLogement=new UniteLogement();
Enquete enquete=new Enquete();
if(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId()==null){
uniteLogement = uniteLogementService.createUniteLogement(entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb()));
}else{
uniteLogement = uniteLogementService.updateUniteLogement(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId(),entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb()));
}
return enqueteUniteLogementRepository.save(enqueteUniteLogement);
if(enqueteUniteLogementPayloadWeb.getEnqueteId()==null){
throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête");
}
Optional<Personne> optionalPersonne=Optional.empty();
if(enqueteUniteLogementPayloadWeb.getPersonneId()!=null){
optionalPersonne=personneRepository.findById(enqueteUniteLogementPayloadWeb.getPersonneId());
}
Optional<Enquete> optionalEnquete = enqueteRepository.findById(enqueteUniteLogementPayloadWeb.getEnqueteId());
enqueteUniteLogement.setEnquete(optionalEnquete.orElse(null));
enqueteUniteLogement.setUniteLogement(uniteLogement);
enqueteUniteLogement.setPersonne(optionalPersonne.orElse(null));
enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayloadWeb.isEnLocation());
enqueteUniteLogement.setDateDebutExcemption(enqueteUniteLogementPayloadWeb.getDateDebutExcemption());
enqueteUniteLogement.setDateFinExcemption(enqueteUniteLogementPayloadWeb.getDateFinExcemption());
enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayloadWeb.getNbreHabitant());
enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayloadWeb.getNbreMenage());
enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayloadWeb.getNbreMoisLocation());
enqueteUniteLogement.setNumCompteurSbee(enqueteUniteLogementPayloadWeb.getNumCompteurSbee());
enqueteUniteLogement.setNumCompteurSoneb(enqueteUniteLogementPayloadWeb.getNumCompteurSoneb());
enqueteUniteLogement.setSbee(enqueteUniteLogementPayloadWeb.isSbee());
enqueteUniteLogement.setSoneb(enqueteUniteLogementPayloadWeb.isSoneb());
enqueteUniteLogement.setSurfaceAuSol(enqueteUniteLogementPayloadWeb.getSurfaceAuSol());
enqueteUniteLogement.setSurfaceLouee(enqueteUniteLogementPayloadWeb.getSurfaceLouee());
enqueteUniteLogement.setValeurUniteLogementEstime(enqueteUniteLogementPayloadWeb.getValeurUniteLogementEstime());
enqueteUniteLogement.setValeurUniteLogementReel(enqueteUniteLogementPayloadWeb.getValeurUniteLogementReel());
enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayloadWeb.getMontantLocatifAnnuelDeclare());
enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayloadWeb.getMontantMensuelLoyer());
enqueteUniteLogement= enqueteUniteLogementRepository.save(enqueteUniteLogement);
//////Enregistrement des caractéristiques batiment
Long enqueteUniteLogementId = enqueteUniteLogement.getId();
enqueteUniteLogementPayloadWeb.getCaracteristiqueUniteLogementPayloadWebs().forEach(caracteristiqueUniteLogementPayloadWeb -> {
caracteristiqueUniteLogementPayloadWeb.setEnqueteUniteLogementId(enqueteUniteLogementId);
CaracteristiqueUniteLogement caracteristiqueUniteLogement=entityFromPayLoadService.getCaracteristiqueUniteLogementFromPayLoadWeb(caracteristiqueUniteLogementPayloadWeb);
caracteristiqueUniteLogementService.createCaracteristiqueUniteLogement(caracteristiqueUniteLogement);
});
///////Enregistrement des pieces
EnqueteUniteLogement finalEnqueteUniteLogement = enqueteUniteLogement;
enqueteUniteLogementPayloadWeb.getUploadPayLoadWebs().forEach(uploadPayLoadWeb -> {
optionalEnquete.ifPresent(value -> uploadPayLoadWeb.setEnqueteId(value.getId()));
Upload upload=entityFromPayLoadService.getUploadFromPayLoadWeb(uploadPayLoadWeb);
upload.setEnqueteUniteLogement(finalEnqueteUniteLogement);
uploadRepository.save(upload);
});
return enqueteUniteLogement ;
}
@Override
public EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogement enqueteUniteLogement) throws NotFoundException {
if (enqueteUniteLogement.getId() == null) {
public EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws NotFoundException {
if (enqueteUniteLogementPayloadWeb.getId() == null) {
throw new BadRequestException("Impossible de mettre à jour une nouvelle enquete d'unité de logement ayant un id null.");
}
if (!enqueteUniteLogementRepository.existsById(enqueteUniteLogement.getId())) {
if (!enqueteUniteLogementRepository.existsById(enqueteUniteLogementPayloadWeb.getId())) {
throw new NotFoundException("Impossible de trouver la nouvelle enquete d'unité de logement spécifiée dans notre base de données.");
}
return enqueteUniteLogementRepository.save(enqueteUniteLogement);
EnqueteUniteLogement enqueteUniteLogement= new EnqueteUniteLogement();
UniteLogement uniteLogement= new UniteLogement();
if(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId()==null){
uniteLogement = uniteLogementService.createUniteLogement(entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb()));
}else{
uniteLogement = uniteLogementService.updateUniteLogement(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb().getId(),entityFromPayLoadService.getUniteLogementFromPayLoadWeb(enqueteUniteLogementPayloadWeb.getUniteLogementPaylaodWeb()));
}
if(enqueteUniteLogementPayloadWeb.getEnqueteId()==null){
throw new BadRequestException("Impossible de poursuivre l'enregistrement sans la précision de l'enquête");
}
Optional<Personne> optionalPersonne=Optional.empty();
if(enqueteUniteLogementPayloadWeb.getPersonneId()!=null){
optionalPersonne=personneRepository.findById(enqueteUniteLogementPayloadWeb.getPersonneId());
}
Optional<Enquete> optionalEnquete = enqueteRepository.findById(enqueteUniteLogementPayloadWeb.getEnqueteId());
enqueteUniteLogement.setEnquete(optionalEnquete.orElse(null));
enqueteUniteLogement.setUniteLogement(uniteLogement);
enqueteUniteLogement.setPersonne(optionalPersonne.orElse(null));
enqueteUniteLogement.setEnLocation(enqueteUniteLogementPayloadWeb.isEnLocation());
enqueteUniteLogement.setDateDebutExcemption(enqueteUniteLogementPayloadWeb.getDateDebutExcemption());
enqueteUniteLogement.setDateFinExcemption(enqueteUniteLogementPayloadWeb.getDateFinExcemption());
enqueteUniteLogement.setNbreHabitant(enqueteUniteLogementPayloadWeb.getNbreHabitant());
enqueteUniteLogement.setNbreMenage(enqueteUniteLogementPayloadWeb.getNbreMenage());
enqueteUniteLogement.setNbreMoisLocation(enqueteUniteLogementPayloadWeb.getNbreMoisLocation());
enqueteUniteLogement.setNumCompteurSbee(enqueteUniteLogementPayloadWeb.getNumCompteurSbee());
enqueteUniteLogement.setNumCompteurSoneb(enqueteUniteLogementPayloadWeb.getNumCompteurSoneb());
enqueteUniteLogement.setSbee(enqueteUniteLogementPayloadWeb.isSbee());
enqueteUniteLogement.setSoneb(enqueteUniteLogementPayloadWeb.isSoneb());
enqueteUniteLogement.setSurfaceAuSol(enqueteUniteLogementPayloadWeb.getSurfaceAuSol());
enqueteUniteLogement.setSurfaceLouee(enqueteUniteLogementPayloadWeb.getSurfaceLouee());
enqueteUniteLogement.setValeurUniteLogementEstime(enqueteUniteLogementPayloadWeb.getValeurUniteLogementEstime());
enqueteUniteLogement.setValeurUniteLogementReel(enqueteUniteLogementPayloadWeb.getValeurUniteLogementReel());
enqueteUniteLogement.setMontantLocatifAnnuelDeclare(enqueteUniteLogementPayloadWeb.getMontantLocatifAnnuelDeclare());
enqueteUniteLogement.setMontantMensuelLoyer(enqueteUniteLogementPayloadWeb.getMontantMensuelLoyer());
enqueteUniteLogement= enqueteUniteLogementRepository.save(enqueteUniteLogement);
return enqueteUniteLogement;
}
@Override

4
src/main/java/io/gmss/fiscad/implementations/rfu/parametre/EquipeServiceImpl.java
View File

@@ -8,8 +8,8 @@ import io.gmss.fiscad.entities.rfu.parametre.Participer;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.interfaces.rfu.parametre.EquipeService;
import io.gmss.fiscad.paylaods.request.EquipePayload;
import io.gmss.fiscad.paylaods.request.ParticiperPayload;
import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload;
import io.gmss.fiscad.paylaods.request.synchronisation.ParticiperPayload;
import io.gmss.fiscad.repositories.decoupage.SecteurRepository;
import io.gmss.fiscad.repositories.infocad.parametre.BlocRepository;
import io.gmss.fiscad.repositories.rfu.parametre.CampagneRepository;

67
src/main/java/io/gmss/fiscad/implementations/synchronisation/RestaurationServiceImpl.java
View File

@@ -4,6 +4,7 @@ import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.interfaces.synchronisation.RestaurationService;
import io.gmss.fiscad.interfaces.user.UserService;
import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad;
import io.gmss.fiscad.paylaods.response.restoration.*;
import io.gmss.fiscad.repositories.infocad.metier.*;
import io.gmss.fiscad.repositories.infocad.parametre.PersonneRepository;
@@ -43,7 +44,7 @@ public class RestaurationServiceImpl implements RestaurationService {
@Override
public List<ActeurConcernePayLoad> getActeurConcernes(Long terminaleId) {
public List<ActeurConcernePayLoadRestor> getActeurConcernes(Long terminaleId) {
return acteurConcerneRepository.getActeurConcerneByTerminalId(terminaleId);
}
@@ -59,90 +60,90 @@ public class RestaurationServiceImpl implements RestaurationService {
}
@Override
public List<ParcellePayLoad> getParcelle(Long terminaleId) {
public List<ParcellePayLoadRestor> getParcelle(Long terminaleId) {
return parcelleRepository.getParcellesByTerminalId(terminaleId);
}
@Override
public List<PiecePayLoad> getPieces(Long terminaleId) {
public List<PiecePayLoadRestor> getPieces(Long terminaleId) {
return pieceRepository.getPiecesByTerminalId(terminaleId);
}
@Override
public List<MembreGroupePayLoad> getMembreGroupe(Long terminaleId) {
public List<MembreGroupePayLoadRestor> getMembreGroupe(Long terminaleId) {
return membreGroupeRepository.getMembreGroupeByTerminalId(terminaleId);
}
@Override
public List<io.gmss.fiscad.paylaods.request.UploadPayLoad> getUpload(Long terminaleId) {
List<UploadPayLoad> uploadPayLoads = uploadRepository.getUploadByTerminalId(terminaleId);
public List<UploadPayLoad> getUpload(Long terminaleId) {
List<UploadPayLoadRestor> uploadPayLoadRestors = uploadRepository.getUploadByTerminalId(terminaleId);
List<io.gmss.fiscad.paylaods.request.UploadPayLoad> uploadPayLoadsOut = new ArrayList<>();
uploadPayLoads.forEach(uploadPayLoad -> {
io.gmss.fiscad.paylaods.request.UploadPayLoad uploadPayLoadLocal = new io.gmss.fiscad.paylaods.request.UploadPayLoad();
uploadPayLoadLocal.setTerminalId(uploadPayLoad.getTerminalId());
String inputStream = getUploadFile(uploadPayLoad);
List<UploadPayLoad> uploadPayLoadsOut = new ArrayList<>();
uploadPayLoadRestors.forEach(uploadPayLoadRestor -> {
UploadPayLoad uploadPayLoadLocal = new UploadPayLoad();
uploadPayLoadLocal.setTerminalId(uploadPayLoadRestor.getTerminalId());
String inputStream = getUploadFile(uploadPayLoadRestor);
uploadPayLoadLocal.setFileBase64(inputStream);
uploadPayLoadLocal.setIdBackend(uploadPayLoad.getIdBackend());
uploadPayLoadLocal.setPieceId(uploadPayLoad.getPieceId());
uploadPayLoadLocal.setSynchronise(uploadPayLoad.getSynchronise());
uploadPayLoadLocal.setMembreGroupeId(uploadPayLoad.getMembreGroupeId());
uploadPayLoadLocal.setExternalKey(uploadPayLoad.getExternalKey());
uploadPayLoadLocal.setBlocId(uploadPayLoad.getBlocId());
uploadPayLoadLocal.setFilePath(uploadPayLoad.getFilePath());
uploadPayLoadLocal.setEnqueteId(uploadPayLoad.getEnqueteId());
uploadPayLoadLocal.setMax_numero_acteur_concerne_id(uploadPayLoad.getMax_numero_acteur_concerne_id());
uploadPayLoadLocal.setMax_numero_piece_id(uploadPayLoad.getMax_numero_piece_id());
uploadPayLoadLocal.setMax_numero_upload_id(uploadPayLoad.getMax_numero_upload_id());
uploadPayLoadLocal.setName(uploadPayLoad.getName());
uploadPayLoadLocal.setObservation(uploadPayLoad.getObservation());
uploadPayLoadLocal.setIdBackend(uploadPayLoadRestor.getIdBackend());
uploadPayLoadLocal.setPieceId(uploadPayLoadRestor.getPieceId());
uploadPayLoadLocal.setSynchronise(uploadPayLoadRestor.getSynchronise());
uploadPayLoadLocal.setMembreGroupeId(uploadPayLoadRestor.getMembreGroupeId());
uploadPayLoadLocal.setExternalKey(uploadPayLoadRestor.getExternalKey());
uploadPayLoadLocal.setBlocId(uploadPayLoadRestor.getBlocId());
uploadPayLoadLocal.setFilePath(uploadPayLoadRestor.getFilePath());
uploadPayLoadLocal.setEnqueteId(uploadPayLoadRestor.getEnqueteId());
uploadPayLoadLocal.setMax_numero_acteur_concerne_id(uploadPayLoadRestor.getMax_numero_acteur_concerne_id());
uploadPayLoadLocal.setMax_numero_piece_id(uploadPayLoadRestor.getMax_numero_piece_id());
uploadPayLoadLocal.setMax_numero_upload_id(uploadPayLoadRestor.getMax_numero_upload_id());
uploadPayLoadLocal.setName(uploadPayLoadRestor.getName());
uploadPayLoadLocal.setObservation(uploadPayLoadRestor.getObservation());
uploadPayLoadsOut.add(uploadPayLoadLocal);
});
return uploadPayLoadsOut;
}
@Override
public List<BatimentPayload> getBatiment(Long terminalId) {
public List<BatimentPayloadRestor> getBatiment(Long terminalId) {
return batimentRepository.getBatimentByTerminalId(terminalId);
}
@Override
public List<EnqueteBatimentPayLoad> getEnqueteBatiment(Long terminalId) {
public List<EnqueteBatimentPayLoadRestor> getEnqueteBatiment(Long terminalId) {
return enqueteBatimentRepository.getEnqueteBatimentByTerminalId(terminalId);
}
@Override
public List<CaracateristiqueParcellePayLoads> getCaracateristiqueParcelle(Long terminalId) {
public List<CaracateristiqueParcellePayLoadsRestor> getCaracateristiqueParcelle(Long terminalId) {
return caracteristiqueParcelleRepository.getCaracteristiqueParcelleByTerminalId(terminalId);
}
@Override
public List<CaracateristiqueBatimentPayLoads> getCaracateristiqueBatiment(Long terminalId) {
public List<CaracateristiqueBatimentPayLoadsRestor> getCaracateristiqueBatiment(Long terminalId) {
return caracteristiqueBatimentRepository.getCaracteristiqueBatimentByTerminalId(terminalId);
}
@Override
public List<CaracteristiqueUniteLogementPayLoad> getCaracateristiqueUniteLogement(Long terminalId) {
public List<CaracteristiqueUniteLogementPayLoadRestor> getCaracateristiqueUniteLogement(Long terminalId) {
return caracteristiqueUniteLogementRepository.getCaracteristiqueUniteLogementByTerminalId(terminalId);
}
@Override
public List<EnqueteUniteLogementPayLoad> getEnqueteUniteLogement(Long terminalId) {
public List<EnqueteUniteLogementPayLoadRestor> getEnqueteUniteLogement(Long terminalId) {
return enqueteUniteLogementRepository.getEnqueteUniteLogementByTerminalId(terminalId);
}
@Override
public List<UniteLogementPayLoad> getUniteLogement(Long terminalId) {
public List<UniteLogementPayLoadRestor> getUniteLogement(Long terminalId) {
return uniteLogementRepository.getUniteLogementByTerminalId(terminalId);
}
private String getUploadFile(UploadPayLoad uploadPayLoad) {
private String getUploadFile(UploadPayLoadRestor uploadPayLoadRestor) {
try {
Resource resource = fileStorageService.loadFileAsResource(uploadPayLoad.getFileBackendName());
Resource resource = fileStorageService.loadFileAsResource(uploadPayLoadRestor.getFileBackendName());
final var bytes = resource.getInputStream().readAllBytes();
return Base64.getEncoder().encodeToString(bytes);
} catch (Exception e) {

106
src/main/java/io/gmss/fiscad/implementations/synchronisation/SynchronisationServiceImpl.java
View File

@@ -1,50 +1,42 @@
package io.gmss.fiscad.implementations.synchronisation;
import io.gmss.fiscad.entities.decoupage.Commune;
import io.gmss.fiscad.entities.decoupage.Nationalite;
import io.gmss.fiscad.entities.decoupage.Quartier;
import io.gmss.fiscad.entities.infocad.metier.*;
import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.parametre.*;
import io.gmss.fiscad.entities.metadata.*;
import io.gmss.fiscad.entities.rfu.metier.*;
import io.gmss.fiscad.entities.rfu.parametre.Caracteristique;
import io.gmss.fiscad.entities.rfu.parametre.TypeCaracteristique;
import io.gmss.fiscad.entities.rfu.parametre.ZoneRfu;
import io.gmss.fiscad.entities.user.User;
import io.gmss.fiscad.enums.*;
import io.gmss.fiscad.interfaces.infocad.metier.ParcelleGeomService;
import io.gmss.fiscad.enums.ProfileApp;
import io.gmss.fiscad.enums.TypeObjet;
import io.gmss.fiscad.interfaces.synchronisation.SynchronisationService;
import io.gmss.fiscad.interfaces.user.UserService;
import io.gmss.fiscad.paylaods.request.*;
import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload;
import io.gmss.fiscad.paylaods.response.*;
import io.gmss.fiscad.paylaods.request.synchronisation.*;
import io.gmss.fiscad.repositories.decoupage.*;
import io.gmss.fiscad.repositories.infocad.metier.*;
import io.gmss.fiscad.repositories.infocad.metier.EnqueteRepository;
import io.gmss.fiscad.repositories.infocad.parametre.*;
import io.gmss.fiscad.repositories.metadata.*;
import io.gmss.fiscad.repositories.rfu.metier.*;
import io.gmss.fiscad.repositories.rfu.parametre.CaracteristiqueRepository;
import io.gmss.fiscad.repositories.rfu.parametre.TypeCaracteristiqueRepository;
import io.gmss.fiscad.repositories.rfu.parametre.ZoneRfuRepository;
import io.gmss.fiscad.repositories.user.UserRepository;
import io.gmss.fiscad.service.FileStorageService;
import io.gmss.fiscad.service.worker.*;
import jakarta.transaction.Transactional;
import lombok.RequiredArgsConstructor;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.data.jpa.repository.Modifying;
import org.springframework.scheduling.annotation.Async;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.stereotype.Service;
import org.springframework.web.multipart.MultipartFile;
import io.gmss.fiscad.paylaods.request.synchronisation.*;
import java.io.File;
import java.io.IOException;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Optional;
import java.util.function.ToDoubleBiFunction;
@Service
@RequiredArgsConstructor
@@ -429,39 +421,39 @@ public class SynchronisationServiceImpl implements SynchronisationService {
}
@Override
public List<SyncResponse> syncCaracteristiqueBatiment(List<CaracteristiqueBatimentPaylod> caracteristiqueBatimentPaylods) {
public List<SyncResponse> syncCaracteristiqueBatiment(List<CaracteristiqueBatimentPayload> CaracteristiqueBatimentPayloads) {
List<SyncResponse> syncResponses = new ArrayList<>();
if (caracteristiqueBatimentPaylods == null) {
if (CaracteristiqueBatimentPayloads == null) {
SyncResponse syncResponse = new SyncResponse(null,
null, false, "Aucune caracteristique de bâtiment à synchroniser");
syncResponses.add(syncResponse);
return syncResponses;
}
syncResponses = saveMobileData(caracteristiqueBatimentPaylods, TypeObjet.CARACTERISTIQUEBATIMENT);
syncResponses = saveMobileData(CaracteristiqueBatimentPayloads, TypeObjet.CARACTERISTIQUEBATIMENT);
return syncResponses;
}
@Override
public List<SyncResponse> syncCaracteristiqueUniteLogement(List<CaracteristiqueUniteLogementPaylod> caracteristiqueUniteLogementPaylods) {
public List<SyncResponse> syncCaracteristiqueUniteLogement(List<CaracteristiqueUniteLogementPayload> CaracteristiqueUniteLogementPayloads) {
List<SyncResponse> syncResponses = new ArrayList<>();
if (caracteristiqueUniteLogementPaylods == null) {
if (CaracteristiqueUniteLogementPayloads == null) {
SyncResponse syncResponse = new SyncResponse(null,
null, false, "Aucune caracteristique d'unité de logement à synchroniser");
syncResponses.add(syncResponse);
return syncResponses;
}
syncResponses = saveMobileData(caracteristiqueUniteLogementPaylods, TypeObjet.CARACTERISTIQUEUNITELOGEMENT);
syncResponses = saveMobileData(CaracteristiqueUniteLogementPayloads, TypeObjet.CARACTERISTIQUEUNITELOGEMENT);
return syncResponses;
}
@Override
public List<SyncResponse> syncCaracteristiqueParcelle(List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods) {
public List<SyncResponse> syncCaracteristiqueParcelle(List<CaracteristiqueParcellePayload> CaracteristiqueParcellePayloads) {
List<SyncResponse> syncResponses = new ArrayList<>();
if (caracteristiqueParcellePaylods == null) {
if (CaracteristiqueParcellePayloads == null) {
SyncResponse syncResponse = new SyncResponse(null,
null, false, "Aucune caracteristique de parcelle à synchroniser");
syncResponses.add(syncResponse);
return syncResponses;
}
syncResponses = saveMobileData(caracteristiqueParcellePaylods, TypeObjet.CARACTERISTIQUEPARCELLE);
syncResponses = saveMobileData(CaracteristiqueParcellePayloads, TypeObjet.CARACTERISTIQUEPARCELLE);
return syncResponses;
}
@Override
@@ -885,32 +877,32 @@ public class SynchronisationServiceImpl implements SynchronisationService {
}
case CARACTERISTIQUEPARCELLE -> {
payloads.forEach(payLoad -> {
CaracteristiqueParcellePaylod caracteristiqueParcellePaylod = (CaracteristiqueParcellePaylod) payLoad;
//caracteristiqueParcellePaylod.setIdBackend(null);
CaracteristiqueParcellePayload CaracteristiqueParcellePayload = (CaracteristiqueParcellePayload) payLoad;
//CaracteristiqueParcellePayload.setIdBackend(null);
try {
MobileDataCaracteristiqueParcelle mobileDataCaracteristiqueParcelle = new MobileDataCaracteristiqueParcelle();
Optional<MobileDataCaracteristiqueParcelle> optionalMobileDataCaracteristiqueParcelle = Optional.empty();
if (caracteristiqueParcellePaylod.getIdBackend() != null) {
optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findById(caracteristiqueParcellePaylod.getIdBackend());
if (CaracteristiqueParcellePayload.getIdBackend() != null) {
optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findById(CaracteristiqueParcellePayload.getIdBackend());
if (optionalMobileDataCaracteristiqueParcelle.isPresent()) {
mobileDataCaracteristiqueParcelle = optionalMobileDataCaracteristiqueParcelle.get();
}
} else {
optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findFirstByTerminalIdAndExternalKey(caracteristiqueParcellePaylod.getTerminalId(), caracteristiqueParcellePaylod.getExternalKey());
optionalMobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.findFirstByTerminalIdAndExternalKey(CaracteristiqueParcellePayload.getTerminalId(), CaracteristiqueParcellePayload.getExternalKey());
if (optionalMobileDataCaracteristiqueParcelle.isPresent()) {
mobileDataCaracteristiqueParcelle = optionalMobileDataCaracteristiqueParcelle.get();
}
}
mobileDataCaracteristiqueParcelle.setTerminalId(caracteristiqueParcellePaylod.getTerminalId());
mobileDataCaracteristiqueParcelle.setExternalKey(caracteristiqueParcellePaylod.getExternalKey());
mobileDataCaracteristiqueParcelle.setTerminalId(CaracteristiqueParcellePayload.getTerminalId());
mobileDataCaracteristiqueParcelle.setExternalKey(CaracteristiqueParcellePayload.getExternalKey());
mobileDataCaracteristiqueParcelle.setTraiter(false);
mobileDataCaracteristiqueParcelle.setCaracteristiqueParcellePaylod(caracteristiqueParcellePaylod);
mobileDataCaracteristiqueParcelle.setCaracteristiqueParcellePayload(CaracteristiqueParcellePayload);
mobileDataCaracteristiqueParcelle = mobileDataCaracteristiqueParcelleRepository.save(mobileDataCaracteristiqueParcelle);
SyncResponse syncResponse = new SyncResponse();
syncResponse.setObservation("Synchronisation effectuée avec succès pour " + TypeObjet.CARACTERISTIQUEPARCELLE.toString());
syncResponse.setExternalKey(caracteristiqueParcellePaylod.getExternalKey());
syncResponse.setExternalKey(CaracteristiqueParcellePayload.getExternalKey());
syncResponse.setSynchronise(true);
syncResponse.setIdBackend(mobileDataCaracteristiqueParcelle.getId());
syncResponses.add(syncResponse);
@@ -918,9 +910,9 @@ public class SynchronisationServiceImpl implements SynchronisationService {
e.printStackTrace();
SyncResponse syncResponse = new SyncResponse();
syncResponse.setObservation("Synchronisation échouée pour " + TypeObjet.CARACTERISTIQUEPARCELLE.toString());
syncResponse.setExternalKey(caracteristiqueParcellePaylod.getExternalKey());
syncResponse.setExternalKey(CaracteristiqueParcellePayload.getExternalKey());
syncResponse.setSynchronise(false);
syncResponse.setIdBackend(caracteristiqueParcellePaylod.getIdBackend());
syncResponse.setIdBackend(CaracteristiqueParcellePayload.getIdBackend());
syncResponses.add(syncResponse);
}
});
@@ -928,33 +920,33 @@ public class SynchronisationServiceImpl implements SynchronisationService {
case CARACTERISTIQUEBATIMENT -> {
payloads.forEach(payLoad -> {
CaracteristiqueBatimentPaylod caracteristiqueBatimentPaylod = (CaracteristiqueBatimentPaylod) payLoad;
//caracteristiqueBatimentPaylod.setIdBackend(null);
CaracteristiqueBatimentPayload CaracteristiqueBatimentPayload = (CaracteristiqueBatimentPayload) payLoad;
//CaracteristiqueBatimentPayload.setIdBackend(null);
try {
MobileDataCaracteristiqueBatiment mobileDataCaracteristiqueBatiment = new MobileDataCaracteristiqueBatiment();
Optional<MobileDataCaracteristiqueBatiment> optionalMobileDataCaracteristiqueBatiment = Optional.empty();
if (caracteristiqueBatimentPaylod.getIdBackend() != null) {
optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findById(caracteristiqueBatimentPaylod.getIdBackend());
if (CaracteristiqueBatimentPayload.getIdBackend() != null) {
optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findById(CaracteristiqueBatimentPayload.getIdBackend());
if (optionalMobileDataCaracteristiqueBatiment.isPresent()) {
mobileDataCaracteristiqueBatiment = optionalMobileDataCaracteristiqueBatiment.get();
}
} else {
optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findFirstByTerminalIdAndExternalKey(caracteristiqueBatimentPaylod.getTerminalId(), caracteristiqueBatimentPaylod.getExternalKey());
optionalMobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.findFirstByTerminalIdAndExternalKey(CaracteristiqueBatimentPayload.getTerminalId(), CaracteristiqueBatimentPayload.getExternalKey());
if (optionalMobileDataCaracteristiqueBatiment.isPresent()) {
mobileDataCaracteristiqueBatiment = optionalMobileDataCaracteristiqueBatiment.get();
}
}
mobileDataCaracteristiqueBatiment.setTerminalId(caracteristiqueBatimentPaylod.getTerminalId());
mobileDataCaracteristiqueBatiment.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey());
mobileDataCaracteristiqueBatiment.setTerminalId(CaracteristiqueBatimentPayload.getTerminalId());
mobileDataCaracteristiqueBatiment.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey());
mobileDataCaracteristiqueBatiment.setTraiter(false);
mobileDataCaracteristiqueBatiment.setCaracteristiqueBatimentPaylod(caracteristiqueBatimentPaylod);
mobileDataCaracteristiqueBatiment.setCaracteristiqueBatimentPayload(CaracteristiqueBatimentPayload);
mobileDataCaracteristiqueBatiment = mobileDataCaracteristiqueBatimentRepository.save(mobileDataCaracteristiqueBatiment);
SyncResponse syncResponse = new SyncResponse();
syncResponse.setObservation("Synchronisation effectuée avec succès pour " + TypeObjet.CARACTERISTIQUEBATIMENT.toString());
syncResponse.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey());
syncResponse.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey());
syncResponse.setSynchronise(true);
syncResponse.setIdBackend(mobileDataCaracteristiqueBatiment.getId());
syncResponses.add(syncResponse);
@@ -962,41 +954,41 @@ public class SynchronisationServiceImpl implements SynchronisationService {
e.printStackTrace();
SyncResponse syncResponse = new SyncResponse();
syncResponse.setObservation("Synchronisation échouée pour " + TypeObjet.CARACTERISTIQUEBATIMENT.toString());
syncResponse.setExternalKey(caracteristiqueBatimentPaylod.getExternalKey());
syncResponse.setExternalKey(CaracteristiqueBatimentPayload.getExternalKey());
syncResponse.setSynchronise(false);
syncResponse.setIdBackend(caracteristiqueBatimentPaylod.getIdBackend());
syncResponse.setIdBackend(CaracteristiqueBatimentPayload.getIdBackend());
syncResponses.add(syncResponse);
}
});
}
case CARACTERISTIQUEUNITELOGEMENT -> {
payloads.forEach(payLoad -> {
CaracteristiqueUniteLogementPaylod caracteristiqueUniteLogementPaylod = (CaracteristiqueUniteLogementPaylod) payLoad;
//caracteristiqueUniteLogementPaylod.setIdBackend(null);
CaracteristiqueUniteLogementPayload CaracteristiqueUniteLogementPayload = (CaracteristiqueUniteLogementPayload) payLoad;
//CaracteristiqueUniteLogementPayload.setIdBackend(null);
try {
MobileDataCaracteristiqueUniteLogement mobileDataCaracteristiqueUniteLogement = new MobileDataCaracteristiqueUniteLogement();
Optional<MobileDataCaracteristiqueUniteLogement> optionalMobileDataCaracteristiqueUniteLogement = Optional.empty();
if (caracteristiqueUniteLogementPaylod.getIdBackend() != null) {
optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findById(caracteristiqueUniteLogementPaylod.getIdBackend());
if (CaracteristiqueUniteLogementPayload.getIdBackend() != null) {
optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findById(CaracteristiqueUniteLogementPayload.getIdBackend());
if (optionalMobileDataCaracteristiqueUniteLogement.isPresent()) {
mobileDataCaracteristiqueUniteLogement = optionalMobileDataCaracteristiqueUniteLogement.get();
}
} else {
optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findFirstByTerminalIdAndExternalKey(caracteristiqueUniteLogementPaylod.getTerminalId(), caracteristiqueUniteLogementPaylod.getExternalKey());
optionalMobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.findFirstByTerminalIdAndExternalKey(CaracteristiqueUniteLogementPayload.getTerminalId(), CaracteristiqueUniteLogementPayload.getExternalKey());
if (optionalMobileDataCaracteristiqueUniteLogement.isPresent()) {
mobileDataCaracteristiqueUniteLogement = optionalMobileDataCaracteristiqueUniteLogement.get();
}
}
mobileDataCaracteristiqueUniteLogement.setTerminalId(caracteristiqueUniteLogementPaylod.getTerminalId());
mobileDataCaracteristiqueUniteLogement.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey());
mobileDataCaracteristiqueUniteLogement.setTerminalId(CaracteristiqueUniteLogementPayload.getTerminalId());
mobileDataCaracteristiqueUniteLogement.setExternalKey(CaracteristiqueUniteLogementPayload.getExternalKey());
mobileDataCaracteristiqueUniteLogement.setTraiter(false);
mobileDataCaracteristiqueUniteLogement.setCaracteristiqueUniteLogementPaylod(caracteristiqueUniteLogementPaylod);
mobileDataCaracteristiqueUniteLogement.setCaracteristiqueUniteLogementPayload(CaracteristiqueUniteLogementPayload);
mobileDataCaracteristiqueUniteLogement = mobileDataCaracteristiqueUniteLogementRepository.save(mobileDataCaracteristiqueUniteLogement);
SyncResponse syncResponse = new SyncResponse();
syncResponse.setObservation("Synchronisation effectuée avec succès pour " + TypeObjet.CARACTERISTIQUEUNITELOGEMENT.toString());
syncResponse.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey());
syncResponse.setExternalKey(CaracteristiqueUniteLogementPayload.getExternalKey());
syncResponse.setSynchronise(true);
syncResponse.setIdBackend(mobileDataCaracteristiqueUniteLogement.getId());
syncResponses.add(syncResponse);
@@ -1004,9 +996,9 @@ public class SynchronisationServiceImpl implements SynchronisationService {
e.printStackTrace();
SyncResponse syncResponse = new SyncResponse();
syncResponse.setObservation("Synchronisation échouée pour " + TypeObjet.CARACTERISTIQUEUNITELOGEMENT.toString());
syncResponse.setExternalKey(caracteristiqueUniteLogementPaylod.getExternalKey());
syncResponse.setExternalKey(CaracteristiqueUniteLogementPayload.getExternalKey());
syncResponse.setSynchronise(false);
syncResponse.setIdBackend(caracteristiqueUniteLogementPaylod.getIdBackend());
syncResponse.setIdBackend(CaracteristiqueUniteLogementPayload.getIdBackend());
syncResponses.add(syncResponse);
}
});

2
src/main/java/io/gmss/fiscad/interfaces/decoupage/SecteurService.java
View File

@@ -3,7 +3,7 @@ package io.gmss.fiscad.interfaces.decoupage;
import io.gmss.fiscad.entities.decoupage.Secteur;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.SecteurPayload;
import io.gmss.fiscad.paylaods.request.synchronisation.SecteurPayload;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

6
src/main/java/io/gmss/fiscad/interfaces/infocad/metier/EnqueteService.java
View File

@@ -4,9 +4,9 @@ import io.gmss.fiscad.entities.infocad.metier.Enquete;
import io.gmss.fiscad.entities.infocad.metier.EnqueteFiltreResponse;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.EnquetePayLoad;
import io.gmss.fiscad.paylaods.request.EnqueteTraitementPayLoad;
import io.gmss.fiscad.paylaods.request.FiltreEnquetePayLoad;
import io.gmss.fiscad.paylaods.request.crudweb.EnquetePayLoadWeb;
import io.gmss.fiscad.paylaods.response.EnqueteNonSyncResponse;
import io.gmss.fiscad.paylaods.response.EnqueteResponse;
import io.gmss.fiscad.paylaods.response.FicheEnqueteResponse;
@@ -19,9 +19,9 @@ import java.util.Optional;
public interface EnqueteService {
Enquete createEnquete(EnquetePayLoad enquetePayLoad) throws BadRequestException;
Enquete createEnquete(EnquetePayLoadWeb enquetePayLoad) throws BadRequestException;
Enquete updateEnquete(EnquetePayLoad enquetePayLoad) throws NotFoundException;
Enquete updateEnquete(Long id,EnquetePayLoadWeb enquete) throws NotFoundException;
void deleteEnquete(Long id) throws NotFoundException;

6
src/main/java/io/gmss/fiscad/interfaces/infocad/metier/ParcelleService.java
View File

@@ -3,7 +3,7 @@ package io.gmss.fiscad.interfaces.infocad.metier;
import io.gmss.fiscad.entities.infocad.metier.Parcelle;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.ParcellePayLoad;
import io.gmss.fiscad.paylaods.request.crudweb.ParcellePayLoadWeb;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -13,9 +13,9 @@ import java.util.Optional;
public interface ParcelleService {
Parcelle createParcelle(ParcellePayLoad parcellePayLoad) throws BadRequestException;
Parcelle createParcelle(ParcellePayLoadWeb parcellePayLoadWeb) throws BadRequestException;
Parcelle updateParcelle(ParcellePayLoad parcellePayLoad) throws NotFoundException;
Parcelle updateParcelle(Long id,ParcellePayLoadWeb parcellePayLoadWeb) throws NotFoundException;
void deleteParcelle(Long id) throws NotFoundException;

5
src/main/java/io/gmss/fiscad/interfaces/infocad/metier/PersonneService.java
View File

@@ -4,6 +4,7 @@ import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.dto.PersonneCompletDTO;
import io.gmss.fiscad.paylaods.request.crudweb.PersonnePayLoadWeb;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -12,9 +13,9 @@ import java.util.Optional;
public interface PersonneService {
Personne createPersonne(Personne personne) throws BadRequestException;
Personne createPersonne(PersonnePayLoadWeb personnePayLoadWeb) throws BadRequestException;
Personne updatePersonne(Long id, Personne personne) throws NotFoundException;
Personne updatePersonne(Long id, PersonnePayLoadWeb personnePayLoadWeb) throws NotFoundException;
void deletePersonne(Long id) throws NotFoundException;

25
src/main/java/io/gmss/fiscad/interfaces/infocad/metier/RueService.java Executable file
View File

@@ -0,0 +1,25 @@
package io.gmss.fiscad.interfaces.infocad.metier;
import io.gmss.fiscad.entities.infocad.metier.Rue;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Optional;
public interface RueService {
Rue createRue(Rue rue) throws BadRequestException;
Rue updateRue(Long id, Rue rue) throws NotFoundException;
void deleteRue(Long id) throws NotFoundException;
Page<Rue> getRueList(Pageable pageable);
List<Rue> getRueList();
Optional<Rue> getRueById(Long id);
}

25
src/main/java/io/gmss/fiscad/interfaces/infocad/parametre/TypeRueService.java Executable file
View File

@@ -0,0 +1,25 @@
package io.gmss.fiscad.interfaces.infocad.parametre;
import io.gmss.fiscad.entities.infocad.parametre.TypeRue;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import java.util.List;
import java.util.Optional;
public interface TypeRueService {
TypeRue createTypeRue(TypeRue typeRue) throws BadRequestException;
TypeRue updateTypeRue(Long id, TypeRue typeRue) throws NotFoundException;
void deleteTypeRue(Long id) throws NotFoundException;
Page<TypeRue> getTypeRueList(Pageable pageable);
List<TypeRue> getTypeRueList();
Optional<TypeRue> getTypeRueById(Long id);
}

5
src/main/java/io/gmss/fiscad/interfaces/rfu/metier/BatimentService.java
View File

@@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier;
import io.gmss.fiscad.entities.rfu.metier.Batiment;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.crudweb.BatimentPaylaodWeb;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -11,9 +12,9 @@ import java.util.Optional;
public interface BatimentService {
Batiment createBatiment(Batiment batiment) throws BadRequestException;
Batiment createBatiment(BatimentPaylaodWeb batimentPaylaodWeb) throws BadRequestException;
Batiment updateBatiment(Long id, Batiment batiment) throws NotFoundException;
Batiment updateBatiment(Long id,BatimentPaylaodWeb batimentPaylaodWeb) throws NotFoundException;
void deleteBatiment(Long id) throws NotFoundException;

4
src/main/java/io/gmss/fiscad/interfaces/rfu/metier/CaracteristiqueParcelleService.java
View File

@@ -11,9 +11,9 @@ import java.util.Optional;
public interface CaracteristiqueParcelleService {
CaracteristiqueParcelle createCaracteristiqueParcelle(CaracteristiqueParcelle batiment) throws BadRequestException;
CaracteristiqueParcelle createCaracteristiqueParcelle(CaracteristiqueParcelle caracteristiqueParcelle) throws BadRequestException;
CaracteristiqueParcelle updateCaracteristiqueParcelle(Long id, CaracteristiqueParcelle batiment) throws NotFoundException;
CaracteristiqueParcelle updateCaracteristiqueParcelle(Long id, CaracteristiqueParcelle caracteristiqueParcelle) throws NotFoundException;
void deleteCaracteristiqueParcelle(Long id) throws NotFoundException;

5
src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteActiviteService.java
View File

@@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier;
import io.gmss.fiscad.entities.rfu.metier.EnqueteActivite;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteActivitePayLoadWeb;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -11,9 +12,9 @@ import java.util.Optional;
public interface EnqueteActiviteService {
EnqueteActivite createEnqueteActivite(EnqueteActivite enqueteActivite) throws BadRequestException;
EnqueteActivite createEnqueteActivite(EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws BadRequestException;
EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivite enqueteActivite) throws NotFoundException;
EnqueteActivite updateEnqueteActivite(Long id, EnqueteActivitePayLoadWeb enqueteActivitePayLoadWeb) throws NotFoundException;
void deleteEnqueteActivite(Long id) throws NotFoundException;

5
src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteBatimentService.java
View File

@@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier;
import io.gmss.fiscad.entities.rfu.metier.EnqueteBatiment;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteBatimentPayloadWeb;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -11,9 +12,9 @@ import java.util.Optional;
public interface EnqueteBatimentService {
EnqueteBatiment createEnqueteBatiment(EnqueteBatiment enqueteBatiment) throws BadRequestException;
EnqueteBatiment createEnqueteBatiment(EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws BadRequestException;
EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatiment enqueteBatiment) throws NotFoundException;
EnqueteBatiment updateEnqueteBatiment(Long id, EnqueteBatimentPayloadWeb enqueteBatimentPayloadWeb) throws NotFoundException;
void deleteEnqueteBatiment(Long id) throws NotFoundException;

5
src/main/java/io/gmss/fiscad/interfaces/rfu/metier/EnqueteUniteLogementService.java
View File

@@ -3,6 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.metier;
import io.gmss.fiscad.entities.rfu.metier.EnqueteUniteLogement;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.crudweb.EnqueteUniteLogementPayloadWeb;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
@@ -11,9 +12,9 @@ import java.util.Optional;
public interface EnqueteUniteLogementService {
EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogement enqueteUniteLogement) throws BadRequestException;
EnqueteUniteLogement createEnqueteUniteLogement(EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws BadRequestException;
EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogement enqueteUniteLogement) throws NotFoundException;
EnqueteUniteLogement updateEnqueteUniteLogement(Long id, EnqueteUniteLogementPayloadWeb enqueteUniteLogementPayloadWeb) throws NotFoundException;
void deleteEnqueteUniteLogement(Long id) throws NotFoundException;

2
src/main/java/io/gmss/fiscad/interfaces/rfu/metier/UniteLogementService.java
View File

@@ -13,7 +13,7 @@ public interface UniteLogementService {
UniteLogement createUniteLogement(UniteLogement uniteLogement) throws BadRequestException;
UniteLogement updateUniteLogement(Long id, UniteLogement uniteLogement) throws NotFoundException;
UniteLogement updateUniteLogement(Long id,UniteLogement uniteLogement) throws NotFoundException;
void deleteUniteLogement(Long id) throws NotFoundException;

2
src/main/java/io/gmss/fiscad/interfaces/rfu/parametre/EquipeService.java
View File

@@ -3,7 +3,7 @@ package io.gmss.fiscad.interfaces.rfu.parametre;
import io.gmss.fiscad.entities.rfu.parametre.Equipe;
import io.gmss.fiscad.exceptions.BadRequestException;
import io.gmss.fiscad.exceptions.NotFoundException;
import io.gmss.fiscad.paylaods.request.EquipePayload;
import io.gmss.fiscad.paylaods.request.synchronisation.EquipePayload;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;

25
src/main/java/io/gmss/fiscad/interfaces/synchronisation/RestaurationService.java
View File

@@ -1,39 +1,40 @@
package io.gmss.fiscad.interfaces.synchronisation;
import io.gmss.fiscad.entities.infocad.metier.Tpe;
import io.gmss.fiscad.paylaods.request.synchronisation.UploadPayLoad;
import io.gmss.fiscad.paylaods.response.restoration.*;
import java.util.List;
public interface RestaurationService {
List<ActeurConcernePayLoad> getActeurConcernes(Long terminaleId);
List<ActeurConcernePayLoadRestor> getActeurConcernes(Long terminaleId);
List<EnquetePayLoad> getEnquete(Long terminaleId);
List<PersonnePayLoad> getPersonne(Long terminaleId);
List<ParcellePayLoad> getParcelle(Long terminaleId);
List<ParcellePayLoadRestor> getParcelle(Long terminaleId);
List<PiecePayLoad> getPieces(Long terminaleId);
List<PiecePayLoadRestor> getPieces(Long terminaleId);
List<MembreGroupePayLoad> getMembreGroupe(Long terminaleId);
List<MembreGroupePayLoadRestor> getMembreGroupe(Long terminaleId);
List<io.gmss.fiscad.paylaods.request.UploadPayLoad> getUpload(Long terminaleId);
List<UploadPayLoad> getUpload(Long terminaleId);
List<BatimentPayload> getBatiment(Long terminalId);
List<BatimentPayloadRestor> getBatiment(Long terminalId);
List<EnqueteBatimentPayLoad> getEnqueteBatiment(Long terminalId);
List<EnqueteBatimentPayLoadRestor> getEnqueteBatiment(Long terminalId);
List<CaracateristiqueParcellePayLoads> getCaracateristiqueParcelle(Long terminalId);
List<CaracateristiqueParcellePayLoadsRestor> getCaracateristiqueParcelle(Long terminalId);
List<CaracateristiqueBatimentPayLoads> getCaracateristiqueBatiment(Long terminalId);
List<CaracateristiqueBatimentPayLoadsRestor> getCaracateristiqueBatiment(Long terminalId);
List<CaracteristiqueUniteLogementPayLoad> getCaracateristiqueUniteLogement(Long terminalId);
List<CaracteristiqueUniteLogementPayLoadRestor> getCaracateristiqueUniteLogement(Long terminalId);
List<EnqueteUniteLogementPayLoad> getEnqueteUniteLogement(Long terminalId);
List<EnqueteUniteLogementPayLoadRestor> getEnqueteUniteLogement(Long terminalId);
List<UniteLogementPayLoad> getUniteLogement(Long terminalId);
List<UniteLogementPayLoadRestor> getUniteLogement(Long terminalId);
public List<Tpe> getTpeListByCurrentUser();

11
src/main/java/io/gmss/fiscad/interfaces/synchronisation/SynchronisationService.java
View File

@@ -2,7 +2,10 @@ package io.gmss.fiscad.interfaces.synchronisation;
import io.gmss.fiscad.entities.infocad.metier.Upload;
import io.gmss.fiscad.entities.metadata.MobileDataUpload;
import io.gmss.fiscad.paylaods.request.*;
import io.gmss.fiscad.paylaods.request.EnqueteAllDataPayload;
import io.gmss.fiscad.paylaods.request.synchronisation.*;
import io.gmss.fiscad.paylaods.request.synchronisation.*;
import io.gmss.fiscad.paylaods.response.ReferencesSyncResponses;
import io.gmss.fiscad.paylaods.response.SyncEnqueteAllDataResponse;
import io.gmss.fiscad.paylaods.response.SyncResponse;
@@ -25,11 +28,11 @@ public interface SynchronisationService {
public List<SyncResponse> syncUniteLogement(List<UniteLogementPaylaod> uniteLogementPaylaods);
public List<SyncResponse> syncCaracteristiqueBatiment(List<CaracteristiqueBatimentPaylod> caracteristiqueBatimentPaylods);
public List<SyncResponse> syncCaracteristiqueBatiment(List<CaracteristiqueBatimentPayload> CaracteristiqueBatimentPayloads);
public List<SyncResponse> syncCaracteristiqueParcelle(List<CaracteristiqueParcellePaylod> caracteristiqueParcellePaylods);
public List<SyncResponse> syncCaracteristiqueParcelle(List<CaracteristiqueParcellePayload> CaracteristiqueParcellePayloads);
public List<SyncResponse> syncCaracteristiqueUniteLogement(List<CaracteristiqueUniteLogementPaylod> caracteristiqueUniteLogementPaylods);
public List<SyncResponse> syncCaracteristiqueUniteLogement(List<CaracteristiqueUniteLogementPayload> CaracteristiqueUniteLogementPayloads);
public List<SyncResponse> syncMembreGroupe(List<MembreGroupePayLoad> membreGroupePayLoads);

4
src/main/java/io/gmss/fiscad/paylaods/Critere.java
View File

@@ -1,7 +1,7 @@
package io.gmss.fiscad.paylaods;
import io.gmss.fiscad.enums.StatusEnquete;
import io.gmss.fiscad.enums.StatutEnquete;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -14,7 +14,7 @@ import java.util.Date;
public class Critere {
private String search;
private StatusEnquete status;
private StatutEnquete status;
private Date startDate;
private Date endDate;
}

4
src/main/java/io/gmss/fiscad/paylaods/StatusResponse.java
View File

@@ -1,6 +1,6 @@
package io.gmss.fiscad.paylaods;
import io.gmss.fiscad.enums.StatusEnquete;
import io.gmss.fiscad.enums.StatutEnquete;
import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
@@ -10,5 +10,5 @@ import lombok.NoArgsConstructor;
@NoArgsConstructor
public class StatusResponse {
private StatusEnquete status;
private StatutEnquete status;
}

8
src/main/java/io/gmss/fiscad/paylaods/dto/PersonneCompletDTO.java
View File

@@ -13,6 +13,7 @@ import lombok.AllArgsConstructor;
import lombok.Data;
import lombok.NoArgsConstructor;
import java.time.LocalDate;
import java.util.List;
@Data
@@ -21,11 +22,12 @@ import java.util.List;
public class PersonneCompletDTO {
private Long id;
private String ifu;
private String nomOuSigle;
private String prenomOuRaisonSociale;
private String nom;
private String prenom;
private String raisonSociale;
private String numRavip;
private String npi;
private String dateNaissanceOuConsti;
private LocalDate dateNaissanceOuConsti;
private String lieuNaissance;
private String tel1;
private String tel2;

1
src/main/java/io/gmss/fiscad/paylaods/dto/PersonneSimpleDTO.java
View File

@@ -11,4 +11,5 @@ public class PersonneSimpleDTO {
private Long id;
private String nom;
private String prenom;
private String raisonSociale;
}

1
src/main/java/io/gmss/fiscad/paylaods/request/EnqueteAllDataPayload.java
View File

@@ -1,5 +1,6 @@
package io.gmss.fiscad.paylaods.request;
import io.gmss.fiscad.paylaods.request.synchronisation.*;
import lombok.Data;
import java.util.List;

79
src/main/java/io/gmss/fiscad/paylaods/request/PersonnePayLoad.java
View File

@@ -1,79 +0,0 @@
package io.gmss.fiscad.paylaods.request;
import io.gmss.fiscad.entities.infocad.parametre.Personne;
import io.gmss.fiscad.enums.Categorie;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import lombok.Data;
import org.hibernate.annotations.ColumnDefault;
@Data
public class PersonnePayLoad {
private Long idBackend;
private String ifu;
private Long externalKey;
private String nomOuSigle;
private String prenomOuRaisonSociale;
private String numRavip;
private String npi;
private String dateNaissanceOuConsti;
private String lieuNaissance;
private String tel1;
private String tel2;
private String adresse;
@Enumerated(EnumType.STRING)
private Categorie categorie;
private Long situationMatrimonialeId;
private Long nationaliteId;
private Long typePersonneId;
private Long professionId;
private Long communeId;
private String observation;
private boolean synchronise;
private Long terminalId;
private Long personneId;
/////////////////////////////
@ColumnDefault("0")
private int haveRepresentant;
private String ravipQuestion;
private String age;
private String nomJeuneFille;
private String nomMere;
private String prenomMere;
private String indicatifTel1;
private String indicatifTel2;
private String sexe;
@ColumnDefault("0")
private int mustHaveRepresentant;
private String filePath;
@Override
public String toString() {
return "PersonnePayLoad{ " +
"idBackend=" + idBackend +
", ifu='" + ifu + '\'' +
", externalKey=" + externalKey +
", nomOuSigle='" + nomOuSigle + '\'' +
", prenomOuRaisonSociale='" + prenomOuRaisonSociale + '\'' +
", numRavip='" + numRavip + '\'' +
", npi='" + npi + '\'' +
", dateNaissanceOuConsti='" + dateNaissanceOuConsti + '\'' +
", lieuNaissance='" + lieuNaissance + '\'' +
", tel1='" + tel1 + '\'' +
", tel2='" + tel2 + '\'' +
", adresse='" + adresse + '\'' +
", categorie=" + categorie +
", situationMatrimonialeId=" + situationMatrimonialeId +
", nationaliteId=" + nationaliteId +
", typePersonneId=" + typePersonneId +
", professionId=" + professionId +
", communeId=" + communeId +
", Observation='" + observation + '\'' +
", synchronise=" + synchronise +
", terminalId=" + terminalId +
'}';
}
}

15
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/BatimentPaylaodWeb.java Normal file
View File

@@ -0,0 +1,15 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
import java.time.LocalDate;
@Data
public class BatimentPaylaodWeb {
private Long id;
private String nub;
private String code;
private LocalDate dateConstruction;
private Long parcelleId;
private String observation;
}

12
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueBatimentPayloadWeb.java Normal file
View File

@@ -0,0 +1,12 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
@Data
public class CaracteristiqueBatimentPayloadWeb {
private Long id;
private Long enqueteBatimentId;
private Long caracteristiqueId;
private String valeur;
private String observation;
}

12
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueParcellePayloadWeb.java Normal file
View File

@@ -0,0 +1,12 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
@Data
public class CaracteristiqueParcellePayloadWeb {
private Long id;
private Long enqueteId;
private Long caracteristiqueId;
private String valeur;
private String observation;
}

12
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/CaracteristiqueUniteLogementPayloadWeb.java Normal file
View File

@@ -0,0 +1,12 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
@Data
public class CaracteristiqueUniteLogementPayloadWeb {
private Long id;
private Long enqueteUniteLogementId;
private Long caracteristiqueId;
private String valeur;
private String observation;
}

18
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/DeclarationNcPayloadWeb.java Normal file
View File

@@ -0,0 +1,18 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class DeclarationNcPayloadWeb {
private Long id;
private LocalDate dateDerniereDeclaration;
private String nc;
private Long structureId;
private Long enqueteId;
private Long personneId;
private String observation;
private List<UploadPayLoadWeb> uploadPayLoadWebs;
}

28
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteActivitePayLoadWeb.java Normal file
View File

@@ -0,0 +1,28 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class EnqueteActivitePayLoadWeb {
private Long id;
private Long ChiffreAffaire; // Todo : Revoir le nom de la variable 15/12/2015
private String NumeroRccm;
private String observation;
private LocalDate dateDemarrage;
private LocalDate dateFin;
private LocalDate dateEnquete;
private boolean estDeclarer;
private String nc;
private Long enqueteId;
private Long structureId;
private Long personneId;
private Long batimentId;
private Long parcelleId;
private Long uniteLogementId;
private Long professionId;
private List<UploadPayLoadWeb> uploadPayLoadWebs;
}

41
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteBatimentPayloadWeb.java Normal file
View File

@@ -0,0 +1,41 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import io.gmss.fiscad.entities.rfu.metier.CaracteristiqueBatiment;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class EnqueteBatimentPayloadWeb {
private Long id;
private BatimentPaylaodWeb batimentPaylaodWeb ;
private List<CaracteristiqueBatimentPayloadWeb> caracteristiqueBatimentPayloadWebs;
private List<UploadPayLoadWeb> uploadPayLoadWebs;
private String observation;
private float surfaceAuSol;
private String autreMenuisierie;
private String autreMur;
private boolean sbee;
private String numCompteurSbee;
private boolean soneb;
private String numCompteurSoneb;
private int nbreLotUnite;
private int nbreUniteLocation;
private float surfaceLouee;
private int nbreMenage;
private int nbreHabitant;
private Long montantMensuelLocation;
private Long montantLocatifAnnuelDeclare;
private Long nbreEtage;
private Long valeurBatimentEstime;
private Long valeurBatimentReel;
private int nbreMoisLocation;
private String autreCaracteristiquePhysique;
private LocalDate dateDebutExcemption;
private LocalDate dateFinExcemption;
private Long enqueteId;
private Long personneId;
private Long EnqueteurId;
}

48
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnquetePayLoadWeb.java Normal file
View File

@@ -0,0 +1,48 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import io.gmss.fiscad.enums.StatutEnquete;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class EnquetePayLoadWeb {
private Long id;
private LocalDate dateEnquete;
private LocalDate dateFinalisation;
private boolean litige;
private ParcellePayLoadWeb parcellePayLoadWeb;
private List<CaracteristiqueParcellePayloadWeb> caracteristiqueParcellePayloadWebs;
private List<DeclarationNcPayloadWeb> declarationNcPayloadWebs;
private List<PiecePayLoadWeb> piecePayLoadWebs;
@Enumerated(EnumType.STRING)
private StatutEnquete statutEnquete;
private String descriptionMotifRejet;
private String observation;
private String numeroTitreFoncier;
private LocalDate dateTitreFoncier;
private String numEnterParcelle;
private String numRue;
private String nomRue;
private float precision;
private int nbreCoProprietaire;
private int nbreIndivisiaire;
private String autreAdresse;
private float superficie;
private int nbreBatiment;
private int nbrePiscine;
private LocalDate dateDebutExemption;
private LocalDate dateFinExemption;
private String autreNumeroTitreFoncier;
private Long EquipeId;
private Long zoneRfuId;
private Long proprietaireId;
private Long EnqueteurId;
private Long montantMensuelleLocation;
private Long montantAnnuelleLocation;
private Long valeurParcelleEstime;
private Long valeurParcelleReel;
}

38
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/EnqueteUniteLogementPayloadWeb.java Normal file
View File

@@ -0,0 +1,38 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class EnqueteUniteLogementPayloadWeb {
private Long id;
private UniteLogementPaylaodWeb uniteLogementPaylaodWeb ;
private List<CaracteristiqueUniteLogementPayloadWeb> caracteristiqueUniteLogementPayloadWebs;
private List<UploadPayLoadWeb> uploadPayLoadWebs;
private String observation;
private Long userId;
private float surface;
private int nbrePiece;
private int nbreHabitant;
private int nbreMenage;
private boolean enLocation;
private int nbreMoisLocation;
private Long montantMensuelLoyer;
private Long montantLocatifAnnuelDeclare;
private Long valeurUniteLogementEstime;
private Long valeurUniteLogementReel;
private float SurfaceAuSol;
private float surfaceLouee;
private boolean sbee;
private boolean soneb;
private String numCompteurSbee;
private String numCompteurSoneb;
private LocalDate dateDebutExcemption;
private LocalDate dateFinExcemption;
private Long enqueteId;
private Long uniteLogementId;
private Long personneId;
}

26
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/ParcellePayLoadWeb.java Normal file
View File

@@ -0,0 +1,26 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
@Data
public class ParcellePayLoadWeb {
private Long id;
private String q;
private String i;
private String p;
private String nup;
private String nupProvisoire;
private String numTitreFoncier;
private String longitude;
private String latitude;
private String altitude;
private String emplacement;
private Long situationGeographiqueId;
private Long natureDomaineId;
private Long quartierId;
private float superficie;
private String observation;
private Long typeDomaineId;
private String situationGeographique;
private Long rueId;
}

48
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PersonnePayLoadWeb.java Normal file
View File

@@ -0,0 +1,48 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import io.gmss.fiscad.enums.Categorie;
import jakarta.persistence.EnumType;
import jakarta.persistence.Enumerated;
import lombok.Data;
import org.hibernate.annotations.ColumnDefault;
import java.time.LocalDate;
@Data
public class PersonnePayLoadWeb {
private Long id;
private String ifu;
private String nom;
private String prenom;
private String raisonSociale;
private String numRavip;
private String npi;
private LocalDate dateNaissanceOuConsti;
private String lieuNaissance;
private String tel1;
private String tel2;
private String adresse;
@Enumerated(EnumType.STRING)
private Categorie categorie;
private Long situationMatrimonialeId;
private Long nationaliteId;
private Long typePersonneId;
private Long professionId;
private Long communeId;
private String observation;
private Long personneId;
/////////////////////////////
@ColumnDefault("0")
private int haveRepresentant;
private String ravipQuestion;
private String age;
private String nomJeuneFille;
private String nomMere;
private String prenomMere;
private String indicatifTel1;
private String indicatifTel2;
private String sexe;
}

23
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/PiecePayLoadWeb.java Normal file
View File

@@ -0,0 +1,23 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
import java.time.LocalDate;
import java.util.List;
@Data
public class PiecePayLoadWeb {
private Long id;
private LocalDate dateExpiration;
private LocalDate dateEtablissement;
private String numeroPiece;
private String url;
private Long typePieceId;
private Long personneId;
private Long sourceDroitId;
private Long modeAcquisitionId;
private String observation;
private Long enqueteId;
private List<UploadPayLoadWeb> uploadPayLoadWebs;
}

16
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UniteLogementPaylaodWeb.java Normal file
View File

@@ -0,0 +1,16 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
import java.time.LocalDate;
@Data
public class UniteLogementPaylaodWeb {
private Long id;
private String nul;
private String numeroEtage;
private String code;
private Long batimentId;
private String observation;
private LocalDate dateConstruction;
}

24
src/main/java/io/gmss/fiscad/paylaods/request/crudweb/UploadPayLoadWeb.java Normal file
View File

@@ -0,0 +1,24 @@
package io.gmss.fiscad.paylaods.request.crudweb;
import lombok.Data;
@Data
public class UploadPayLoadWeb {
private Long id;
private Long pieceId;
private String Observation;
//private boolean synchronise;
//private String fileBase64;
/////////////////////////////////
private String name;
private String filePath;
private Long enqueteId;
private Long enqueteBatimentId;
private Long personneId;
private Long enqueteUniteLogementId;
private Long declarationNcId;
private String reference;
private String description;
private String rename;
}

Some files were not shown because too many files have changed in this diff Show More