feat: add abroad residency flag on tenant

MTES-MCT · Nov 19, 2024 · ff2f341 · ff2f341
1 parent 96486b3
commit ff2f341
Show file tree

Hide file tree

Showing 12 changed files with 27 additions and 7 deletions.
diff --git a/...ant/src/main/java/fr/dossierfacile/api/front/model/dfc/apartment_sharing/TenantModel.java b/...ant/src/main/java/fr/dossierfacile/api/front/model/dfc/apartment_sharing/TenantModel.java
@@ -24,6 +24,7 @@ public class TenantModel {
     private String lastName;
     private String preferredName;
     private String zipCode;
+    private Boolean abroad;
     private String email;
     private TenantType tenantType;
     private TenantFileStatus status;

diff --git a/...rfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/model/tenant/TenantModel.java b/...rfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/model/tenant/TenantModel.java
@@ -22,6 +22,7 @@ public class TenantModel {
     private String lastName;
     private String preferredName;
     private String zipCode;
+    private Boolean abroad;
     private String email;
     private TenantType tenantType;
     private TenantFileStatus status;

diff --git a/...e-api-tenant/src/main/java/fr/dossierfacile/api/front/register/form/tenant/NamesForm.java b/...e-api-tenant/src/main/java/fr/dossierfacile/api/front/register/form/tenant/NamesForm.java
@@ -14,17 +14,13 @@
 @NoArgsConstructor
 @CheckFranceConnect(groups = Dossier.class)
 public class NamesForm implements FormWithTenantId {
-
     @NotNull
     private Long tenantId;
-
     @NotBlank
     private String firstName;
-
     @NotBlank
     private String lastName;
-
     private String preferredName;
-
     private String zipCode;
+    private Boolean abroad;
 }
diff --git a/dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/register/tenant/Names.java b/dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/register/tenant/Names.java
@@ -56,6 +56,7 @@ public TenantModel saveStep(Tenant tenant, NamesForm namesForm) {
         }
         tenant.setPreferredName(namesForm.getPreferredName());
         tenant.setZipCode(namesForm.getZipCode());
+        tenant.setAbroad(namesForm.getAbroad());
         tenant.lastUpdateDateProfile(LocalDateTime.now(), null);
         apartmentSharingService.resetDossierPdfGenerated(tenant.getApartmentSharing());
         tenant = tenantStatusService.updateTenantStatus(tenant);

diff --git a/dossierfacile-bo/src/main/java/fr/gouv/bo/model/tenant/TenantModel.java b/dossierfacile-bo/src/main/java/fr/gouv/bo/model/tenant/TenantModel.java
@@ -25,6 +25,7 @@ public class TenantModel {
     private String lastName;
     private String preferredName;
     private String zipCode;
+    private Boolean abroad;
     private String email;
     private TenantType tenantType;
     private TenantFileStatus status;

diff --git a/dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html b/dossierfacile-bo/src/main/resources/templates/bo/apartment-sharing-view.html
@@ -542,7 +542,10 @@ <h5 class="modal-title bold" style="width: 80%;float: left;">
                                 </tr>
                                 <tr>
                                     <td>Code postal</td>
-                                    <td th:text="${tenant.getZipCode()}"></td>
+                                    <td>
+                                        <span th:text="${tenant.getZipCode()}"></span>
+                                        <span th:if="${tenant.abroad == true}">À l'étranger</span>
+                                    </td>
                                 </tr>
                                 <tr>
                                     <td>Type de compte</td>

diff --git a/dossierfacile-common-library/src/main/java/fr/dossierfacile/common/entity/Tenant.java b/dossierfacile-common-library/src/main/java/fr/dossierfacile/common/entity/Tenant.java
@@ -80,6 +80,8 @@ public class Tenant extends User implements Person, Serializable {
 
     private String zipCode;
 
+    private Boolean abroad;
+
     @Builder.Default
     private Boolean honorDeclaration = Boolean.FALSE;
 

diff --git a/...on-library/src/main/java/fr/dossierfacile/common/model/apartment_sharing/TenantModel.java b/...on-library/src/main/java/fr/dossierfacile/common/model/apartment_sharing/TenantModel.java
@@ -25,6 +25,7 @@ public class TenantModel {
     private String lastName;
     private String preferredName;
     private String zipCode;
+    private Boolean abroad;
     private String email;
     private TenantType tenantType;
     private Boolean franceConnect;

diff --git a/...le-common-library/src/main/java/fr/dossierfacile/common/model/log/DeletedTenantModel.java b/...le-common-library/src/main/java/fr/dossierfacile/common/model/log/DeletedTenantModel.java
@@ -25,6 +25,7 @@
 public class DeletedTenantModel {
     private Long id;
     private String zipCode;
+    private Boolean abroad;
     private String hashedEmail;
     private String hashedLastname;
     private String hashedFirstname;

diff --git a/dossierfacile-common-library/src/main/resources/db/changelog/databaseChangeLog.xml b/dossierfacile-common-library/src/main/resources/db/changelog/databaseChangeLog.xml
@@ -157,6 +157,6 @@
     <include file="db/migration/202409300000-update-userapi.xml"/>
     <include file="db/migration/202410070000-update-jsonprofile-owner_log.xml"/>
     <include file="db/migration/202410181600-add-column-dpe-not-required.xml"/>
-
+    <include file="db/migration/202411190000-add-column-abroad-residency.xml"/>
 
 </databaseChangeLog>
diff --git a/...mmon-library/src/main/resources/db/migration/202411190000-add-column-abroad-residency.xml b/...mmon-library/src/main/resources/db/migration/202411190000-add-column-abroad-residency.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<databaseChangeLog
+        xmlns="http://www.liquibase.org/xml/ns/dbchangelog"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://www.liquibase.org/xml/ns/dbchangelog
+                      http://www.liquibase.org/xml/ns/dbchangelog/dbchangelog-3.10.xsd">
+    <changeSet id="202411190000" author="fabien">
+        <addColumn tableName="tenant">
+            <column name="abroad" type="BOOL" defaultValue="false"/>
+        </addColumn>
+    </changeSet>
+</databaseChangeLog>
diff --git a/...er/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java b/...er/src/main/java/fr/dossierfacile/scheduler/tasks/tenantwarning/TenantWarningService.java
@@ -67,6 +67,7 @@ private void handleWarning2(Tenant t) {
         t.setHonorDeclaration(false);
         t.setStatus(TenantFileStatus.ARCHIVED);
         t.setZipCode("");
+        t.setAbroad(null);
         t.setClarification("");
         t.setLastUpdateDate(LocalDateTime.now());
         t = tenantRepository.save(t);