From 1293a481468fb5e8a16dc592e8324fe79e67967d Mon Sep 17 00:00:00 2001 From: Matthieu Bollot Date: Mon, 21 Oct 2024 15:39:55 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9C=A8=20Feat(owner):=20allow=20to=20have=20?= =?UTF-8?q?no=20DPE=20(#885)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../property/LightPropertyModel.java | 1 + .../property/PropertyController.java | 3 ++- .../dossierfacileapiowner/property/PropertyForm.java | 2 ++ .../property/PropertyModel.java | 1 + .../property/PropertyServiceImpl.java | 3 +++ .../fr/dossierfacile/common/entity/Property.java | 3 +++ .../resources/db/changelog/databaseChangeLog.xml | 1 + .../202410181600-add-column-dpe-not-required.xml | 12 ++++++++++++ 8 files changed, 25 insertions(+), 1 deletion(-) create mode 100644 dossierfacile-common-library/src/main/resources/db/migration/202410181600-add-column-dpe-not-required.xml diff --git a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/LightPropertyModel.java b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/LightPropertyModel.java index ce8356abc..b44afa1c5 100644 --- a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/LightPropertyModel.java +++ b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/LightPropertyModel.java @@ -34,4 +34,5 @@ public class LightPropertyModel { private Integer propertyApartmentSharingCount; private String ademeNumber; private ObjectNode ademeApiResult; + private Boolean dpeNotRequired; } diff --git a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyController.java b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyController.java index ddcf40c15..e71c6e72c 100644 --- a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyController.java +++ b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyController.java @@ -18,6 +18,7 @@ import org.springframework.web.bind.annotation.DeleteMapping; import org.springframework.web.bind.annotation.GetMapping; import org.springframework.web.bind.annotation.PathVariable; +import org.springframework.web.bind.annotation.PostMapping; import org.springframework.web.bind.annotation.PutMapping; import org.springframework.web.bind.annotation.RequestBody; import org.springframework.web.bind.annotation.RequestMapping; @@ -46,7 +47,7 @@ public class PropertyController { private final OwnerMapper ownerMapper; private final PropertyMapper propertyMapper; - @PutMapping + @PostMapping public ResponseEntity createOrUpdate(HttpServletResponse response, @RequestBody PropertyForm Property) throws HttpResponseException, InterruptedException { try { PropertyModel propertyModel; diff --git a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyForm.java b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyForm.java index fd343ea04..8bb3b2ad1 100644 --- a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyForm.java +++ b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyForm.java @@ -41,4 +41,6 @@ public class PropertyForm { private String ademeNumber; + private Boolean dpeNotRequired; + } diff --git a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyModel.java b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyModel.java index 7833012f3..42ab62295 100644 --- a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyModel.java +++ b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyModel.java @@ -34,4 +34,5 @@ public class PropertyModel { private String dpeDate; private String ademeNumber; private ObjectNode ademeApiResult; + private Boolean dpeNotRequired; } diff --git a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyServiceImpl.java b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyServiceImpl.java index ec1c932ce..ebe4196fb 100644 --- a/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyServiceImpl.java +++ b/dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/property/PropertyServiceImpl.java @@ -113,6 +113,9 @@ public PropertyModel createOrUpdate(PropertyForm propertyForm) throws HttpRespon mailService.sendEmailValidatedProperty(owner, property); ownerLogService.saveLog(OwnerLogType.PROPERTY_COMPLETED, owner.getId()); } + if (propertyForm.getDpeNotRequired() != null) { + property.setDpeNotRequired(propertyForm.getDpeNotRequired()); + } property.setOwner(owner); return propertyMapper.toPropertyModel(propertyRepository.save(property)); } diff --git a/dossierfacile-common-library/src/main/java/fr/dossierfacile/common/entity/Property.java b/dossierfacile-common-library/src/main/java/fr/dossierfacile/common/entity/Property.java index 10d42b394..dc2ef1e38 100644 --- a/dossierfacile-common-library/src/main/java/fr/dossierfacile/common/entity/Property.java +++ b/dossierfacile-common-library/src/main/java/fr/dossierfacile/common/entity/Property.java @@ -134,6 +134,9 @@ public class Property implements Serializable { @Nullable private Date dpeDate; + @Column + private Boolean dpeNotRequired; + @Override public String toString() { return this.name; diff --git a/dossierfacile-common-library/src/main/resources/db/changelog/databaseChangeLog.xml b/dossierfacile-common-library/src/main/resources/db/changelog/databaseChangeLog.xml index 01f766bda..5eaa04803 100644 --- a/dossierfacile-common-library/src/main/resources/db/changelog/databaseChangeLog.xml +++ b/dossierfacile-common-library/src/main/resources/db/changelog/databaseChangeLog.xml @@ -156,6 +156,7 @@ + diff --git a/dossierfacile-common-library/src/main/resources/db/migration/202410181600-add-column-dpe-not-required.xml b/dossierfacile-common-library/src/main/resources/db/migration/202410181600-add-column-dpe-not-required.xml new file mode 100644 index 000000000..7de311c2b --- /dev/null +++ b/dossierfacile-common-library/src/main/resources/db/migration/202410181600-add-column-dpe-not-required.xml @@ -0,0 +1,12 @@ + + + + + + + +