Chore/clean models

dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/log/OwnerLogServiceImpl.java

@@ -4,6 +4,7 @@
 import fr.dossierfacile.common.entity.Owner;
 import fr.dossierfacile.common.entity.OwnerLog;
 import fr.dossierfacile.common.enums.OwnerLogType;
+import fr.dossierfacile.common.mapper.log.DeletedOwnerMapper;
 import fr.dossierfacile.common.utils.MapperUtil;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -17,7 +18,6 @@
 public class OwnerLogServiceImpl implements OwnerLogService {
     private final OwnerLogRepository repository;
     private final DeletedOwnerMapper deletedOwnerMapper;
-
     private final ObjectMapper objectMapper = MapperUtil.newObjectMapper();
 
     private void saveLog(OwnerLog log) {

dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/model/dfc/apartment_sharing/ApartmentSharingModel.java

@@ -11,9 +11,9 @@
 import java.util.List;
 
 @Data
-@AllArgsConstructor
-@NoArgsConstructor
 @Builder
+@NoArgsConstructor
+@AllArgsConstructor
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class ApartmentSharingModel {
     private Long id;

dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/model/dfc/apartment_sharing/TenantModel.java

@@ -2,6 +2,7 @@
 
 import com.fasterxml.jackson.annotation.JsonInclude;
 import fr.dossierfacile.api.front.model.tenant.DocumentModel;
+import fr.dossierfacile.api.front.model.tenant.GuarantorModel;
 import fr.dossierfacile.common.enums.TenantFileStatus;
 import fr.dossierfacile.common.enums.TenantType;
 import lombok.AllArgsConstructor;
@@ -13,9 +14,9 @@
 import java.util.List;
 
 @Data
+@Builder
 @AllArgsConstructor
 @NoArgsConstructor
-@Builder
 @JsonInclude(JsonInclude.Include.NON_NULL)
 public class TenantModel {
     private Long id;
@@ -33,4 +34,4 @@ public class TenantModel {
     private List<DocumentModel> documents;
     private List<GuarantorModel> guarantors;
     private boolean franceConnect;
-}
+}

dossierfacile-api-tenant/src/main/java/fr/dossierfacile/api/front/model/tenant/DocumentModel.java

@@ -20,9 +20,6 @@
 public class DocumentModel {
     private Long id;
     private DocumentCategory documentCategory;
-    // TODO We should use documentSubCategory
-    @Deprecated
-    private DocumentSubCategory subCategory;
     private DocumentSubCategory documentSubCategory;
     private Boolean noDocument;
     private String customText;

dossierfacile-common-library/src/main/java/fr/dossierfacile/common/mapper/MapDocumentCategories.java

@@ -11,8 +11,5 @@
 @Retention(RetentionPolicy.CLASS)
 @Mapping(target = "documentCategory", expression = "java(categoriesMapper.mapCategory(document.getDocumentCategory(), userApi))")
 @Mapping(target = "documentSubCategory", expression = "java(categoriesMapper.mapSubCategory(document.getDocumentSubCategory(), userApi))")
-// TODO use documentSubCategory
-@Deprecated
-@Mapping(target = "subCategory", expression = "java(userApi == null ? categoriesMapper.mapSubCategory(document.getDocumentSubCategory(), userApi) : null)")
 public @interface MapDocumentCategories {
 }

dossierfacile-api-owner/src/main/java/fr/dossierfacile/api/dossierfacileapiowner/log/DeletedOwnerMapper.java → dossierfacile-common-library/src/main/java/fr/dossierfacile/common/mapper/log/DeletedOwnerMapper.java

@@ -1,7 +1,8 @@
-package fr.dossierfacile.api.dossierfacileapiowner.log;
+package fr.dossierfacile.common.mapper.log;
 
 import com.google.common.hash.Hashing;
 import fr.dossierfacile.common.entity.Owner;
+import fr.dossierfacile.common.model.log.DeletedOwnerModel;
 import org.mapstruct.Mapper;
 import org.mapstruct.Mapping;
 import org.mapstruct.Named;
@@ -21,9 +22,9 @@ static String hash(String value) {
         return Hashing.sha256().hashString(value, StandardCharsets.UTF_8).toString();
     }
 
-    @Mapping(target = "hEmail", source = "email", qualifiedByName = "hashString")
-    @Mapping(target = "hFirstName", source = "firstName", qualifiedByName = "hashString")
-    @Mapping(target = "hLastName", source = "lastName", qualifiedByName = "hashString")
-    @Mapping(target = "hPreferredName", source = "preferredName", qualifiedByName = "hashString")
+    @Mapping(target = "hashedEmail", source = "email", qualifiedByName = "hashString")
+    @Mapping(target = "hashedLastname", source = "lastName", qualifiedByName = "hashString")
+    @Mapping(target = "hashedFirstname", source = "firstName", qualifiedByName = "hashString")
+    @Mapping(target = "hashedPreferredName", source = "preferredName", qualifiedByName = "hashString")
     DeletedOwnerModel toDeletedOwnerModel(Owner owner);
 }

dossierfacile-common-library/src/main/java/fr/dossierfacile/common/mapper/log/DeletedTenantMapper.java

@@ -0,0 +1,36 @@
+package fr.dossierfacile.common.mapper.log;
+
+import com.google.common.hash.Hashing;
+import fr.dossierfacile.common.entity.Document;
+import fr.dossierfacile.common.entity.Tenant;
+import fr.dossierfacile.common.model.log.DeletedTenantModel;
+import fr.dossierfacile.common.model.apartment_sharing.DocumentModel;
+import org.mapstruct.Mapper;
+import org.mapstruct.Mapping;
+import org.mapstruct.Named;
+import org.springframework.stereotype.Component;
+
+import java.nio.charset.StandardCharsets;
+
+@Component
+@Mapper(componentModel = "spring")
+public interface DeletedTenantMapper {
+    @Named("hashString")
+    static String hash(String value) {
+        if (value == null) {
+            return "";
+        }
+        return Hashing.sha256().hashString(value, StandardCharsets.UTF_8).toString();
+    }
+
+    @Mapping(target = "hashedEmail", source = "email", qualifiedByName = "hashString")
+    @Mapping(target = "hashedLastname", source = "lastName", qualifiedByName = "hashString")
+    @Mapping(target = "hashedFirstname", source = "firstName", qualifiedByName = "hashString")
+    @Mapping(target = "hashedPreferredName", source = "preferredName", qualifiedByName = "hashString")
+    @Mapping(target = "applicationType", expression = "java((tenant.getApartmentSharing() != null )? tenant.getApartmentSharing().getApplicationType() : null)")
+    @Mapping(target = "apartmentSharingId", expression = "java((tenant.getApartmentSharing() != null )? tenant.getApartmentSharing().getId() : null)")
+    DeletedTenantModel toDeletedTenantModel(Tenant tenant);
+
+    @Mapping(target = "name", expression = "java((document.getWatermarkFile() != null )? document.getWatermarkFile().getName() : null)")
+    DocumentModel toDocumentModel(Document document);
+}

dossierfacile-common-library/src/main/java/fr/dossierfacile/common/model/apartment_sharing/DocumentModel.java

@@ -18,9 +18,6 @@
 public class DocumentModel {
     private Long id;
     private DocumentCategory documentCategory;
-    // TODO use DocumentSubCategory field
-    @Deprecated
-    private DocumentSubCategory subCategory;
     private DocumentSubCategory documentSubCategory;
     private String customText;
     private Integer monthlySum;

dossierfacile-common-library/src/main/java/fr/dossierfacile/common/model/apartment_sharing/DeletedOwnerModel.java → dossierfacile-common-library/src/main/java/fr/dossierfacile/common/model/log/DeletedOwnerModel.java

@@ -1,19 +1,15 @@
-package fr.dossierfacile.common.model.apartment_sharing;
+package fr.dossierfacile.common.model.log;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
 import com.fasterxml.jackson.databind.annotation.JsonSerialize;
 import com.fasterxml.jackson.datatype.jsr310.ser.LocalDateTimeSerializer;
-import fr.dossierfacile.common.enums.ApplicationType;
-import fr.dossierfacile.common.enums.TenantFileStatus;
-import fr.dossierfacile.common.enums.TenantType;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;
 import lombok.NoArgsConstructor;
 
 import java.time.LocalDateTime;
-import java.util.List;
 
 @Data
 @AllArgsConstructor
@@ -28,9 +24,9 @@ public class DeletedOwnerModel {
     private String hashedPreferredName;
     private Boolean franceConnect;
     @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
     private LocalDateTime creationDateTime;
     @JsonSerialize(using = LocalDateTimeSerializer.class)
-    @JsonFormat(pattern="yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
+    @JsonFormat(pattern = "yyyy-MM-dd'T'HH:mm:ss.SSSSSS")
     private LocalDateTime lastUpdateDate;
-}
+}

dossierfacile-common-library/src/main/java/fr/dossierfacile/common/model/apartment_sharing/DeletedTenantModel.java → dossierfacile-common-library/src/main/java/fr/dossierfacile/common/model/log/DeletedTenantModel.java

@@ -1,4 +1,4 @@
-package fr.dossierfacile.common.model.apartment_sharing;
+package fr.dossierfacile.common.model.log;
 
 import com.fasterxml.jackson.annotation.JsonFormat;
 import com.fasterxml.jackson.annotation.JsonInclude;
@@ -7,6 +7,8 @@
 import fr.dossierfacile.common.enums.ApplicationType;
 import fr.dossierfacile.common.enums.TenantFileStatus;
 import fr.dossierfacile.common.enums.TenantType;
+import fr.dossierfacile.common.model.apartment_sharing.DocumentModel;
+import fr.dossierfacile.common.model.apartment_sharing.GuarantorModel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
 import lombok.Data;