FINERACT-2299: New command processing - Standing instructions history (org.apache.fineract.portfolio.account)

fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/config/SecurityConfig.java

@@ -143,6 +143,10 @@ public SecurityFilterChain filterChain(HttpSecurity http) throws Exception {
                             .requestMatchers(antMatcher(HttpMethod.PUT, "/api/*/instance-mode")).permitAll() //
                             .requestMatchers(antMatcher(HttpMethod.POST, "/api/*/twofactor/validate")).fullyAuthenticated() //
                             .requestMatchers(antMatcher("/api/*/twofactor")).fullyAuthenticated() //
+                            // Standing Instruction History
+                            .requestMatchers(antMatcher("/api/*/standinginstructionrunhistory/**"))
+                            .hasAnyAuthority("READ_STANDINGINSTRUCTION", "ALL_FUNCTIONS", "ALL_FUNCTIONS_READ") //
+                            // Standing Instruction
                             .requestMatchers(antMatcher("/api/**"))
                             .access(allOf(authorizationManagers.toArray(new AuthorizationManager[0]))); //
                 }).httpBasic((httpBasic) -> httpBasic.authenticationEntryPoint(basicAuthenticationEntryPoint())) //

fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/StandingInstructionDTO.java

@@ -18,67 +18,30 @@
  */
 package org.apache.fineract.portfolio.account.data;
 
+import java.io.Serial;
+import java.io.Serializable;
 import java.time.LocalDate;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.fineract.infrastructure.core.service.SearchParameters;
 
-public class StandingInstructionDTO {
-
-    final SearchParameters searchParameters;
-    final Long clientId;
-    final String clientName;
-    final Integer transferType;
-    final Integer fromAccountType;
-    final Long fromAccount;
-    final LocalDate startDateRange;
-    final LocalDate endDateRange;
-
-    public StandingInstructionDTO(final SearchParameters searchParameters, final Integer transferType, final String clientName,
-            final Long clientId, final Long fromAccount, final Integer fromAccountType, final LocalDate startDateRange,
-            final LocalDate endDateRange) {
-        this.searchParameters = searchParameters;
-        this.transferType = transferType;
-        this.clientName = clientName;
-        this.clientId = clientId;
-        this.fromAccount = fromAccount;
-        this.fromAccountType = fromAccountType;
-        this.startDateRange = startDateRange;
-        this.endDateRange = endDateRange;
-    }
-
-    public SearchParameters searchParameters() {
-        return this.searchParameters;
-    }
-
-    public Long clientId() {
-        return this.clientId;
-    }
-
-    public String clientName() {
-        return this.clientName;
-    }
-
-    public Integer transferType() {
-        return this.transferType;
-    }
-
-    public Long fromAccount() {
-        return this.fromAccount;
-    }
-
-    public Integer fromAccountType() {
-        return this.fromAccountType;
-    }
-
-    public Integer getTransferType() {
-        return this.transferType;
-    }
-
-    public LocalDate startDateRange() {
-        return this.startDateRange;
-    }
-
-    public LocalDate endDateRange() {
-        return this.endDateRange;
-    }
-
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StandingInstructionDTO implements Serializable {
+
+    @Serial
+    private static final long serialVersionUID = 1L;
+
+    private SearchParameters searchParameters;
+    private Integer transferType;
+    private String clientName;
+    private Long clientId;
+    private Long fromAccount;
+    private Integer fromAccountType;
+    private LocalDate startDateRange;
+    private LocalDate endDateRange;
 }

fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/StandingInstructionHistoryData.java → fineract-provider/src/main/java/org/apache/fineract/portfolio/account/data/StandingInstructionHistoryResponse.java

@@ -22,33 +22,36 @@
 import java.io.Serializable;
 import java.math.BigDecimal;
 import java.time.LocalDate;
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
 import org.apache.fineract.infrastructure.core.data.EnumOptionData;
 import org.apache.fineract.organisation.office.data.OfficeData;
 import org.apache.fineract.portfolio.client.data.ClientData;
 
-@Getter
-@SuppressWarnings("unused")
-@RequiredArgsConstructor
-public class StandingInstructionHistoryData implements Serializable {
+@Builder
+@Data
+@NoArgsConstructor
+@AllArgsConstructor
+public class StandingInstructionHistoryResponse implements Serializable {
 
     @Serial
     private static final long serialVersionUID = 1L;
 
-    private final Long standingInstructionId;
-    private final String name;
-    private final OfficeData fromOffice;
-    private final ClientData fromClient;
-    private final EnumOptionData fromAccountType;
-    private final PortfolioAccountData fromAccount;
-    private final EnumOptionData toAccountType;
-    private final PortfolioAccountData toAccount;
-    private final OfficeData toOffice;
-    private final ClientData toClient;
-    private final BigDecimal amount;
-    private final String status;
-    private final LocalDate executionTime;
-    private final String errorLog;
+    private Long standingInstructionId;
+    private String name;
+    private OfficeData fromOffice;
+    private ClientData fromClient;
+    private EnumOptionData fromAccountType;
+    private PortfolioAccountData fromAccount;
+    private EnumOptionData toAccountType;
+    private PortfolioAccountData toAccount;
+    private OfficeData toOffice;
+    private ClientData toClient;
+    private BigDecimal amount;
+    private String status;
+    private LocalDate executionTime;
+    private String errorLog;
 
 }