FINERACT-2455: Improved DTO and field value handling

Author: adamsaghy

fineract-accounting/src/main/resources/jpa/static-weaving/module/fineract-accounting/persistence.xml

@@ -87,6 +87,7 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.weaving" value="static" />
+            <property name="eclipselink.weaving.internal" value="false"/>
         </properties>
     </persistence-unit>
 </persistence>

fineract-branch/src/main/resources/jpa/static-weaving/module/fineract-branch/persistence.xml

@@ -94,6 +94,7 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.weaving" value="static" />
+            <property name="eclipselink.weaving.internal" value="false"/>
         </properties>
     </persistence-unit>
 </persistence>

fineract-charge/src/main/resources/jpa/static-weaving/module/fineract-charge/persistence.xml

@@ -87,6 +87,7 @@
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.weaving" value="static" />
+            <property name="eclipselink.weaving.internal" value="false"/>
         </properties>
     </persistence-unit>
 </persistence>

fineract-cob/src/main/java/org/apache/fineract/cob/domain/AccountLock.java

@@ -27,6 +27,7 @@
 import jakarta.persistence.PrePersist;
 import jakarta.persistence.Transient;
 import jakarta.persistence.Version;
+import java.io.Serial;
 import java.io.Serializable;
 import java.time.LocalDate;
 import java.time.OffsetDateTime;
@@ -38,47 +39,41 @@
 import org.springframework.data.domain.Persistable;
 
 @Getter
+@Setter
 @MappedSuperclass
 @NoArgsConstructor
 public abstract class AccountLock implements Persistable<Long>, Serializable {
 
-    protected static final long serialVersionUID = 2272591907035824317L;
+    @Serial
+    private static final long serialVersionUID = 1L;
 
     @Id
-    @Getter
     @Column(name = "loan_id", nullable = false)
-    protected Long loanId;
+    private Long loanId;
 
     @Version
-    @Getter
     @Column(name = "version")
-    protected Long version;
+    private Long version;
 
     @Enumerated(EnumType.STRING)
-    @Getter
     @Column(name = "lock_owner", nullable = false)
-    protected LockOwner lockOwner;
+    private LockOwner lockOwner;
 
     @Column(name = "lock_placed_on", nullable = false)
-    @Getter
-    protected OffsetDateTime lockPlacedOn;
+    private OffsetDateTime lockPlacedOn;
 
     @Column(name = "error")
-    @Getter
-    protected String error;
+    private String error;
 
     @Column(name = "stacktrace")
-    @Getter
-    protected String stacktrace;
+    private String stacktrace;
 
     @Column(name = "lock_placed_on_cob_business_date")
-    @Getter
-    protected LocalDate lockPlacedOnCobBusinessDate;
+    private LocalDate lockPlacedOnCobBusinessDate;
 
     @Transient
     @Setter(value = AccessLevel.NONE)
-    @Getter
-    protected boolean isNew = true;
+    private boolean isNew = true;
 
     @PrePersist
     @PostLoad
@@ -88,7 +83,7 @@ void markNotNew() {
 
     @Override
     public Long getId() {
-        return getLoanId();
+        return loanId;
     }
 
     public AccountLock(Long loanId, LockOwner lockOwner, LocalDate lockPlacedOnCobBusinessDate) {

fineract-cob/src/main/java/org/apache/fineract/cob/service/BeforeStepLockingItemReaderHelper.java

@@ -64,6 +64,6 @@ public LinkedBlockingQueue<Long> filterRemainingData(@NonNull StepExecution step
     private List<Long> getLoanIdsLockedWithChunkProcessingLock(List<Long> loanIds) {
         List<T> accountLocks = new ArrayList<>(
                 loanLockingService.findAllByLoanIdInAndLockOwner(loanIds, LockOwner.LOAN_COB_CHUNK_PROCESSING));
-        return accountLocks.stream().map(T::getLoanId).toList();
+        return accountLocks.stream().map(T::getId).toList();
     }
 }

fineract-cob/src/main/java/org/apache/fineract/cob/tasklet/ApplyCommonLockTasklet.java

@@ -83,7 +83,7 @@ public RepeatStatus execute(@NonNull StepContribution contribution, @NonNull Chu
         loanIdPartitions.forEach(loanIdPartition -> accountLocks.addAll(loanLockingService.findAllByLoanIdIn(loanIdPartition)));
 
         List<Long> toBeProcessedLoanIds = new ArrayList<>(loanIds);
-        List<Long> alreadyLockedAccountIds = accountLocks.stream().map(AccountLock::getLoanId).toList();
+        List<Long> alreadyLockedAccountIds = accountLocks.stream().map(AccountLock::getId).toList();
 
         toBeProcessedLoanIds.removeAll(alreadyLockedAccountIds);
         try {

fineract-cob/src/main/resources/jpa/static-weaving/module/fineract-cob/persistence.xml

@@ -66,10 +66,12 @@
         <class>org.apache.fineract.infrastructure.codes.domain.CodeValue</class>
 
         <!-- COB Module Entities -->
-
+        <class>org.apache.fineract.cob.domain.AccountLock</class>
+        <class>org.apache.fineract.cob.domain.BatchBusinessStep</class>
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
         <properties>
             <property name="eclipselink.weaving" value="static" />
+            <property name="eclipselink.weaving.internal" value="false"/>
         </properties>
     </persistence-unit>
 </persistence>

fineract-core/src/main/java/org/apache/fineract/infrastructure/core/serialization/FromJsonHelper.java

@@ -329,4 +329,8 @@ public <T extends Enum<T>> T enumValueOfParameterNamed(String parameterName, fin
                     "Enum value not exists: ", enumType.getName(), value)), e);
         }
     }
+
+    public Integer extractIntegerNamed(String paramName, JsonObject element) {
+        return extractIntegerNamed(paramName, element, new HashSet<>());
+    }
 }

fineract-core/src/main/java/org/apache/fineract/portfolio/delinquency/domain/DelinquencyBucket.java

@@ -21,6 +21,7 @@
 import jakarta.persistence.CascadeType;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
+import jakarta.persistence.EnumType;
 import jakarta.persistence.Enumerated;
 import jakarta.persistence.FetchType;
 import jakarta.persistence.JoinColumn;
@@ -51,10 +52,10 @@ public class DelinquencyBucket extends AbstractAuditableWithUTCDateTimeCustom<Lo
     @JoinTable(name = "m_delinquency_bucket_mappings", joinColumns = @JoinColumn(name = "delinquency_bucket_id"), inverseJoinColumns = @JoinColumn(name = "delinquency_range_id"))
     private List<DelinquencyRange> ranges;
 
-    @OneToOne(mappedBy = "bucket", fetch = FetchType.LAZY, cascade = CascadeType.ALL)
+    @OneToOne(mappedBy = "bucket", cascade = CascadeType.ALL, orphanRemoval = true)
     private DelinquencyMinimumPaymentPeriodAndRule minimumPaymentPeriodAndRule;
 
-    @Enumerated
+    @Enumerated(EnumType.STRING)
     @Column(name = "bucket_type")
     private DelinquencyBucketType bucketType;
 

fineract-core/src/main/java/org/apache/fineract/portfolio/delinquency/domain/DelinquencyBucketType.java

@@ -20,28 +20,27 @@
 package org.apache.fineract.portfolio.delinquency.domain;
 
 import java.util.Arrays;
+import java.util.List;
 import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+import org.apache.fineract.infrastructure.core.data.StringEnumOptionData;
 
+@Getter
+@RequiredArgsConstructor
 public enum DelinquencyBucketType {
 
-    REGULAR(1L, "bucketType.regular"), //
-    WORKING_CAPITAL(2L, "bucketType.workingCapital");
+    REGULAR(1L, "bucketType.regular", "Reqular Loan Product"), //
+    WORKING_CAPITAL(2L, "bucketType.workingCapital", "Working Capital Loan Product");
 
-    @Getter
-    private final Long value;
-
-    @Getter
+    private final Long id;
     private final String code;
+    private final String description;
 
-    DelinquencyBucketType(Long value, String code) {
-        this.value = value;
-        this.code = code;
+    public static List<StringEnumOptionData> toStringEnumOptions() {
+        return Arrays.stream(values()).map(DelinquencyBucketType::toData).toList();
     }
 
-    public static DelinquencyBucketType fromLong(Long value) {
-        if (value == null) {
-            return null;
-        }
-        return Arrays.stream(DelinquencyBucketType.values()).filter(v -> v.getValue().equals(value)).findAny().orElse(REGULAR);
+    public StringEnumOptionData toData() {
+        return new StringEnumOptionData(name(), getCode(), getDescription());
     }
 }