Skip to content

Commit 176c570

Browse files
adamsaghygalovics
adamsaghy
authored and
galovics
committed
Refactor Loan to support auditable fields
1 parent d8f483a commit 176c570

6 files changed

Lines changed: 325 additions & 18 deletions

File tree

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -482,7 +482,7 @@ public String loanAccountSummarySchema() {
482482
.append(" l.writtenoffon_date as writtenOffOnDate, l.expected_maturedon_date as expectedMaturityDate")
483483

484484
.append(" from m_loan l ").append("LEFT JOIN m_product_loan AS lp ON lp.id = l.product_id")
485-
.append(" left join m_appuser sbu on sbu.id = l.submittedon_userid")
485+
.append(" left join m_appuser sbu on sbu.id = l.created_by")
486486
.append(" left join m_appuser rbu on rbu.id = l.rejectedon_userid")
487487
.append(" left join m_appuser wbu on wbu.id = l.withdrawnon_userid")
488488
.append(" left join m_appuser abu on abu.id = l.approvedon_userid")

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/InternalLoanInformationApiResource.java‎

Lines changed: 110 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,110 @@
1+
/**
2+
* Licensed to the Apache Software Foundation (ASF) under one
3+
* or more contributor license agreements. See the NOTICE file
4+
* distributed with this work for additional information
5+
* regarding copyright ownership. The ASF licenses this file
6+
* to you under the Apache License, Version 2.0 (the
7+
* "License"); you may not use this file except in compliance
8+
* with the License. You may obtain a copy of the License at
9+
*
10+
* http://www.apache.org/licenses/LICENSE-2.0
11+
*
12+
* Unless required by applicable law or agreed to in writing,
13+
* software distributed under the License is distributed on an
14+
* "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
15+
* KIND, either express or implied. See the License for the
16+
* specific language governing permissions and limitations
17+
* under the License.
18+
*/
19+
package org.apache.fineract.portfolio.loanaccount.api;
20+
21+
import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.CREATED_BY;
22+
import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.CREATED_DATE;
23+
import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.LAST_MODIFIED_BY;
24+
import static org.apache.fineract.infrastructure.core.domain.AuditableFieldsConstants.LAST_MODIFIED_DATE;
25+
26+
import java.util.HashMap;
27+
import java.util.Map;
28+
import javax.ws.rs.Consumes;
29+
import javax.ws.rs.GET;
30+
import javax.ws.rs.Path;
31+
import javax.ws.rs.PathParam;
32+
import javax.ws.rs.Produces;
33+
import javax.ws.rs.core.Context;
34+
import javax.ws.rs.core.MediaType;
35+
import javax.ws.rs.core.UriInfo;
36+
import lombok.RequiredArgsConstructor;
37+
import lombok.extern.slf4j.Slf4j;
38+
import org.apache.fineract.infrastructure.core.api.ApiRequestParameterHelper;
39+
import org.apache.fineract.infrastructure.core.serialization.ApiRequestJsonSerializationSettings;
40+
import org.apache.fineract.infrastructure.core.serialization.ToApiJsonSerializer;
41+
import org.apache.fineract.portfolio.loanaccount.domain.Loan;
42+
import org.apache.fineract.portfolio.loanaccount.domain.LoanRepositoryWrapper;
43+
import org.apache.fineract.portfolio.loanaccount.domain.LoanTransaction;
44+
import org.apache.fineract.portfolio.loanaccount.domain.LoanTransactionRepository;
45+
import org.springframework.beans.factory.InitializingBean;
46+
import org.springframework.stereotype.Component;
47+
48+
//@Profile("test")
49+
@Component
50+
@Path("/internal/loan")
51+
@RequiredArgsConstructor
52+
@Slf4j
53+
public class InternalLoanInformationApiResource implements InitializingBean {
54+
55+
private final LoanRepositoryWrapper loanRepositoryWrapper;
56+
private final LoanTransactionRepository loanTransactionRepository;
57+
private final ToApiJsonSerializer<Map> toApiJsonSerializer;
58+
private final ApiRequestParameterHelper apiRequestParameterHelper;
59+
60+
@Override
61+
public void afterPropertiesSet() {
62+
log.warn("------------------------------------------------------------");
63+
log.warn(" ");
64+
log.warn("DO NOT USE THIS IN PRODUCTION!");
65+
log.warn("Internal loan services mode is enabled");
66+
log.warn("DO NOT USE THIS IN PRODUCTION!");
67+
log.warn(" ");
68+
log.warn("------------------------------------------------------------");
69+
70+
}
71+
72+
@GET
73+
@Path("{loanId}/audit")
74+
@Consumes({ MediaType.APPLICATION_JSON })
75+
@Produces({ MediaType.APPLICATION_JSON })
76+
public String getLoanAuditFields(@Context final UriInfo uriInfo, @PathParam("loanId") Long loanId) {
77+
log.warn("------------------------------------------------------------");
78+
log.warn(" ");
79+
log.warn("Fetching loan with {}", loanId);
80+
log.warn(" ");
81+
log.warn("------------------------------------------------------------");
82+
83+
final Loan loan = loanRepositoryWrapper.findOneWithNotFoundDetection(loanId);
84+
Map<String, Object> auditFields = new HashMap<>(
85+
Map.of(CREATED_BY, loan.getCreatedBy().orElse(null), CREATED_DATE, loan.getCreatedDate().orElse(null), LAST_MODIFIED_BY,
86+
loan.getLastModifiedBy().orElse(null), LAST_MODIFIED_DATE, loan.getLastModifiedDate().orElse(null)));
87+
final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
88+
return this.toApiJsonSerializer.serialize(settings, auditFields);
89+
}
90+
91+
@GET
92+
@Path("{loanId}/transaction/{transactionId}/audit")
93+
@Consumes({ MediaType.APPLICATION_JSON })
94+
@Produces({ MediaType.APPLICATION_JSON })
95+
public String getLoanTransactionAuditFields(@Context final UriInfo uriInfo, @PathParam("loanId") Long loanId,
96+
@PathParam("transactionId") Long transactionId) {
97+
log.warn("------------------------------------------------------------");
98+
log.warn(" ");
99+
log.warn("Fetching loan transaction with loanId {}, transactionId {}", loanId, transactionId);
100+
log.warn(" ");
101+
log.warn("------------------------------------------------------------");
102+
103+
final LoanTransaction transaction = loanTransactionRepository.findById(transactionId).orElseThrow();
104+
Map<String, Object> auditFields = new HashMap<>(Map.of(CREATED_BY, transaction.getCreatedBy().orElse(null), CREATED_DATE,
105+
transaction.getCreatedDate().orElse(null), LAST_MODIFIED_BY, transaction.getLastModifiedBy().orElse(null),
106+
LAST_MODIFIED_DATE, transaction.getLastModifiedDate().orElse(null)));
107+
final ApiRequestJsonSerializationSettings settings = this.apiRequestParameterHelper.process(uriInfo.getQueryParameters());
108+
return this.toApiJsonSerializer.serialize(settings, auditFields);
109+
}
110+
}

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java‎

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
import org.apache.fineract.infrastructure.codes.domain.CodeValue;
6565
import org.apache.fineract.infrastructure.core.api.JsonCommand;
6666
import org.apache.fineract.infrastructure.core.data.ApiParameterError;
67-
import org.apache.fineract.infrastructure.core.domain.AbstractPersistableCustom;
67+
import org.apache.fineract.infrastructure.core.domain.AbstractAuditableWithUTCDateTimeCustom;
6868
import org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
6969
import org.apache.fineract.infrastructure.core.serialization.JsonParserHelper;
7070
import org.apache.fineract.infrastructure.core.service.DateUtils;
@@ -151,7 +151,7 @@
151151
@Component
152152
@Table(name = "m_loan", uniqueConstraints = { @UniqueConstraint(columnNames = { "account_no" }, name = "loan_account_no_UNIQUE"),
153153
@UniqueConstraint(columnNames = { "external_id" }, name = "loan_externalid_UNIQUE") })
154-
public class Loan extends AbstractPersistableCustom {
154+
public class Loan extends AbstractAuditableWithUTCDateTimeCustom {
155155

156156
private static final Logger LOG = LoggerFactory.getLogger(Loan.class);
157157

@@ -219,9 +219,9 @@ public class Loan extends AbstractPersistableCustom {
219219
@Column(name = "submittedon_date")
220220
private LocalDate submittedOnDate;
221221

222-
@ManyToOne(optional = true, fetch = FetchType.LAZY)
223-
@JoinColumn(name = "submittedon_userid", nullable = true)
224-
private AppUser submittedBy;
222+
// @ManyToOne(optional = true, fetch = FetchType.LAZY)
223+
// @JoinColumn(name = "submittedon_userid", nullable = true)
224+
// private AppUser submittedBy;
225225

226226
@Column(name = "rejectedon_date")
227227
private LocalDate rejectedOnDate;
@@ -2029,10 +2029,10 @@ private void removeFirstDisbursementTransaction() {
20292029
}
20302030
}
20312031

2032-
public void loanApplicationSubmittal(final AppUser currentUser, final LoanScheduleModel loanSchedule,
2033-
final LoanApplicationTerms loanApplicationTerms, final LoanLifecycleStateMachine lifecycleStateMachine,
2034-
final LocalDate submittedOn, final String externalId, final boolean allowTransactionsOnHoliday, final List<Holiday> holidays,
2035-
final WorkingDays workingDays, final boolean allowTransactionsOnNonWorkingDay) {
2032+
public void loanApplicationSubmittal(final LoanScheduleModel loanSchedule, final LoanApplicationTerms loanApplicationTerms,
2033+
final LoanLifecycleStateMachine lifecycleStateMachine, final LocalDate submittedOn, final String externalId,
2034+
final boolean allowTransactionsOnHoliday, final List<Holiday> holidays, final WorkingDays workingDays,
2035+
final boolean allowTransactionsOnNonWorkingDay) {
20362036

20372037
updateLoanSchedule(loanSchedule);
20382038

@@ -2048,7 +2048,6 @@ public void loanApplicationSubmittal(final AppUser currentUser, final LoanSchedu
20482048
this.termFrequency = loanApplicationTerms.getLoanTermFrequency();
20492049
this.termPeriodFrequencyType = loanApplicationTerms.getLoanTermPeriodFrequencyType().getValue();
20502050
this.submittedOnDate = submittedOn;
2051-
this.submittedBy = currentUser;
20522051
this.expectedDisbursementDate = loanApplicationTerms.getExpectedDisbursementDate();
20532052
this.expectedFirstRepaymentOnDate = loanApplicationTerms.getRepaymentStartFromDate();
20542053
this.interestChargedFromDate = loanApplicationTerms.getInterestChargedFromDate();

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanApplicationWritePlatformServiceJpaRepositoryImpl.java‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -284,7 +284,6 @@ private LoanLifecycleStateMachine defaultLoanLifecycleStateMachine() {
284284
public CommandProcessingResult submitApplication(final JsonCommand command) {
285285

286286
try {
287-
final AppUser currentUser = getAppUserIfPresent();
288287
boolean isMeetingMandatoryForJLGLoans = configurationDomainService.isMeetingMandatoryForJLGLoans();
289288
final Long productId = this.fromJsonHelper.extractLongNamed("productId", command.parsedJson());
290289
final LoanProduct loanProduct = this.loanProductRepository.findById(productId)
@@ -334,7 +333,7 @@ public CommandProcessingResult submitApplication(final JsonCommand command) {
334333
throw new PlatformApiDataValidationException(dataValidationErrors);
335334
}
336335

337-
final Loan newLoanApplication = this.loanAssembler.assembleFrom(command, currentUser);
336+
final Loan newLoanApplication = this.loanAssembler.assembleFrom(command);
338337

339338
checkForProductMixRestrictions(newLoanApplication);
340339

‎fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanAssembler.java‎

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@
8787
import org.apache.fineract.portfolio.loanproduct.exception.LoanProductNotFoundException;
8888
import org.apache.fineract.portfolio.rate.domain.Rate;
8989
import org.apache.fineract.portfolio.rate.service.RateAssembler;
90-
import org.apache.fineract.useradministration.domain.AppUser;
9190
import org.springframework.beans.factory.annotation.Autowired;
9291
import org.springframework.stereotype.Service;
9392

@@ -159,16 +158,16 @@ public void setHelpers(final Loan loanAccount) {
159158
this.loanRepaymentScheduleTransactionProcessorFactory);
160159
}
161160

162-
public Loan assembleFrom(final JsonCommand command, final AppUser currentUser) {
161+
public Loan assembleFrom(final JsonCommand command) {
163162
final JsonElement element = command.parsedJson();
164163

165164
final Long clientId = this.fromApiJsonHelper.extractLongNamed("clientId", element);
166165
final Long groupId = this.fromApiJsonHelper.extractLongNamed("groupId", element);
167166

168-
return assembleApplication(element, clientId, groupId, currentUser);
167+
return assembleApplication(element, clientId, groupId);
169168
}
170169

171-
private Loan assembleApplication(final JsonElement element, final Long clientId, final Long groupId, final AppUser currentUser) {
170+
private Loan assembleApplication(final JsonElement element, final Long clientId, final Long groupId) {
172171

173172
final String accountNo = this.fromApiJsonHelper.extractStringNamed("accountNo", element);
174173
final Long productId = this.fromApiJsonHelper.extractLongNamed("productId", element);
@@ -348,7 +347,7 @@ private Loan assembleApplication(final JsonElement element, final Long clientId,
348347
final boolean allowTransactionsOnHoliday = this.configurationDomainService.allowTransactionsOnHolidayEnabled();
349348
final LoanScheduleModel loanScheduleModel = this.loanScheduleAssembler.assembleLoanScheduleFrom(loanApplicationTerms,
350349
isHolidayEnabled, holidays, workingDays, element, disbursementDetails);
351-
loanApplication.loanApplicationSubmittal(currentUser, loanScheduleModel, loanApplicationTerms, defaultLoanLifecycleStateMachine(),
350+
loanApplication.loanApplicationSubmittal(loanScheduleModel, loanApplicationTerms, defaultLoanLifecycleStateMachine(),
352351
submittedOnDate, externalId, allowTransactionsOnHoliday, holidays, workingDays, allowTransactionsOnNonWorkingDay);
353352

354353
return loanApplication;

0 commit comments

Comments
 (0)