[fineract] branch develop updated: Fixing Apache POI issue - Formula Cell evaluation nullpointer exception
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 650e1dd Fixing Apache POI issue - Formula Cell evaluation nullpointer
exception
new 97ed254 Merge pull request #457 from
wkk91193/fixing-formular-cell-evaluation-npe
650e1dd is described below
commit 650e1ddd8b5dfaf4c6eb2a44512390e9011d4be4
Author: unknown
AuthorDate: Fri Jun 15 23:13:38 2018 +0530
Fixing Apache POI issue - Formula Cell evaluation nullpointer exception
---
.../importhandler/ImportHandlerUtils.java | 40 ++
1 file changed, 33 insertions(+), 7 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
index c396f98..1e794ed 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
@@ -63,8 +63,13 @@ public class ImportHandlerUtils {
FormulaEvaluator eval =
row.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
if(eval!=null) {
-CellValue val = eval.evaluate(c);
-return ((Double) val.getNumberValue()).longValue();
+CellValue val = null;
+try {
+val = eval.evaluate(c);
+} catch (NullPointerException npe) {
+return null;
+}
+return ((Double)val.getNumberValue()).longValue();
}
}
else if (c.getCellType()==Cell.CELL_TYPE_NUMERIC){
@@ -85,7 +90,13 @@ public class ImportHandlerUtils {
FormulaEvaluator eval =
row.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
if (eval!=null) {
-CellValue val = eval.evaluate(c);
+CellValue val = null;
+try {
+val = eval.evaluate(c);
+} catch(NullPointerException npe) {
+return null;
+}
+
String res = trimEmptyDecimalPortion(val.getStringValue());
if (res!=null) {
if (!res.equals("")) {
@@ -136,7 +147,12 @@ public class ImportHandlerUtils {
FormulaEvaluator eval =
row.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
if(eval!=null) {
-CellValue val = eval.evaluate(c);
+CellValue val = null;
+try {
+val = eval.evaluate(c);
+} catch (NullPointerException npe) {
+return false;
+}
return val.getBooleanValue();
}
return false;
@@ -158,8 +174,13 @@ public class ImportHandlerUtils {
FormulaEvaluator eval =
row.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
if(eval!=null) {
- CellValue val = eval.evaluate(c);
-return ((Double) val.getNumberValue()).intValue();
+CellValue val = null;
+try {
+val = eval.evaluate(c);
+} catch (NullPointerException npe) {
+return null;
+}
+return ((Double)val.getNumberValue()).intValue();
}
return null;
}else if (c.getCellType()==Cell.CELL_TYPE_NUMERIC) {
@@ -176,7 +197,12 @@ public class ImportHandlerUtils {
FormulaEvaluator eval =
row.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
if (eval!=null) {
-CellValue val = eval.evaluate(c);
+CellValue val = null;
+try {
+val = eval.evaluate(c);
+} catch (NullPointerException npe) {
+return 0.0;
+}
return val.getNumberValue();
}else {
return 0.0;
[fineract] branch develop updated: FINERACT-682: SQL injection impact fixes
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
The following commit(s) were added to refs/heads/develop by this push:
new 40b2427 FINERACT-682: SQL injection impact fixes
new 3c21ae1 Merge pull request #508 from ShruthiRajaram/FINERACT-682
40b2427 is described below
commit 40b24272ed3f6ad7573c07b55b6aa6004b2083e4
Author: ShruthiRajaram
AuthorDate: Thu Jan 10 12:17:31 2019 +0530
FINERACT-682: SQL injection impact fixes
---
.../infrastructure/dataqueries/service/ReadReportingServiceImpl.java | 1 -
1 file changed, 1 deletion(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
index d83b3c4..6342206 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/infrastructure/dataqueries/service/ReadReportingServiceImpl.java
@@ -223,7 +223,6 @@ public class ReadReportingServiceImpl implements
ReadReportingService {
final String inputSql = "select " + type + "_sql as the_sql from
stretchy_" + type + " where " + type + "_name = '" + name + "'";
validateReportName(name);
-this.columnValidator.validateSqlInjection(inputSql, name);
final String inputSqlWrapped =
this.genericDataService.wrapSQL(inputSql);
[fineract] 01/01: Merge pull request #505 from apache/revert-501-FINERACT-669
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit ed5c6961035938c73ce393381039945302fe021f Merge: db389a0 5702ce8 Author: ShruthiRajaram AuthorDate: Mon Dec 31 17:35:54 2018 +0530 Merge pull request #505 from apache/revert-501-FINERACT-669 Revert "FINERACT-669 back dated client transfer changes" .../portfolio/client/api/ClientsApiResource.java | 18 ++--- .../fineract/portfolio/client/domain/Client.java | 13 .../client/domain/ClientTransferDetails.java | 83 -- .../domain/ClientTransferDetailsRepository.java| 28 .../ClientTransferDetailsRepositoryWrapper.java| 39 -- .../client/service/ClientReadPlatformService.java | 4 ++ .../service/ClientReadPlatformServiceImpl.java | 38 -- ...nsferWritePlatformServiceJpaRepositoryImpl.java | 30 ++-- .../core_db/V348__client_transfer_details.sql | 41 --- 9 files changed, 49 insertions(+), 245 deletions(-)
[fineract] branch develop updated (db389a0 -> ed5c696)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from db389a0 Merge pull request #501 from ShruthiRajaram/FINERACT-669 add 5702ce8 Revert "FINERACT-669 back dated client transfer changes" new ed5c696 Merge pull request #505 from apache/revert-501-FINERACT-669 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../portfolio/client/api/ClientsApiResource.java | 18 ++--- .../fineract/portfolio/client/domain/Client.java | 13 .../client/domain/ClientTransferDetails.java | 83 -- .../domain/ClientTransferDetailsRepository.java| 28 .../ClientTransferDetailsRepositoryWrapper.java| 39 -- .../client/service/ClientReadPlatformService.java | 4 ++ .../service/ClientReadPlatformServiceImpl.java | 38 -- ...nsferWritePlatformServiceJpaRepositoryImpl.java | 30 ++-- .../core_db/V348__client_transfer_details.sql | 41 --- 9 files changed, 49 insertions(+), 245 deletions(-) delete mode 100644 fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransferDetails.java delete mode 100644 fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransferDetailsRepository.java delete mode 100644 fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransferDetailsRepositoryWrapper.java delete mode 100644 fineract-provider/src/main/resources/sql/migrations/core_db/V348__client_transfer_details.sql
[fineract] 01/01: Revert "FINERACT-669 back dated client transfer changes"
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a commit to branch revert-501-FINERACT-669
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 5702ce878cd68c3babd8df56ebee5463605b1a21
Author: ShruthiRajaram
AuthorDate: Mon Dec 31 17:34:58 2018 +0530
Revert "FINERACT-669 back dated client transfer changes"
---
.../portfolio/client/api/ClientsApiResource.java | 18 ++---
.../fineract/portfolio/client/domain/Client.java | 13
.../client/domain/ClientTransferDetails.java | 83 --
.../domain/ClientTransferDetailsRepository.java| 28
.../ClientTransferDetailsRepositoryWrapper.java| 39 --
.../client/service/ClientReadPlatformService.java | 4 ++
.../service/ClientReadPlatformServiceImpl.java | 38 --
...nsferWritePlatformServiceJpaRepositoryImpl.java | 30 ++--
.../core_db/V348__client_transfer_details.sql | 41 ---
9 files changed, 49 insertions(+), 245 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
index 54d9318..383a9ef 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/api/ClientsApiResource.java
@@ -18,6 +18,7 @@
*/
package org.apache.fineract.portfolio.client.api;
+import io.swagger.annotations.*;
import java.io.InputStream;
import java.util.Arrays;
import java.util.Collection;
@@ -71,14 +72,6 @@ import org.springframework.stereotype.Component;
import com.sun.jersey.core.header.FormDataContentDisposition;
import com.sun.jersey.multipart.FormDataParam;
-import io.swagger.annotations.Api;
-import io.swagger.annotations.ApiImplicitParam;
-import io.swagger.annotations.ApiImplicitParams;
-import io.swagger.annotations.ApiOperation;
-import io.swagger.annotations.ApiParam;
-import io.swagger.annotations.ApiResponse;
-import io.swagger.annotations.ApiResponses;
-
@Path("/clients")
@Component
@Scope("singleton")
@@ -396,15 +389,16 @@ public class ClientsApiResource {
return this.toApiJsonSerializer.serialize(ObligeeList);
}
- @GET
@Path("{clientId}/transferproposaldate")
@Consumes({ MediaType.APPLICATION_JSON })
@Produces({ MediaType.APPLICATION_JSON })
public String retrieveTransferTemplate(@PathParam("clientId") final
Long clientId, @Context final UriInfo uriInfo) {
-
this.context.authenticatedUser().validateHasReadPermission(ClientApiConstants.CLIENT_RESOURCE_NAME);
-
+
this.context.authenticatedUser().validateHasReadPermission(ClientApiConstants.CLIENT_RESOURCE_NAME);
final Date transferDate =
this.clientReadPlatformService.retrieveClientTransferProposalDate(clientId);
- return this.toApiJsonSerializer.serialize((transferDate != null
? new LocalDate(transferDate) : null));
+ if (transferDate != null) {
+ return this.toApiJsonSerializer.serialize(new
LocalDate(transferDate));
+ }
+ return this.toApiJsonSerializer.serialize(transferDate);
}
}
\ No newline at end of file
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
index ee20ffa..ed4e056 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/Client.java
@@ -232,10 +232,6 @@ public final class Client extends
AbstractPersistableCustom {
@JoinColumn(name = "reopened_by_userid", nullable = true)
private AppUser reopenedBy;
- @Column(name = "proposed_transfer_date", nullable = true)
- @Temporal(TemporalType.DATE)
- private Date proposedTransferDate;
-
public static Client createNew(final AppUser currentUser, final Office
clientOffice, final Group clientParentGroup, final Staff staff,
final Long savingsProductId, final CodeValue gender, final
CodeValue clientType, final CodeValue clientClassification,
final Integer legalForm, final JsonCommand command) {
@@ -1062,13 +1058,4 @@ public final class Client extends
AbstractPersistableCustom {
public String getMiddlename(){return this.middlename;}
public String getLastname(){return this.lastname;}
-
- public Date getProposedTransferDate() {
- return proposedTransferDate;
- }
-
- public void updateProposedTransferDate(Date proposedTransferDate) {
- this.proposedTransferDate = propo
[fineract] branch revert-501-FINERACT-669 created (now 5702ce8)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch revert-501-FINERACT-669 in repository https://gitbox.apache.org/repos/asf/fineract.git. at 5702ce8 Revert "FINERACT-669 back dated client transfer changes" This branch includes the following new commits: new 5702ce8 Revert "FINERACT-669 back dated client transfer changes" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[fineract] branch develop updated (bff995f -> db389a0)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from bff995f Merge pull request #503 from ShruthiRajaram/FINERACT-680
add 3568177 FINERACT-669 back dated client transfer changes
new db389a0 Merge pull request #501 from ShruthiRajaram/FINERACT-669
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../portfolio/client/api/ClientsApiResource.java | 18 +++--
.../fineract/portfolio/client/domain/Client.java | 13
.../client/domain/ClientTransferDetails.java | 83 ++
...y.java => ClientTransferDetailsRepository.java} | 5 +-
.../ClientTransferDetailsRepositoryWrapper.java} | 24 ---
.../client/service/ClientReadPlatformService.java | 4 --
.../service/ClientReadPlatformServiceImpl.java | 38 ++
...nsferWritePlatformServiceJpaRepositoryImpl.java | 30 ++--
.../core_db/V348__client_transfer_details.sql | 41 +++
9 files changed, 194 insertions(+), 62 deletions(-)
create mode 100644
fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/ClientTransferDetails.java
copy
fineract-provider/src/main/java/org/apache/fineract/portfolio/client/domain/{ClientFamilyMembersRepository.java
=> ClientTransferDetailsRepository.java} (86%)
copy
fineract-provider/src/main/java/org/apache/fineract/{notification/eventandlistener/SpringEventPublisher.java
=> portfolio/client/domain/ClientTransferDetailsRepositoryWrapper.java} (65%)
create mode 100644
fineract-provider/src/main/resources/sql/migrations/core_db/V348__client_transfer_details.sql
[fineract] 01/01: Merge pull request #501 from ShruthiRajaram/FINERACT-669
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit db389a03c543efea2b2566c262e8cc921b6dac62 Merge: bff995f 3568177 Author: ShruthiRajaram AuthorDate: Mon Dec 31 17:28:47 2018 +0530 Merge pull request #501 from ShruthiRajaram/FINERACT-669 FINERACT-669 back dated client transfer changes .../portfolio/client/api/ClientsApiResource.java | 18 +++-- .../fineract/portfolio/client/domain/Client.java | 13 .../client/domain/ClientTransferDetails.java | 83 ++ .../domain/ClientTransferDetailsRepository.java| 28 .../ClientTransferDetailsRepositoryWrapper.java| 39 ++ .../client/service/ClientReadPlatformService.java | 4 -- .../service/ClientReadPlatformServiceImpl.java | 38 ++ ...nsferWritePlatformServiceJpaRepositoryImpl.java | 30 ++-- .../core_db/V348__client_transfer_details.sql | 41 +++ 9 files changed, 245 insertions(+), 49 deletions(-)
[fineract] branch develop updated (9324aaf -> 80261d0)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 9324aaf Merge pull request #458 from wkk91193/performance-and-scalability-enhancements add d3eed8d Added total outstanding amount to loan repayment workbook add 7a77cfd Fixing loan summary null pointer new 80261d0 Merge pull request #470 from wkk91193/bulkimport-integration-loanrepayment-added-total-outstanding-amount-col The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../constants/LoanRepaymentConstants.java | 33 ++- .../LoanRepaymentWorkbookPopulator.java| 68 ++ .../loanaccount/data/LoanAccountData.java | 6 +- 3 files changed, 68 insertions(+), 39 deletions(-)
[fineract] 01/01: Merge pull request #458 from wkk91193/performance-and-scalability-enhancements
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 9324aafe31e83507b514fac4930a4d7d7cdb867e Merge: 5eed288 eeb68c3 Author: ShruthiRajaram AuthorDate: Fri Dec 28 12:58:07 2018 +0530 Merge pull request #458 from wkk91193/performance-and-scalability-enhancements FINERACT-637: Implementing Trial balance job .../accounting/glaccount/domain/TrialBalance.java | 108 + .../glaccount/domain/TrialBalanceRepository.java | 33 +++ .../domain/TrialBalanceRepositoryWrapper.java | 47 + .../exception/TrialBalanceNotFoundException.java} | 24 ++--- .../infrastructure/jobs/service/JobName.java | 3 +- .../service/ScheduledJobRunnerService.java | 4 + .../service/ScheduledJobRunnerServiceImpl.java | 76 ++- .../core_db/V348__m_trial_balance_table.sql| 35 +++ 8 files changed, 310 insertions(+), 20 deletions(-)
[fineract] branch develop updated (5eed288 -> 9324aaf)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from 5eed288 Merge pull request #500 from ShruthiRajaram/FINERACT-671
add cdd0a12 Implementing Trial balance job
add bf1eee7 Removing collate,engine details and adding index to
transaction_date column
add eeb68c3 Renaming the script file
new 9324aaf Merge pull request #458 from
wkk91193/performance-and-scalability-enhancements
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../accounting/glaccount/domain/TrialBalance.java | 108 +
.../glaccount/domain/TrialBalanceRepository.java} | 14 ++-
...per.java => TrialBalanceRepositoryWrapper.java} | 33 ---
.../exception/TrialBalanceNotFoundException.java} | 9 +-
.../infrastructure/jobs/service/JobName.java | 3 +-
.../service/ScheduledJobRunnerService.java | 4 +
.../service/ScheduledJobRunnerServiceImpl.java | 76 ++-
...account.sql => V348__m_trial_balance_table.sql} | 19 ++--
8 files changed, 229 insertions(+), 37 deletions(-)
create mode 100644
fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/TrialBalance.java
copy
fineract-provider/src/main/java/org/apache/fineract/{infrastructure/survey/domain/LikelihoodRepository.java
=> accounting/glaccount/domain/TrialBalanceRepository.java} (66%)
copy
fineract-provider/src/main/java/org/apache/fineract/accounting/glaccount/domain/{GLAccountRepositoryWrapper.java
=> TrialBalanceRepositoryWrapper.java} (56%)
mode change 100755 => 100644
copy
fineract-provider/src/main/java/org/apache/fineract/{portfolio/accounts/exceptions/ShareAccountNotFoundException.java
=> accounting/trialbalance/exception/TrialBalanceNotFoundException.java} (73%)
copy
fineract-provider/src/main/resources/sql/migrations/core_db/{V168__added_transfer_fixed_deposit_interest_to_linked_account.sql
=> V348__m_trial_balance_table.sql} (63%)
mode change 100755 => 100644
[fineract] 01/01: Merge pull request #500 from ShruthiRajaram/FINERACT-671
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 5eed2882c867041f8baaed751b880a8ccbf71cf2 Merge: 3846ea6 37b61d1 Author: ShruthiRajaram AuthorDate: Wed Dec 26 13:27:33 2018 +0530 Merge pull request #500 from ShruthiRajaram/FINERACT-671 FINERACT-671 loan charge specific due date fix .../org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java | 5 + .../loanaccount/serialization/LoanEventApiJsonValidator.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[fineract] branch develop updated (3846ea6 -> 5eed288)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 3846ea6 FINERACT-186 batch job optimisation add 37b61d1 FINERACT-671 loan charge specific due date fix new 5eed288 Merge pull request #500 from ShruthiRajaram/FINERACT-671 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/fineract/portfolio/loanaccount/domain/LoanCharge.java | 5 + .../loanaccount/serialization/LoanEventApiJsonValidator.java | 3 ++- 2 files changed, 7 insertions(+), 1 deletion(-)
[fineract] branch develop updated (9c24d6b -> 3846ea6)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 9c24d6b Merge pull request #499 from ShruthiRajaram/FINERACT-536 add 67317b1 FINERACT-186 new 3846ea6 FINERACT-186 batch job optimisation The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../savings/domain/SavingsAccountRepository.java | 4 ++ .../service/SavingsSchedularServiceImpl.java | 52 +- 2 files changed, 35 insertions(+), 21 deletions(-)
[fineract] 01/01: FINERACT-186 batch job optimisation
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 3846ea6a2501dc7f501920e248d09db35b2c8d31
Merge: 9c24d6b 67317b1
Author: ShruthiRajaram
AuthorDate: Tue Dec 25 18:16:26 2018 +0530
FINERACT-186 batch job optimisation
.../savings/domain/SavingsAccountRepository.java | 4 ++
.../service/SavingsSchedularServiceImpl.java | 52 +-
2 files changed, 35 insertions(+), 21 deletions(-)
diff --cc
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java
index df939f6,ef93d7f..bb4eb22
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountRepository.java
@@@ -47,6 -48,8 +49,8 @@@ public interface SavingsAccountReposito
SavingsAccount findByIdAndDepositAccountType(@Param("accountId") Long
accountId,
@Param("depositAccountTypeId") Integer depositAccountTypeId);
-@Query("from SavingsAccount sa where sa.accountNumber = :accountNumber
and sa.status in (100, 200, 300, 303, 304) ")
+@Query("select sa from SavingsAccount sa where sa.accountNumber =
:accountNumber and sa.status in (100, 200, 300, 303, 304) ")
SavingsAccount
findNonClosedAccountByAccountNumber(@Param("accountNumber") String
accountNumber);
+
+ Page findByStatus(Integer status,Pageable pageable);
}
diff --cc
fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java
index e3f2f0c,c50d9b5..16c4266
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsSchedularServiceImpl.java
@@@ -43,36 -45,42 +45,44 @@@ public class SavingsSchedularServiceImp
@Autowired
public SavingsSchedularServiceImpl(final SavingsAccountAssembler
savingAccountAssembler,
final SavingsAccountWritePlatformService
savingsAccountWritePlatformService,
- final SavingsAccountRepositoryWrapper
savingAccountRepositoryWrapper,
- final SavingsAccountReadPlatformService
savingAccountReadPlatformService) {
-final SavingsAccountReadPlatformService
savingAccountReadPlatformService,
-final SavingsAccountRepository savingsAccountRepository) {
++final SavingsAccountReadPlatformService
savingAccountReadPlatformService, final SavingsAccountRepository
savingsAccountRepository) {
this.savingAccountAssembler = savingAccountAssembler;
this.savingsAccountWritePlatformService =
savingsAccountWritePlatformService;
- this.savingAccountRepositoryWrapper = savingAccountRepositoryWrapper;
this.savingAccountReadPlatformService =
savingAccountReadPlatformService;
+ this.savingsAccountRepository = savingsAccountRepository;
}
@CronTarget(jobName = JobName.POST_INTEREST_FOR_SAVINGS)
@Override
public void postInterestForAccounts() throws JobExecutionException {
- final List savingsAccounts =
this.savingAccountRepositoryWrapper.findSavingAccountByStatus(SavingsAccountStatusType.ACTIVE
- .getValue());
-int offSet = 0;
++int page = 0;
+ Integer initialSize = 500;
+ Integer totalPageSize = 0;
StringBuffer sb = new StringBuffer();
- for (final SavingsAccount savingsAccount : savingsAccounts) {
- try {
-
this.savingAccountAssembler.assignSavingAccountHelpers(savingsAccount);
- boolean postInterestAsOn = false;
- LocalDate transactionDate = null;
-
this.savingsAccountWritePlatformService.postInterest(savingsAccount,
postInterestAsOn, transactionDate);
- } catch (Exception e) {
- Throwable realCause = e;
- if (e.getCause() != null) {
- realCause = e.getCause();
+ do {
-PageRequest pageRequest = new PageRequest(offSet, initialSize);
++PageRequest pageRequest = new PageRequest(page, initialSize);
+ Page savingsAccounts =
this.savingsAccountRepository.findByStatus(SavingsAccountStatusType.ACTIVE.getValue(),
+ pageRequest);
+ for (SavingsAccount savingsAccount :
savingsAccounts.getContent()) {
+ try {
+
this.savingAccountAssembler.assignSavingAccountHelpers(savingsAccount);
-
this.savingsAccountWritePlatformService.postInterest(savingsAccount);
++ boolean postInterestAsOn = false;
++
[fineract] 01/01: Merge pull request #483 from ShruthiRajaram/sqlFix
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 525ac83268ea8dae13bf85fc4d90e5619e0b89c7 Merge: 22bf2cd 3105ec0 Author: ShruthiRajaram AuthorDate: Tue Dec 18 15:01:18 2018 +0530 Merge pull request #483 from ShruthiRajaram/sqlFix sql fix ...countWritePlatformServiceJpaRepositoryImpl.java | 12 +++-- .../CreditBureauReadConfigurationServiceImpl.java | 4 +- .../dataqueries/api/RunreportsApiResource.java | 2 + .../exception/ReportNotFoundException.java | 5 ++- .../service/GenericDataServiceImpl.java| 51 -- .../service/ReadReportingServiceImpl.java | 26 --- .../service/ReadWriteNonCoreDataServiceImpl.java | 45 ++- .../service/SchedulerJobRunnerReadServiceImpl.java | 20 + .../search/data/AdHocQueryDataValidator.java | 11 +++-- 9 files changed, 115 insertions(+), 61 deletions(-)
[fineract] branch develop updated (22bf2cd -> 525ac83)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 22bf2cd Merge pull request #498 from ShruthiRajaram/FINERACT-574 add 3105ec0 sql fix new 525ac83 Merge pull request #483 from ShruthiRajaram/sqlFix The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...countWritePlatformServiceJpaRepositoryImpl.java | 12 +++-- .../CreditBureauReadConfigurationServiceImpl.java | 4 +- .../dataqueries/api/RunreportsApiResource.java | 2 + .../exception/ReportNotFoundException.java | 5 ++- .../service/GenericDataServiceImpl.java| 51 -- .../service/ReadReportingServiceImpl.java | 26 --- .../service/ReadWriteNonCoreDataServiceImpl.java | 45 ++- .../service/SchedulerJobRunnerReadServiceImpl.java | 20 + .../search/data/AdHocQueryDataValidator.java | 11 +++-- 9 files changed, 115 insertions(+), 61 deletions(-)
[fineract] tag 1.2.0 created (now f5a0146)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to tag 1.2.0 in repository https://gitbox.apache.org/repos/asf/fineract.git. at f5a0146 (commit) No new revisions were added by this update.
[fineract] branch develop updated (b225748 -> 22bf2cd)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from b225748 Merge pull request #496 from ShruthiRajaram/FINERACT-668 add 3bdfa5a FINERACT-574 share account reject issues new 22bf2cd Merge pull request #498 from ShruthiRajaram/FINERACT-574 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../CashBasedAccountingProcessorForShares.java| 19 --- 1 file changed, 12 insertions(+), 7 deletions(-)
[fineract] 01/01: Merge pull request #498 from ShruthiRajaram/FINERACT-574
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 22bf2cdde8d26751fa73495e771d540aa08c9fc1 Merge: b225748 3bdfa5a Author: ShruthiRajaram AuthorDate: Wed Dec 12 17:58:58 2018 +0530 Merge pull request #498 from ShruthiRajaram/FINERACT-574 FINERACT-574 share account reject issues .../CashBasedAccountingProcessorForShares.java| 19 --- 1 file changed, 12 insertions(+), 7 deletions(-)
[fineract] 01/01: Merge pull request #496 from ShruthiRajaram/FINERACT-668
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit b2257485a756a52b65c0c7b9e8e9f8e8bc01d9b4 Merge: 5e56d93 ce87284 Author: ShruthiRajaram AuthorDate: Wed Dec 12 11:31:23 2018 +0530 Merge pull request #496 from ShruthiRajaram/FINERACT-668 FINERACT-668 Download bulk import templates fix .../populator/AbstractWorkbookPopulator.java | 27 -- .../FixedDepositTransactionWorkbookPopulator.java | 2 +- .../guarantor/GuarantorWorkbookPopulator.java | 2 +- ...curringDepositTransactionWorkbookPopulator.java | 2 +- .../SavingsTransactionsWorkbookPopulator.java | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-)
[fineract] branch develop updated (5e56d93 -> b225748)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 5e56d93 Merge pull request #495 from ShruthiRajaram/FINERACT-665 add ce87284 FINERACT-668 Download bulk import templates fix new b225748 Merge pull request #496 from ShruthiRajaram/FINERACT-668 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../populator/AbstractWorkbookPopulator.java | 27 -- .../FixedDepositTransactionWorkbookPopulator.java | 2 +- .../guarantor/GuarantorWorkbookPopulator.java | 2 +- ...curringDepositTransactionWorkbookPopulator.java | 2 +- .../SavingsTransactionsWorkbookPopulator.java | 2 +- 5 files changed, 19 insertions(+), 16 deletions(-)
[fineract] 01/01: Merge pull request #441 from Nenge1/FINERACT-574
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 5db61a2e4d99960bfdcb36a1f9a188e770c6505d Merge: c113ef4 613b802 Author: ShruthiRajaram AuthorDate: Tue Dec 4 17:37:39 2018 +0530 Merge pull request #441 from Nenge1/FINERACT-574 FINERACT-574 .../portfolio/shareaccounts/domain/PurchasedSharesStatusType.java | 4 .../apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
[fineract] branch develop updated (c113ef4 -> 5db61a2)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from c113ef4 Merge pull request #493 from m-sameer/FINERACT-632 add 613b802 FINERACT-574 new 5db61a2 Merge pull request #441 from Nenge1/FINERACT-574 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../portfolio/shareaccounts/domain/PurchasedSharesStatusType.java | 4 .../apache/fineract/portfolio/shareaccounts/domain/ShareAccount.java | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-)
[fineract] 01/01: Merge pull request #493 from m-sameer/FINERACT-632
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit c113ef4b89e47c22dc1f967bf02d990a5d1c606c Merge: 989e1f0 1ec13dd Author: ShruthiRajaram AuthorDate: Mon Dec 3 12:05:59 2018 +0530 Merge pull request #493 from m-sameer/FINERACT-632 FINERACT-632 Make description field non mandatory in saving product .../savings/data/SavingsProductDataValidator.java| 8 +--- .../portfolio/savings/domain/SavingsProduct.java | 2 +- .../savings/domain/SavingsProductAssembler.java | 2 +- .../V346__nullable_saving_product_description.sql| 20 4 files changed, 27 insertions(+), 5 deletions(-)
[fineract] branch develop updated (989e1f0 -> c113ef4)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from 989e1f0 Merge pull request #494 from m-sameer/FINERACT-618
add 1ec13dd FINERACT-632 Make description field non mandatory in saving
product
new c113ef4 Merge pull request #493 from m-sameer/FINERACT-632
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../portfolio/savings/data/SavingsProductDataValidator.java | 8 +---
.../apache/fineract/portfolio/savings/domain/SavingsProduct.java | 2 +-
.../portfolio/savings/domain/SavingsProductAssembler.java | 2 +-
...rrection.sql => V346__nullable_saving_product_description.sql} | 2 +-
4 files changed, 8 insertions(+), 6 deletions(-)
copy
fineract-provider/src/main/resources/sql/migrations/core_db/{V134_2__permissions_spelling_correction.sql
=> V346__nullable_saving_product_description.sql} (90%)
[fineract] 01/01: Merge pull request #494 from m-sameer/FINERACT-618
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 989e1f04025540e5f7f3351cdac5af664a9a78b5 Merge: f5a0146 a149185 Author: ShruthiRajaram AuthorDate: Fri Nov 30 12:43:44 2018 +0530 Merge pull request #494 from m-sameer/FINERACT-618 FINERACT-618 Allow for Submitted On Date to be Edited for Groups .../org/apache/fineract/portfolio/group/domain/Group.java| 12 .../group/serialization/GroupingTypesDataValidator.java | 6 ++ 2 files changed, 18 insertions(+)
[fineract] branch develop updated (f5a0146 -> 989e1f0)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from f5a0146 Merge pull request #479 from ShruthiRajaram/FINERACT-628-reports add a149185 FINERACT-618 Allow for Submitted On Date to be Edited for Groups new 989e1f0 Merge pull request #494 from m-sameer/FINERACT-618 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../org/apache/fineract/portfolio/group/domain/Group.java| 12 .../group/serialization/GroupingTypesDataValidator.java | 6 ++ 2 files changed, 18 insertions(+)
svn commit: r31230 - in /dev/fineract/1.2.0: apache-fineract-1.2.0--binary.tar.gz.asc apache-fineract-1.2.0-binary.tar.gz.asc
Author: shruthirajaram Date: Fri Nov 30 05:37:36 2018 New Revision: 31230 Log: Publishing fineract 1.2.0 RC1 Added: dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.asc Removed: dev/fineract/1.2.0/apache-fineract-1.2.0--binary.tar.gz.asc Added: dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.asc == --- dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.asc (added) +++ dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.asc Fri Nov 30 05:37:36 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEe2zREuNuppyUWD8ZBsgiLSOXzqgFAlv/lEkACgkQBsgiLSOX +zqiDvxAAilfkLr40zciO2aucY/YwbMRkzHuTYikpK8R82v9zd9FmJQzA3PjG+yLb +JtG1vWd5Q1KQIuYW8Y0i4dnkQEZP1K35SWC4v3Upz0cJX1akgvUy3fczA8R7QAgY +H3/D6j2DLWjW3BPQgbgjEdy8laGUH1P8KK5wP598p/DGybCvUUaJ+XulJgWhPzfU +BiZvtQ5V5Y0D+rrkIX07JA3lF9gj6KK/ezW89Rl5MFSMwhvUbMSWa/pDR2g7Zx5c +63RxQbrDQxZmCAkFpyYAlCtPlFHmeUbSVSQh+5HzMg2HNrcsU6wJShuhZVHYhjOX +/kQ0orB+WKkhkker/NbT+yBLEtK6kZHnUk0QPqT/iKGwGrvihK/XubgOLbWgd9l7 +jHMF8UgZ/83DcaHqzwX5lXw85domWmg9FFQzIlePpRiVLTUoOjsH4PhKKxDuXs4p +6VCq2H7SNPFRmrzBdj+Ho8rbPoyikPpAUmp1nfHmLtAhvX0OpzPwKJkmSv2bC0w3 +vxbpqf8PbI6xcqjXAh+WQEcNCq0dYYAhrcK7Bfy7+tVSabR9CFsofvCdv6rBWGw2 +wrR9ob6eZL7lG9b/2Ny5zqwG/SAWWq3yEY5i52wZOLSEWV9DH4djEUsB69LLgTOv +hCDx2rt8DE8rC+SQy0YkyLzVCcFBn1URz6KLVSJvStrXtE5A328= +=BRJn +-END PGP SIGNATURE-
svn commit: r31229 - /dev/fineract/1.2.0/
Author: shruthirajaram Date: Fri Nov 30 05:19:45 2018 New Revision: 31229 Log: Publishing fineract 1.2.0 RC1 Added: dev/fineract/1.2.0/apache-fineract-1.2.0--binary.tar.gz.asc dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz (with props) dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.sha512 dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz (with props) dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.asc dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.sha512 Added: dev/fineract/1.2.0/apache-fineract-1.2.0--binary.tar.gz.asc == --- dev/fineract/1.2.0/apache-fineract-1.2.0--binary.tar.gz.asc (added) +++ dev/fineract/1.2.0/apache-fineract-1.2.0--binary.tar.gz.asc Fri Nov 30 05:19:45 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEe2zREuNuppyUWD8ZBsgiLSOXzqgFAlv/lEkACgkQBsgiLSOX +zqiDvxAAilfkLr40zciO2aucY/YwbMRkzHuTYikpK8R82v9zd9FmJQzA3PjG+yLb +JtG1vWd5Q1KQIuYW8Y0i4dnkQEZP1K35SWC4v3Upz0cJX1akgvUy3fczA8R7QAgY +H3/D6j2DLWjW3BPQgbgjEdy8laGUH1P8KK5wP598p/DGybCvUUaJ+XulJgWhPzfU +BiZvtQ5V5Y0D+rrkIX07JA3lF9gj6KK/ezW89Rl5MFSMwhvUbMSWa/pDR2g7Zx5c +63RxQbrDQxZmCAkFpyYAlCtPlFHmeUbSVSQh+5HzMg2HNrcsU6wJShuhZVHYhjOX +/kQ0orB+WKkhkker/NbT+yBLEtK6kZHnUk0QPqT/iKGwGrvihK/XubgOLbWgd9l7 +jHMF8UgZ/83DcaHqzwX5lXw85domWmg9FFQzIlePpRiVLTUoOjsH4PhKKxDuXs4p +6VCq2H7SNPFRmrzBdj+Ho8rbPoyikPpAUmp1nfHmLtAhvX0OpzPwKJkmSv2bC0w3 +vxbpqf8PbI6xcqjXAh+WQEcNCq0dYYAhrcK7Bfy7+tVSabR9CFsofvCdv6rBWGw2 +wrR9ob6eZL7lG9b/2Ny5zqwG/SAWWq3yEY5i52wZOLSEWV9DH4djEUsB69LLgTOv +hCDx2rt8DE8rC+SQy0YkyLzVCcFBn1URz6KLVSJvStrXtE5A328= +=BRJn +-END PGP SIGNATURE- Added: dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz == Binary file - no diff available. Propchange: dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz -- svn:mime-type = application/octet-stream Added: dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.sha512 == --- dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.sha512 (added) +++ dev/fineract/1.2.0/apache-fineract-1.2.0-binary.tar.gz.sha512 Fri Nov 30 05:19:45 2018 @@ -0,0 +1,4 @@ +apache-fineract-1.2.0-binary.tar.gz: 4F9345DC 9A0A2062 44002F45 951F7A1F + D1B144D9 00385D42 EE23FCEC 559963F8 + D0B516B8 B462F6F5 1137C653 D465A592 + 38E8523E 90D22EFA F70EFEFF 0A443F71 Added: dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz == Binary file - no diff available. Propchange: dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz -- svn:mime-type = application/octet-stream Added: dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.asc == --- dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.asc (added) +++ dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.asc Fri Nov 30 05:19:45 2018 @@ -0,0 +1,16 @@ +-BEGIN PGP SIGNATURE- + +iQIzBAABCgAdFiEEe2zREuNuppyUWD8ZBsgiLSOXzqgFAlv/k4AACgkQBsgiLSOX +zqgZ4A/+Mt025dJ7WGrXb3RNP0GyZ1zbWjH+BdbAoW4gHdLjMRfPeHiKdUoq2OGC +rFoc21vCTRLruo4WXuY/A62rOWnb8BRM618xW72QTpmPikLADdjMWzAgOsPbRT6/ +FRGWHGb3rM67VZ/z0XiSq5WnkFx3YRuVgSthsuLPs0nxybW9OqPBUx7pL0zpcvS3 +yKsZ+p1dngSorf8SM7II7Ww/Dx37CA/IheeRQU7HiAh8ky1hrou/Qh9g9NYcXpDj +YFImpF6rEVYvVELZoFtY2gGLawrOVOIZKxZcy1s/zHzexJn7XpGbyakhJb2/kCcy +rdE7TUmfcbc3Z0bFa7jwvwAKnc+poHmSHvLUFIsPFdbeABmmVKVkU0vfHicjwAEq +GL4RNyn113lv4Jc3PGYRV9vsTb+vfhfGcQAU/kNDKVSPcwrNLkcGiEfBGeNrmpcC +E2NGGUC6y5liaTdOk072RG4+pZeXTkSFLERCKsxSCJMdNqLN8boH1vYB1wen6Qhu +cJgYEE20ksq9aXv3ILyzI+X2ljfYqvGPQoJL/9gsZxvYlfPQ9A2BHhkBE0hAVZNp +0Ay3diKqz8Lgg+/XtvPQKrRMQ1y9gvolJxTEa6G9gBRfD5ZfjAdg6Aoldt81fUEc +90KMrhuVPW/GC1XrqJO/aBSOR2nKSR2VFbUb2At8u8tdDF2hB58= +=Youx +-END PGP SIGNATURE- Added: dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.sha512 == --- dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.sha512 (added) +++ dev/fineract/1.2.0/apache-fineract-1.2.0-src.tar.gz.sha512 Fri Nov 30 05:19:45 2018 @@ -0,0 +1,4 @@ +apache-fineract-1.2.0-src.tar.gz: EFB20A17 B13B684D CA2C5225 DBDCB5CE 2B361FC3 + 1D7FBA48 557B7C76 E5A5D51D 41870979 3EFC9380 + FB9B535F C9C15FD6 6F42DCBD E88B825B A58278BD + 6FE662A9
svn commit: r31205 - in /dev/fineract: 1.2.0/ KEYS
Author: shruthirajaram Date: Thu Nov 29 11:36:55 2018 New Revision: 31205 Log: Publishing fineract 1.2.0 RC1 Added: dev/fineract/1.2.0/ Modified: dev/fineract/KEYS Modified: dev/fineract/KEYS == --- dev/fineract/KEYS (original) +++ dev/fineract/KEYS Thu Nov 29 11:36:55 2018 @@ -199,3 +199,62 @@ zK8N5HNzxoedRvxhKLeD5iNdqmh85qh3wBI57HFm ZLoDsREpadZH1qxU4uSQdYFhMsC83J6XrOMF4Ze3mwBDwcbwHnQ5 =Qls/ -END PGP PUBLIC KEY BLOCK- +pub rsa4096 2018-11-28 [SC] + 7B6CD112E36EA69C94583F1906C8222D2397CEA8 +uid [ultimate] Shruthi Rajaram (CODE SIGNING KEY) +sig 306C8222D2397CEA8 2018-11-28 Shruthi Rajaram (CODE SIGNING KEY) +sub rsa4096 2018-11-28 [E] +sig 06C8222D2397CEA8 2018-11-28 Shruthi Rajaram (CODE SIGNING KEY) + +-BEGIN PGP PUBLIC KEY BLOCK- + +mQINBFv+cpMBEADBAdEJi+iEFmbTyezh7tcZvwgfmzgfSgam2lMG6L4wHbcVVjKp +ecOvDaTSVWqLeN2Y45jI6qYtsUO21m2We9rDq4cnUg7kyzx45xl7eFo+yGl9co2m +25+YRwNOkg/wQCDW2q9ajisU9XZ39G6ntCBVt2sc4QK5CRZ0+SZrfxB/QSxNYhhg +UgeBhOtBQiZaNJkK63KPOLsln/kg4pEcobJDFUJzJNMPq3DLBPNtUNsFtQCFLXn4 +vvDhEvM6UT7yoXXEE7tAxOTiZUZAM0hOAnD02Y0Iemt6k36SZvD7xiLwY7wGJyN9 +XsIrW5Rewhgpb/QoI2JGI4hdUfjXHSpQYHrZQcja7ZIrGiwDuxD3gyuF9FqroUiQ +NTnya2YDjlWXPZE5IPmkWiK2By1kQKOaBjHL24mIv/fqvEj4Qk4OylA0wy98Gkx8 +gG8XUQRjzFrsjt/wltY0+qwMYwLDzp67sRT5I9HwSmfVsbB5u+mIbjNMI3e7C/qm +A7n2PngwAISnIY86zW1WZxX1AXpzPozryvCCYzZQhE5wsBLm5jctYDW18IhxY4Cl +xaBITNVBd2EG6fkna/EQkAgBUQj3UCmRC9Vi13cYB7UUXCQHrPhRFqy7CA44qB+i +MrtAaWDAuc/x5z2BcRoA6QN8pQo8O39/PLTA43AQV+L8KlV++S6JZbhK7QARAQAB +tD5TaHJ1dGhpIFJhamFyYW0gKENPREUgU0lHTklORyBLRVkpIDxzaHJ1dGhpcmFq +YXJhbUBhcGFjaGUub3JnPokCTgQTAQoAOBYhBHts0RLjbqaclFg/GQbIIi0jl86o +BQJb/nKTAhsDBQsJCAcCBhUKCQgLAgQWAgMBAh4BAheAAAoJEAbIIi0jl86o6IwP +/3abqTbu9/uO7fYuQldNaeg0aEn2rbLLxXTW09tovh4WG0BGi162z/My4UNJyNr0 +Vr7b1/6p8lmX2pS351Nkm2bLSqdGB308l8KNebNAZWd7WohTjgbQSSIITqxD+1PE +6jPMi1/UK1Kj7rmQleGVBvVx3crNFvtPNEnGDKdMGLBOo2bHdJmCXZP/wJt8vECp +UR9WncdmcckxtDPNXfxSg7C5/lxFCM1fdwz8yS4X+37U6O4WjSA0VScbRLpRYsy3 +WHccGYMN3KoV3x+6NUefxQq9MPj16Nw1/oTbNxfECNiW6VaLTHcErZDupH+I51QE +Wk1A//HsfbaUmFQz3rKh1BAViSaeanELf0mBgIjD5XJ8KQyLl0ERMyZyEqv3LNuq +PKqMkWKCttIcLtfPRD3cNQB60DiL8I5BJ8MM4qDTrlWNIgj9zzb87uUAE6BgQdWQ +ztVGEf1kIRBB0xaco6ZIZhQmtmUlFZXpm+COk+1tZddokq+dKgjahspEO/HD20xD +gbBYYNmuX20dGavwHruHzgJf99/rcO2RC8j7UdbTAqQrO6zBgbbO2+Jtnt3ICPdD +/drNSQKu9Ue2MGtZaOHO34UZW0KzvDvkS2iVwRagyMH/yZqGf5g8laRI/GK8RwlB +/DDU6R5y0MeIR3voNQkvDpbcnB+leB3NhX8wvKZ9tZDDuQINBFv+cpMBEADEVj2r +qLTGXy3lI2PwXGUMCIvqAaGJsL3wrfAg7R6uw8d6FqM9JTBNpHh4UAvWS4Q3q0Ty +joYTCdGzKg2A9pofs3zFUwHMMpwmU7dao/XoSCnQd3JuXB68XEKD9lezz2JHrnlF +znoTJ0Xeq7ogPNy5OAVMWPJ++BsxBdbwoAzecbihDe/hpvAZvTCTyCrHQF4FAt5C +qxxb7rn+HfBnWJZ3PTC82W/BTU6z5IvNBfeTWSzH6mQK2XJLG0+U7OQbVG0WAwlP +fenWU5p09PlytE9r/U27xSjh6QysFt+62fWaJpD2jS+H18nAPEzOMCBZqZGPh8QB +dnqILI/3hT3W1HFIbZEnkuoS4wa1CEVNRHMXmxD/w5DEObxRadj+PWpax9PMyLDU +yLE7LvkDr9ITbleoiPnrl+vkt4/xH8F/h83aIz+9A5mzXvWOOAEMeqe6gVwrz/zl +CXxfUenXED6CuEOvtqqt16Z/fjFklfEwpX5ws7hD/quD/YGNd+V7DrRipcTUAi8e +GcqhfNF+bDfW90A5vjbfCvhDO1UuoXoxnu0GdZ0YjuGCkJjWTnrX3/0kIFsZTsRv +tpEC2mXCwpzI/pG9xYs5jBaJRtDj8AwX7YeA+NTXOF4aXG54FhKZqTqXmL+w8tb/ +/xq9StggmiREW6FF9TO+c8gQ9qYqcbqOWBuZcwARAQABiQI2BBgBCgAgFiEEe2zR +EuNuppyUWD8ZBsgiLSOXzqgFAlv+cpMCGwwACgkQBsgiLSOXzqi47w//SEu+kf5m +MoYa+bwX5pi6lG9UOr8hOOQf2Sq8726MJ+xomg3paf3gUrTB/4OkVhWITM+LCJ0V +7EUSlCSV9rvcQb3vaFGvjVnS2yT1xNrpG/zRzwyHBF1Q/Zjt+jRdGvPd3sFmbJyo +BpjFPmTjKKS4AaZ+Bh9oSs2sYHOAmoPau3jCbZCZ4pwZPlcFpmrJ2dNdqn8IfHh5 +sLzjqF4KrZiBTgEEebL7HNGrdt2co2CkxTo31V4MXmXjQfhLq5Y7iZr1IoLa+35f +gUBovP4DnSXUyCga4QQ1Jkz+4tMZ40XAA5l6UCdnhB6eSYzmhzwP5hldydY4EYC5 +/7VvnClUreLT/1qvHGuELYQ29p7rpU435et2gBvwXoef1U5m3FufqgQHQ1bGxrJI +GpInPyzIkGHfSTlddGSsF+TAX2FBIDmiuTiamjE0m61sMi1gkRKJgdwj9BFUoipe +CEQwDbUAufcd03t1m21EvSfo3DJwq9wUNhzxj3oGcNs12keWgJAcUwzBBU25eWum +3/Rii9ShtwHpAvoogpx89okRxzKAIDpLYr+Osmpgm4p6RtF6+13epjE+ZYD4q333 +yTz+OrULOKmyZkvGuSN9GAHzPSUOxlnssJmbvAgmdYR1/7L5rF+nviT4y8Cn6dwv +Q/nc3wuzpd+tk7AnXDXOUYsF4KFmIkDqs3M= +=/lw/ +-END PGP PUBLIC KEY BLOCK-
[fineract] branch 1.2.0 created (now f5a0146)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch 1.2.0 in repository https://gitbox.apache.org/repos/asf/fineract.git. at f5a0146 Merge pull request #479 from ShruthiRajaram/FINERACT-628-reports No new revisions were added by this update.
[fineract] branch 1.2 deleted (was f5a0146)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch 1.2 in repository https://gitbox.apache.org/repos/asf/fineract.git. was f5a0146 Merge pull request #479 from ShruthiRajaram/FINERACT-628-reports The revisions that were on this branch are still contained in other references; therefore, this change does not discard any commits from the repository.
[fineract] branch 1.2 created (now f5a0146)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch 1.2 in repository https://gitbox.apache.org/repos/asf/fineract.git. at f5a0146 Merge pull request #479 from ShruthiRajaram/FINERACT-628-reports No new revisions were added by this update.
[fineract] 01/01: Merge pull request #479 from ShruthiRajaram/FINERACT-628-reports
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit f5a0146800ff0f9b3018fced7ce96b91ebeb4254 Merge: cb83166 11b6296 Author: ShruthiRajaram AuthorDate: Tue Nov 27 16:03:30 2018 +0530 Merge pull request #479 from ShruthiRajaram/FINERACT-628-reports FINERACT-628 self service user reports api-docs/apiLive.htm | 137 + .../dataqueries/api/RunreportsApiResource.java | 16 ++- .../infrastructure/dataqueries/domain/Report.java | 8 +- .../dataqueries/service/ReadReportingService.java | 8 +- .../service/ReadReportingServiceImpl.java | 38 +++--- .../ReportMailingJobWritePlatformServiceImpl.java | 3 +- .../self/runreport/SelfRunReportApiResource.java | 3 +- .../V345__reports_for_self_service_user.sql| 29 + 8 files changed, 213 insertions(+), 29 deletions(-)
[fineract] branch develop updated (cb83166 -> f5a0146)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from cb83166 Merge pull request #484 from
ShruthiRajaram/FINERACT-628_Surveys
add 11b6296 FINERACT-628 self service user reports
new f5a0146 Merge pull request #479 from
ShruthiRajaram/FINERACT-628-reports
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api-docs/apiLive.htm | 137 +
.../dataqueries/api/RunreportsApiResource.java | 16 ++-
.../infrastructure/dataqueries/domain/Report.java | 8 +-
.../dataqueries/service/ReadReportingService.java | 8 +-
.../service/ReadReportingServiceImpl.java | 38 +++---
.../ReportMailingJobWritePlatformServiceImpl.java | 3 +-
.../self/runreport/SelfRunReportApiResource.java | 3 +-
...sql => V345__reports_for_self_service_user.sql} | 10 +-
8 files changed, 191 insertions(+), 32 deletions(-)
copy
fineract-provider/src/main/resources/sql/migrations/core_db/{V18__update_stretchy_reporting_reportSql.sql
=> V345__reports_for_self_service_user.sql} (56%)
[fineract] branch develop updated (26302b5 -> cb83166)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from 26302b5 Merge pull request #485 from
ShruthiRajaram/FINERACT_628_Products
add be49522 FINERACT-628 Self service APIs for Surveys
new cb83166 Merge pull request #484 from
ShruthiRajaram/FINERACT-628_Surveys
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api-docs/apiLive.htm | 160 +++--
.../self/spm/api/SelfScorecardApiResource.java | 93
.../api/SelfSpmApiResource.java} | 54 +++
3 files changed, 271 insertions(+), 36 deletions(-)
create mode 100644
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/spm/api/SelfScorecardApiResource.java
copy
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/{runreport/SelfRunReportApiResource.java
=> spm/api/SelfSpmApiResource.java} (52%)
[fineract] 01/01: Merge pull request #484 from ShruthiRajaram/FINERACT-628_Surveys
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit cb83166153ad21a683208813a2f6de2908a8e9f8 Merge: 26302b5 be49522 Author: ShruthiRajaram AuthorDate: Mon Nov 26 18:38:15 2018 +0530 Merge pull request #484 from ShruthiRajaram/FINERACT-628_Surveys FINERACT-628 Self service APIs for Surveys api-docs/apiLive.htm | 160 +++-- .../self/spm/api/SelfScorecardApiResource.java | 93 .../portfolio/self/spm/api/SelfSpmApiResource.java | 62 3 files changed, 305 insertions(+), 10 deletions(-)
[fineract] 01/01: Merge pull request #485 from ShruthiRajaram/FINERACT_628_Products
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 26302b52ffd94e3c8ab3469589f0e5e2cc7167ed Merge: 47e7f7e ec3ae14 Author: ShruthiRajaram AuthorDate: Mon Nov 26 18:07:55 2018 +0530 Merge pull request #485 from ShruthiRajaram/FINERACT_628_Products FINERACT-628 Products APIs api-docs/apiLive.htm | 1191 +++- .../service/AppuserClientMapperReadService.java|2 + .../AppuserClientMapperReadServiceImpl.java| 20 +- .../products/api/SelfLoanProductsApiResource.java | 77 ++ .../api/SelfSavingsProductsApiResource.java| 78 ++ .../products/api/SelfShareProductsApiResource.java | 79 ++ 6 files changed, 1444 insertions(+), 3 deletions(-)
[fineract] 01/01: Merge pull request #409 from Sanyam96/swagger-documentation-integration
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit d4abf17d4740611698c9bf9e091237335aaf9d5b Merge: 7956ce7 d68e49e Author: ShruthiRajaram AuthorDate: Fri Nov 16 17:26:12 2018 +0530 Merge pull request #409 from Sanyam96/swagger-documentation-integration GSOC'17:swagger and swagger UI integration on fineract-provider fineract-provider/build.gradle |4 +- fineract-provider/dependencies.gradle |4 +- fineract-provider/dev-dependencies.gradle |5 +- .../accrual/api/AccrualAccountingApiResource.java |8 +- .../api/AccrualAccountingApiResourceSwagger.java | 46 + .../closure/api/GLClosuresApiResource.java | 25 +- .../closure/api/GLClosuresApiResourceSwagger.java | 133 +++ .../api/FinancialActivityAccountsApiResource.java | 23 +- ...inancialActivityAccountsApiResourceSwagger.java | 103 ++ .../glaccount/api/GLAccountsApiResource.java | 37 +- .../api/GLAccountsApiResourceSwagger.java | 190 .../api/JournalEntriesApiResource.java | 48 +- .../api/JournalEntriesApiResourceSwagger.java | 61 ++ .../api/ProvisioningEntriesApiResource.java| 23 +- .../api/ProvisioningEntriesApiResourceSwagger.java | 80 ++ .../rule/api/AccountingRuleApiResource.java| 24 +- .../rule/api/AccountingRuleApiResourceSwagger.java | 130 +++ .../fineract/batch/api/BatchApiResource.java |9 +- .../batch/api/BatchApiResourceSwagger.java | 78 ++ .../fineract/commands/api/AuditsApiResource.java | 32 +- .../commands/api/MakercheckersApiResource.java | 26 +- .../api/MakercheckersApiResourceSwagger.java | 87 ++ .../api/AccountNumberFormatsApiResource.java | 24 +- .../AccountNumberFormatsApiResourceSwagger.java| 129 +++ .../infrastructure/cache/api/CacheApiResource.java |9 +- .../cache/api/CacheApiResourceSwagger.java | 68 ++ .../campaigns/sms/api/SmsCampaignApiResource.java | 24 +- .../codes/api/CodeValuesApiResource.java | 26 +- .../codes/api/CodeValuesApiResourceSwagger.java| 109 ++ .../infrastructure/codes/api/CodesApiResource.java | 22 +- .../codes/api/CodesApiResourceSwagger.java | 95 ++ .../ExternalServicesConfigurationApiResource.java | 12 +- ...nalServicesConfigurationApiResourceSwagger.java | 42 + .../api/GlobalConfigurationApiResource.java| 15 +- .../api/GlobalConfigurationApiResourceSwagger.java | 63 ++ .../api/CreditBureauConfigurationAPI.java |2 + .../dataqueries/api/DatatablesApiResource.java | 78 +- .../api/DatatablesApiResourceSwagger.java | 253 + .../api/EntityDatatableChecksApiResource.java | 21 +- .../EntityDatatableChecksApiResourceSwagger.java | 101 ++ .../dataqueries/api/ReportsApiResource.java| 24 +- .../dataqueries/api/ReportsApiResourceSwagger.java | 139 +++ .../dataqueries/api/RunreportsApiResource.java |7 +- .../api/RunreportsApiResourceSwagger.java | 40 + .../api/DocumentManagementApiResource.java | 48 +- .../api/DocumentManagementApiResourceSwagger.java | 110 ++ .../documentmanagement/api/ImagesApiResource.java |2 + .../api/ImagesApiResourceSwagger.java | 30 + .../api/FineractEntityApiResource.java |2 + .../infrastructure/hooks/api/HookApiResource.java | 26 +- .../hooks/api/HookApiResourceSwagger.java | 147 +++ .../jobs/api/SchedulerApiResource.java |8 +- .../jobs/api/SchedulerApiResourceSwagger.java | 42 + .../jobs/api/SchedulerJobApiResource.java | 27 +- .../jobs/api/SchedulerJobApiResourceSwagger.java | 96 ++ .../api/ReportMailingJobApiResource.java | 31 +- .../api/ReportMailingJobApiResourceSwagger.java| 172 +++ .../api/ReportMailingJobRunHistoryApiResource.java | 14 +- ...portMailingJobRunHistoryApiResourceSwagger.java | 54 + .../security/api/AuthenticationApiResource.java|6 +- .../api/AuthenticationApiResourceSwagger.java | 62 ++ .../security/api/UserDetailsApiResource.java |6 +- .../api/UserDetailsApiResourceSwagger.java | 62 ++ .../infrastructure/sms/api/SmsApiResource.java |2 + .../survey/api/LikelihoodApiResource.java |2 + .../survey/api/PovertyLineApiResource.java |2 + .../survey/api/SurveyApiResource.java | 13 +- .../survey/api/SurveyApiResourceSwagger.java | 103 ++ .../fineract/mix/api/MixReportApiResource.java |2 + .../fineract/mix/api/MixTaxonomyApiResource.java |2 + .../mix/api/MixTaxonomyMappingApiResource.java |2 + .../holiday/api/HolidaysApiResource.java | 35 +- .../holiday/api/HolidaysApiResourceSwagger.java| 146
[fineract] branch develop updated (7956ce7 -> d4abf17)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 7956ce7 Merge pull request #471 from ShruthiRajaram/FINERACT-627 add b5d9429 GSOC'17:swagger and swagger UI integration on fineract-provider add 741607a Merging Develop: Merge Conflict Solved add a13887b Solving Merge Conflicts Before Google CodeIn'17 add 8817e7f Gci swagger integration (#33) add a22297e solve merge conflicts add f030262 updated response.json and removed iml file add e46dc32 removed .idea from .gitignore add d68e49e Merge branch 'develop' into swagger-documentation-integration new d4abf17 Merge pull request #409 from Sanyam96/swagger-documentation-integration The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: fineract-provider/build.gradle |4 +- fineract-provider/dependencies.gradle |4 +- fineract-provider/dev-dependencies.gradle |5 +- .../accrual/api/AccrualAccountingApiResource.java |8 +- .../api/AccrualAccountingApiResourceSwagger.java | 46 + .../closure/api/GLClosuresApiResource.java | 25 +- .../closure/api/GLClosuresApiResourceSwagger.java | 133 +++ .../api/FinancialActivityAccountsApiResource.java | 23 +- ...inancialActivityAccountsApiResourceSwagger.java | 103 ++ .../glaccount/api/GLAccountsApiResource.java | 37 +- .../api/GLAccountsApiResourceSwagger.java | 190 .../api/JournalEntriesApiResource.java | 48 +- .../api/JournalEntriesApiResourceSwagger.java | 61 ++ .../api/ProvisioningEntriesApiResource.java| 23 +- .../api/ProvisioningEntriesApiResourceSwagger.java | 80 ++ .../rule/api/AccountingRuleApiResource.java| 24 +- .../rule/api/AccountingRuleApiResourceSwagger.java | 130 +++ .../fineract/batch/api/BatchApiResource.java |9 +- .../batch/api/BatchApiResourceSwagger.java | 78 ++ .../fineract/commands/api/AuditsApiResource.java | 32 +- .../commands/api/MakercheckersApiResource.java | 26 +- .../api/MakercheckersApiResourceSwagger.java | 87 ++ .../api/AccountNumberFormatsApiResource.java | 24 +- .../AccountNumberFormatsApiResourceSwagger.java| 129 +++ .../infrastructure/cache/api/CacheApiResource.java |9 +- .../cache/api/CacheApiResourceSwagger.java | 68 ++ .../campaigns/sms/api/SmsCampaignApiResource.java | 24 +- .../codes/api/CodeValuesApiResource.java | 26 +- .../codes/api/CodeValuesApiResourceSwagger.java| 109 ++ .../infrastructure/codes/api/CodesApiResource.java | 22 +- .../codes/api/CodesApiResourceSwagger.java | 95 ++ .../ExternalServicesConfigurationApiResource.java | 12 +- ...nalServicesConfigurationApiResourceSwagger.java | 42 + .../api/GlobalConfigurationApiResource.java| 15 +- .../api/GlobalConfigurationApiResourceSwagger.java | 63 ++ .../api/CreditBureauConfigurationAPI.java |2 + .../dataqueries/api/DatatablesApiResource.java | 78 +- .../api/DatatablesApiResourceSwagger.java | 253 + .../api/EntityDatatableChecksApiResource.java | 21 +- .../EntityDatatableChecksApiResourceSwagger.java | 101 ++ .../dataqueries/api/ReportsApiResource.java| 24 +- .../dataqueries/api/ReportsApiResourceSwagger.java | 139 +++ .../dataqueries/api/RunreportsApiResource.java |7 +- .../api/RunreportsApiResourceSwagger.java | 40 + .../api/DocumentManagementApiResource.java | 48 +- .../api/DocumentManagementApiResourceSwagger.java | 110 ++ .../documentmanagement/api/ImagesApiResource.java |2 + .../api/ImagesApiResourceSwagger.java | 30 + .../api/FineractEntityApiResource.java |2 + .../infrastructure/hooks/api/HookApiResource.java | 26 +- .../hooks/api/HookApiResourceSwagger.java | 147 +++ .../jobs/api/SchedulerApiResource.java |8 +- .../jobs/api/SchedulerApiResourceSwagger.java | 42 + .../jobs/api/SchedulerJobApiResource.java | 27 +- .../jobs/api/SchedulerJobApiResourceSwagger.java | 96 ++ .../api/ReportMailingJobApiResource.java | 31 +- .../api/ReportMailingJobApiResourceSwagger.java| 172 +++ .../api/ReportMailingJobRunHistoryApiResource.java | 14 +- ...portMailingJobRunHistoryApiResourceSwagger.java | 54 + .../security/api/AuthenticationApiResource.java|6 +- .../api/AuthenticationApiResourceSwagger.java | 62 ++ .../security/api/UserDetailsApiResource.java |6 +- .../api/UserDetailsApiResourceSwagger
[fineract] branch develop updated (b0fbc6e -> 7956ce7)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from b0fbc6e Merge pull request #490 from ShruthiRajaram/FINERACT-662 add ec57197 FINERACT-627 Back dated client transfer new 7956ce7 Merge pull request #471 from ShruthiRajaram/FINERACT-627 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: api-docs/apiLive.htm | 3 +- .../portfolio/client/api/ClientsApiResource.java | 23 - .../client/service/ClientReadPlatformService.java | 9 ++ .../service/ClientReadPlatformServiceImpl.java | 57 +++- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 101 +++-- .../savings/domain/SavingsAccountTransaction.java | 8 +- ...countWritePlatformServiceJpaRepositoryImpl.java | 65 - .../transfer/api/TransferApiConstants.java | 36 .../transfer/data/TransfersDataValidator.java | 5 +- ...nsferWritePlatformServiceJpaRepositoryImpl.java | 27 +++--- 10 files changed, 281 insertions(+), 53 deletions(-)
[fineract] 01/01: Merge pull request #471 from ShruthiRajaram/FINERACT-627
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 7956ce71089b93d8025ed26292981440f0a8d318 Merge: b0fbc6e ec57197 Author: ShruthiRajaram AuthorDate: Fri Nov 16 15:17:59 2018 +0530 Merge pull request #471 from ShruthiRajaram/FINERACT-627 FINERACT-627 back dated client transfer api-docs/apiLive.htm | 3 +- .../portfolio/client/api/ClientsApiResource.java | 23 - .../client/service/ClientReadPlatformService.java | 9 ++ .../service/ClientReadPlatformServiceImpl.java | 57 +++- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 101 +++-- .../savings/domain/SavingsAccountTransaction.java | 8 +- ...countWritePlatformServiceJpaRepositoryImpl.java | 65 - .../transfer/api/TransferApiConstants.java | 36 .../transfer/data/TransfersDataValidator.java | 5 +- ...nsferWritePlatformServiceJpaRepositoryImpl.java | 27 +++--- 10 files changed, 281 insertions(+), 53 deletions(-)
[fineract] 01/01: Merge pull request #490 from ShruthiRajaram/FINERACT-662
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit b0fbc6e6bc79e58939c7ec2f8cfed9bcd5b90fcb Merge: e486e80 0888d8b Author: ShruthiRajaram AuthorDate: Tue Nov 13 11:05:58 2018 +0530 Merge pull request #490 from ShruthiRajaram/FINERACT-662 FINERACT-662 activation date null check .../main/java/org/apache/fineract/portfolio/group/domain/Group.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[fineract] branch develop updated (e486e80 -> b0fbc6e)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from e486e80 Merge pull request #488 from ShruthiRajaram/FINERACT--656 add 0888d8b FINERACT-662 activation date null check new b0fbc6e Merge pull request #490 from ShruthiRajaram/FINERACT-662 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/fineract/portfolio/group/domain/Group.java | 6 -- 1 file changed, 4 insertions(+), 2 deletions(-)
[fineract] 01/01: Merge pull request #488 from ShruthiRajaram/FINERACT--656
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit e486e804067052bf1ae985424bc929ad35b9acea Merge: 00b973f 2a772b1 Author: ShruthiRajaram AuthorDate: Tue Nov 13 11:00:32 2018 +0530 Merge pull request #488 from ShruthiRajaram/FINERACT--656 FINERACT-656 and FINERACT-655 unable to import client via bulk import… .../client/ClientEntityImportHandler.java | 23 --- .../client/ClientPersonImportHandler.java | 26 +--- .../portfolio/address/data/AddressData.java| 2 + .../service/AddressWritePlatformServiceImpl.java | 70 +++--- .../fineract/portfolio/client/data/ClientData.java | 19 +++--- .../portfolio/client/data/ClientDataValidator.java | 16 - .../service/ClientReadPlatformServiceImpl.java | 15 ++--- 7 files changed, 102 insertions(+), 69 deletions(-)
[fineract] branch develop updated (00b973f -> e486e80)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 00b973f Merge pull request #489 from ShruthiRajaram/FINERACT-659 add 2a772b1 FINERACT-656 and FINERACT-655 unable to import client via bulk import when address is enabled new e486e80 Merge pull request #488 from ShruthiRajaram/FINERACT--656 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../client/ClientEntityImportHandler.java | 23 --- .../client/ClientPersonImportHandler.java | 26 +--- .../portfolio/address/data/AddressData.java| 2 + .../service/AddressWritePlatformServiceImpl.java | 70 +++--- .../fineract/portfolio/client/data/ClientData.java | 19 +++--- .../portfolio/client/data/ClientDataValidator.java | 16 - .../service/ClientReadPlatformServiceImpl.java | 15 ++--- 7 files changed, 102 insertions(+), 69 deletions(-)
[fineract] branch develop updated (9b5c913 -> 00b973f)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 9b5c913 Merge pull request #478 from ShruthiRajaram/FINERACT-628-client-image add 15cb800 FINERACT-659 Account Id issue while importing bulk loan transaction new 00b973f Merge pull request #489 from ShruthiRajaram/FINERACT-659 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../loanrepayment/LoanRepaymentImportHandler.java | 32 +- .../LoanRepaymentWorkbookPopulator.java| 2 +- .../loanaccount/data/LoanTransactionData.java | 14 -- .../service/LoanReadPlatformService.java | 2 ++ .../service/LoanReadPlatformServiceImpl.java | 13 - 5 files changed, 40 insertions(+), 23 deletions(-)
[fineract] 01/01: Merge pull request #489 from ShruthiRajaram/FINERACT-659
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 00b973fd97ed47ee4579a0ad3471af687834dfa6 Merge: 9b5c913 15cb800 Author: ShruthiRajaram AuthorDate: Mon Nov 12 14:57:58 2018 +0530 Merge pull request #489 from ShruthiRajaram/FINERACT-659 FINERACT-659 Account Id issue while importing loan transaction .../loanrepayment/LoanRepaymentImportHandler.java | 32 +- .../LoanRepaymentWorkbookPopulator.java| 2 +- .../loanaccount/data/LoanTransactionData.java | 14 -- .../service/LoanReadPlatformService.java | 2 ++ .../service/LoanReadPlatformServiceImpl.java | 13 - 5 files changed, 40 insertions(+), 23 deletions(-)
[fineract] branch develop updated (99aa2b5 -> 9b5c913)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 99aa2b5 Merge pull request #480 from ShruthiRajaram/FINERACT-628-Guarantors-Support add 6ded9eb FINERACT-628 self service APIs for client image management new 9b5c913 Merge pull request #478 from ShruthiRajaram/FINERACT-628-client-image The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: api-docs/apiLive.htm | 116 + .../portfolio/client/api/ClientApiConstants.java | 1 + .../self/client/api/SelfClientsApiResource.java| 46 3 files changed, 163 insertions(+)
[fineract] 01/01: Merge pull request #478 from ShruthiRajaram/FINERACT-628-client-image
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 9b5c913a06154c45565a50ae0cf563d5c915e0f1 Merge: 99aa2b5 6ded9eb Author: ShruthiRajaram AuthorDate: Mon Nov 5 17:16:24 2018 +0530 Merge pull request #478 from ShruthiRajaram/FINERACT-628-client-image FINERACT-628 self service APIs for client image management api-docs/apiLive.htm | 116 + .../portfolio/client/api/ClientApiConstants.java | 1 + .../self/client/api/SelfClientsApiResource.java| 46 3 files changed, 163 insertions(+)
[fineract] 01/01: Merge pull request #480 from ShruthiRajaram/FINERACT-628-Guarantors-Support
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 99aa2b5bb28f8bf2f38dcbc3cacc8ed03e28a8d7 Merge: f811fa3 ab10ecc Author: ShruthiRajaram AuthorDate: Mon Nov 5 16:27:20 2018 +0530 Merge pull request #480 from ShruthiRajaram/FINERACT-628-Guarantors-Support FINERACT-628 guarantor api for self service user api-docs/apiLive.htm | 248 + .../portfolio/client/api/ClientApiConstants.java | 1 + .../portfolio/client/api/ClientsApiResource.java | 26 ++- .../loanaccount/guarantor/data/ObligeeData.java| 56 + .../service/GuarantorReadPlatformService.java | 5 +- .../service/GuarantorReadPlatformServiceImpl.java | 56 - .../self/client/api/SelfClientsApiResource.java| 11 + .../self/loanaccount/api/SelfLoansApiResource.java | 15 +- 8 files changed, 412 insertions(+), 6 deletions(-)
[fineract] branch develop updated (f811fa3 -> 99aa2b5)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from f811fa3 Merge pull request #481 from wenance/develop add ab10ecc FINERACT-628 guarantor api for self service user new 99aa2b5 Merge pull request #480 from ShruthiRajaram/FINERACT-628-Guarantors-Support The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: api-docs/apiLive.htm | 248 + .../portfolio/client/api/ClientApiConstants.java | 1 + .../portfolio/client/api/ClientsApiResource.java | 26 ++- .../loanaccount/guarantor/data/ObligeeData.java| 56 + .../service/GuarantorReadPlatformService.java | 5 +- .../service/GuarantorReadPlatformServiceImpl.java | 56 - .../self/client/api/SelfClientsApiResource.java| 11 + .../self/loanaccount/api/SelfLoansApiResource.java | 15 +- 8 files changed, 412 insertions(+), 6 deletions(-) create mode 100644 fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/guarantor/data/ObligeeData.java
[fineract] branch develop updated (836c094 -> f811fa3)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 836c094 Merge pull request #475 from ShruthiRajaram/FINERACT-651 add 77ffe26 fix sql error new f811fa3 Merge pull request #481 from wenance/develop The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../V343__scheduled_email_campaign_status.sql | 40 +++--- 1 file changed, 20 insertions(+), 20 deletions(-)
[fineract] branch develop updated (7f84f55 -> 836c094)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 7f84f55 Merge pull request #467 from ShruthiRajaram/develop_FINERACT_638 add 7e8e3ce FINERACT-651 unable to delete client mobile number new 836c094 Merge pull request #475 from ShruthiRajaram/FINERACT-651 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../main/java/org/apache/fineract/portfolio/client/domain/Client.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[fineract] 01/01: Merge pull request #475 from ShruthiRajaram/FINERACT-651
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 836c0945b8143c2c8b16a2613256a81f132b1d4e Merge: 7f84f55 7e8e3ce Author: ShruthiRajaram AuthorDate: Mon Oct 22 12:01:48 2018 +0530 Merge pull request #475 from ShruthiRajaram/FINERACT-651 FINERACT-651 unable to delete client mobile number .../main/java/org/apache/fineract/portfolio/client/domain/Client.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
[fineract] branch develop updated (7cef5ed -> 7f84f55)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from 7cef5ed Merge pull request #466 from
ShruthiRajaram/develop_FINERACT_628.1
add 424bd08 FINERACT-628 Savings account APIs for Self Service App
new 7f84f55 Merge pull request #467 from
ShruthiRajaram/develop_FINERACT_638
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api-docs/apiLive.htm | 470 -
.../self/savings/api/SelfSavingsApiResource.java | 59 ++-
.../savings/data/SelfSavingsAccountConstants.java} | 12 +-
.../savings/data/SelfSavingsDataValidator.java | 44 ++
4 files changed, 578 insertions(+), 7 deletions(-)
copy
fineract-provider/src/main/java/org/apache/fineract/{infrastructure/security/service/BasicAuthTenantDetailsService.java
=> portfolio/self/savings/data/SelfSavingsAccountConstants.java} (74%)
[fineract] 01/01: Merge pull request #467 from ShruthiRajaram/develop_FINERACT_638
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 7f84f55a792f0fcf09178d34c0157ab9648dbc06 Merge: 7cef5ed 424bd08 Author: ShruthiRajaram AuthorDate: Thu Oct 18 17:40:08 2018 +0530 Merge pull request #467 from ShruthiRajaram/develop_FINERACT_638 FINERACT-628 Savings account APIs for Self Service App api-docs/apiLive.htm | 470 - .../self/savings/api/SelfSavingsApiResource.java | 59 ++- .../savings/data/SelfSavingsAccountConstants.java | 28 ++ .../savings/data/SelfSavingsDataValidator.java | 44 ++ 4 files changed, 599 insertions(+), 2 deletions(-)
[fineract] branch develop updated (f45dda4 -> 7cef5ed)
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a change to branch develop
in repository https://gitbox.apache.org/repos/asf/fineract.git.
from f45dda4 Merge pull request #461 from
ShruthiRajaram/develop_FINERACT_611
add 2d6a19a FINERACT:628 API support for self share accounts
new 7cef5ed Merge pull request #466 from
ShruthiRajaram/develop_FINERACT_628.1
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
api-docs/apiLive.htm | 907 +
.../constants/ShareAccountApiConstants.java| 4 +-
.../api/SelfShareAccountsApiResource.java | 167
.../data/SelfShareAccountsDataValidator.java | 75 ++
...serShareAccountsMapperReadPlatformService.java} | 6 +-
...hareAccountsMapperReadPlatformServiceImpl.java} | 21 +-
6 files changed, 1167 insertions(+), 13 deletions(-)
create mode 100644
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/api/SelfShareAccountsApiResource.java
create mode 100644
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/shareaccounts/data/SelfShareAccountsDataValidator.java
copy
fineract-provider/src/main/java/org/apache/fineract/portfolio/{products/service/ProductCommandsService.java
=>
self/shareaccounts/service/AppUserShareAccountsMapperReadPlatformService.java}
(79%)
copy
fineract-provider/src/main/java/org/apache/fineract/portfolio/self/{savings/service/AppuserSavingsMapperReadServiceImpl.java
=>
shareaccounts/service/AppUserShareAccountsMapperReadPlatformServiceImpl.java}
(72%)
[fineract] 01/01: Merge pull request #466 from ShruthiRajaram/develop_FINERACT_628.1
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 7cef5edc2542ef8f2a298bab4dbb5574a6ac9fea Merge: f45dda4 2d6a19a Author: ShruthiRajaram AuthorDate: Mon Oct 8 18:08:52 2018 +0530 Merge pull request #466 from ShruthiRajaram/develop_FINERACT_628.1 FINERACT:628 API support for self share accounts api-docs/apiLive.htm | 907 + .../constants/ShareAccountApiConstants.java| 4 +- .../api/SelfShareAccountsApiResource.java | 167 .../data/SelfShareAccountsDataValidator.java | 75 ++ ...UserShareAccountsMapperReadPlatformService.java | 26 + ...ShareAccountsMapperReadPlatformServiceImpl.java | 51 ++ 6 files changed, 1229 insertions(+), 1 deletion(-)
[fineract] branch develop updated (a5168bf -> f45dda4)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from a5168bf Merge pull request #448 from conradsp/mysql-5.7 add 683c767 FINERACT-611 unable to create share product new f45dda4 Merge pull request #461 from ShruthiRajaram/develop_FINERACT_611 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../shareproducts/serialization/ShareProductDataSerializer.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
[fineract] 01/01: Merge pull request #461 from ShruthiRajaram/develop_FINERACT_611
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit f45dda47a001570c5642829ca7ae4868642e3ce4 Merge: a5168bf 683c767 Author: ShruthiRajaram AuthorDate: Thu Oct 4 18:45:09 2018 +0530 Merge pull request #461 from ShruthiRajaram/develop_FINERACT_611 FINERACT-611 unable to create share product .../shareproducts/serialization/ShareProductDataSerializer.java | 9 + 1 file changed, 5 insertions(+), 4 deletions(-)
[fineract] branch develop updated (b5213c0 -> a5168bf)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from b5213c0 Merge pull request #477 from ShruthiRajaram/FINERACT_546 add 9688f38 Migration to MySQL 5.7 - ensure all group by clauses are valid add dfabdcc Fixes for stretchy reports to ensure compatibility with MySQL 5.7 add 0918ba8 Update for scheduled_email_campaigns add 7832e66 FIx for ClientSummary stretchy report add add8795 Merge branch 'develop' into mysql-5.7 new a5168bf Merge pull request #448 from conradsp/mysql-5.7 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../service/GLAccountReadPlatformServiceImpl.java | 2 +- .../mix/service/XBRLResultServiceImpl.java | 2 +- .../service/StaffReadPlatformServiceImpl.java | 2 +- .../CollectionSheetReadPlatformServiceImpl.java| 6 +++-- .../service/CenterReadPlatformServiceImpl.java | 2 +- .../service/GuarantorReadPlatformServiceImpl.java | 4 ++-- .../service/LoanChargeReadPlatformServiceImpl.java | 2 +- .../service/LoanReadPlatformServiceImpl.java | 4 ++-- .../DepositAccountReadPlatformServiceImpl.java | 2 +- .../service/SearchReadPlatformServiceImpl.java | 2 +- .../service/ScorecardReadPlatformServiceImpl.java | 6 ++--- ...18_7__move_withdrawal_annual_fee_to_charges.sql | 4 ++-- ...add_force_password_reset_in_c_configuration.sql | 6 ++--- .../core_db/V313__multi_rescheduling_script.sql| 1 + .../V343__scheduled_email_campaign_status.sql | 20 .../V90__client_performance_history_reports.sql| 2 +- .../sql/migrations/sample_data/barebones_db.sql| 28 +++--- .../migrations/sample_data/load_sample_data.sql| 28 +++--- 18 files changed, 72 insertions(+), 51 deletions(-) create mode 100644 fineract-provider/src/main/resources/sql/migrations/core_db/V343__scheduled_email_campaign_status.sql
[fineract] 01/01: Merge pull request #448 from conradsp/mysql-5.7
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit a5168bfc0cffeaf0085b44496f50b3dce456dd4f Merge: b5213c0 add8795 Author: ShruthiRajaram AuthorDate: Thu Oct 4 11:21:59 2018 +0530 Merge pull request #448 from conradsp/mysql-5.7 Migration to MySQL 5.7 - ensure all group by clauses are valid .../service/GLAccountReadPlatformServiceImpl.java | 2 +- .../mix/service/XBRLResultServiceImpl.java | 2 +- .../service/StaffReadPlatformServiceImpl.java | 2 +- .../CollectionSheetReadPlatformServiceImpl.java| 6 +++-- .../service/CenterReadPlatformServiceImpl.java | 2 +- .../service/GuarantorReadPlatformServiceImpl.java | 4 ++-- .../service/LoanChargeReadPlatformServiceImpl.java | 2 +- .../service/LoanReadPlatformServiceImpl.java | 4 ++-- .../DepositAccountReadPlatformServiceImpl.java | 2 +- .../service/SearchReadPlatformServiceImpl.java | 2 +- .../service/ScorecardReadPlatformServiceImpl.java | 6 ++--- ...18_7__move_withdrawal_annual_fee_to_charges.sql | 4 ++-- ...add_force_password_reset_in_c_configuration.sql | 6 ++--- .../core_db/V313__multi_rescheduling_script.sql| 1 + .../V343__scheduled_email_campaign_status.sql | 20 .../V90__client_performance_history_reports.sql| 2 +- .../sql/migrations/sample_data/barebones_db.sql| 28 +++--- .../migrations/sample_data/load_sample_data.sql| 28 +++--- 18 files changed, 72 insertions(+), 51 deletions(-)
[fineract] 01/01: Merge pull request #477 from ShruthiRajaram/FINERACT_546
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit b5213c0bcd5471996d721dec4a3619aa9ec74596 Merge: b71ed1c a569fef Author: ShruthiRajaram AuthorDate: Wed Oct 3 18:26:56 2018 +0530 Merge pull request #477 from ShruthiRajaram/FINERACT_546 FINERACT-546 remove group from center .../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
[fineract] branch develop updated (b71ed1c -> b5213c0)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from b71ed1c Merge pull request #454 from MexinaD/FINERACT-623 add a569fef FINERACT-546 remove group from center new b5213c0 Merge pull request #477 from ShruthiRajaram/FINERACT_546 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
[fineract] 01/01: Merge pull request #454 from MexinaD/FINERACT-623
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit b71ed1cb6ae8d9c630894758caee8b79ee8f00c8 Merge: b608444 e8ad073 Author: ShruthiRajaram AuthorDate: Wed Sep 26 11:41:47 2018 +0530 Merge pull request #454 from MexinaD/FINERACT-623 FINERACT-623 - Restriction of product mix fix ...ationWritePlatformServiceJpaRepositoryImpl.java | 37 +- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 33 --- 2 files changed, 36 insertions(+), 34 deletions(-)
[fineract] branch develop updated (b608444 -> b71ed1c)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from b608444 Merge pull request #476 from apache/revert-474-fineract-546 add e8ad073 FINERACT-623 - Restrict of product mix fix new b71ed1c Merge pull request #454 from MexinaD/FINERACT-623 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: ...ationWritePlatformServiceJpaRepositoryImpl.java | 37 +- .../LoanWritePlatformServiceJpaRepositoryImpl.java | 33 --- 2 files changed, 36 insertions(+), 34 deletions(-)
[fineract] branch develop updated (8cc7d5e -> b608444)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 8cc7d5e Merge pull request #474 from ShruthiRajaram/fineract-546 add 3087666 Revert "FINERACT-546 disassociate group from center" new b608444 Merge pull request #476 from apache/revert-474-fineract-546 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-)
[fineract] 01/01: Merge pull request #476 from apache/revert-474-fineract-546
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit b608444a9d28f3eeae18abda7864c13d606b46b5 Merge: 8cc7d5e 3087666 Author: ShruthiRajaram AuthorDate: Mon Sep 24 16:54:42 2018 +0530 Merge pull request #476 from apache/revert-474-fineract-546 Revert "FINERACT-546 disassociate group from center" .../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +--- 1 file changed, 1 insertion(+), 7 deletions(-)
[fineract] 01/01: Revert "FINERACT-546 disassociate group from center"
This is an automated email from the ASF dual-hosted git repository.
shruthirajaram pushed a commit to branch revert-474-fineract-546
in repository https://gitbox.apache.org/repos/asf/fineract.git
commit 308766600fecfcab27db7bdbb6b4051fe9b9455e
Author: ShruthiRajaram
AuthorDate: Mon Sep 24 16:53:03 2018 +0530
Revert "FINERACT-546 disassociate group from center"
---
.../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +---
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java
index a40aad7..c3a14ae 100644
---
a/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java
+++
b/fineract-provider/src/main/java/org/apache/fineract/portfolio/group/domain/Group.java
@@ -108,7 +108,7 @@ public final class Group extends
AbstractPersistableCustom {
@OneToMany(fetch = FetchType.EAGER)
@JoinColumn(name = "parent_id")
-private List groupMembers = new LinkedList<>();
+private final List groupMembers = new LinkedList<>();
@ManyToMany
@JoinTable(name = "m_group_client", joinColumns = @JoinColumn(name =
"group_id"), inverseJoinColumns = @JoinColumn(name = "client_id"))
@@ -744,10 +744,4 @@ public final class Group extends
AbstractPersistableCustom {
this.accountNumber = accountIdentifier;
this.accountNumberRequiresAutoGeneration = false;
}
-
- public void setGroupMembers(List groupMembers) {
- this.groupMembers = groupMembers;
- }
-
-
}
\ No newline at end of file
[fineract] branch revert-474-fineract-546 created (now 3087666)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch revert-474-fineract-546 in repository https://gitbox.apache.org/repos/asf/fineract.git. at 3087666 Revert "FINERACT-546 disassociate group from center" This branch includes the following new commits: new 3087666 Revert "FINERACT-546 disassociate group from center" The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference.
[fineract] branch develop updated (54470db -> 8cc7d5e)
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a change to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git. from 54470db Merge branch 'MexinaD-Loan-greater-than-expected' into develop add 7887612 FINERACT-546 disassociate group from center new 8cc7d5e Merge pull request #474 from ShruthiRajaram/fineract-546 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "add" were already present in the repository and have only been added to this reference. Summary of changes: .../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
[fineract] 01/01: Merge pull request #474 from ShruthiRajaram/fineract-546
This is an automated email from the ASF dual-hosted git repository. shruthirajaram pushed a commit to branch develop in repository https://gitbox.apache.org/repos/asf/fineract.git commit 8cc7d5e39c2340fc00ea5e7020f12fc035c07654 Merge: 54470db 7887612 Author: ShruthiRajaram AuthorDate: Mon Sep 24 16:52:42 2018 +0530 Merge pull request #474 from ShruthiRajaram/fineract-546 FINERACT-546 disassociate group from center .../java/org/apache/fineract/portfolio/group/domain/Group.java| 8 +++- 1 file changed, 7 insertions(+), 1 deletion(-)
[GitHub] fineract issue #466: FINERACT:628 API support for self share accounts
Github user ShruthiRajaram commented on the issue: https://github.com/apache/fineract/pull/466 @conradsp kindly review this PR. My other ticket is dependent on the newly added file in this PR. And there will be conflict if I create same files again. Thank you ---
[GitHub] fineract pull request #457: Fixing Apache POI issue - Formula Cell evaluatio...
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/457#discussion_r209896737
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/ImportHandlerUtils.java
---
@@ -63,8 +63,13 @@ public static Long readAsLong(int colIndex, Row row) {
FormulaEvaluator eval =
row.getSheet().getWorkbook().getCreationHelper().createFormulaEvaluator();
if(c.getCellType() == Cell.CELL_TYPE_FORMULA) {
if(eval!=null) {
-CellValue val = eval.evaluate(c);
-return ((Double) val.getNumberValue()).longValue();
+CellValue val = null;
--- End diff --
Can you please let us know in which scenario a null pointer exception is
thrown. As there is a null check for 'c and eval', I am not able to figure
out the case when a null pointer exception is thrown by the statement in try
block . This applies for all remaining method changes.
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r208863491
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/serialization/RateDefinitionCommandFromApiJsonDeserializer.java
---
@@ -0,0 +1,128 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ */
+package org.apache.fineract.portfolio.rate.serialization;
+
+import com.google.gson.JsonElement;
+import com.google.gson.reflect.TypeToken;
+import java.lang.reflect.Type;
+import java.math.BigDecimal;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.HashSet;
+import java.util.List;
+import java.util.Map;
+import java.util.Set;
+import org.apache.commons.lang.StringUtils;
+import org.apache.fineract.infrastructure.core.data.ApiParameterError;
+import org.apache.fineract.infrastructure.core.data.DataValidatorBuilder;
+import
org.apache.fineract.infrastructure.core.exception.InvalidJsonException;
+import
org.apache.fineract.infrastructure.core.exception.PlatformApiDataValidationException;
+import
org.apache.fineract.infrastructure.core.serialization.FromJsonHelper;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+@Component
+public class RateDefinitionCommandFromApiJsonDeserializer {
+
+ /**
+ * The parameters supported for this command.
+ */
+ private final Set supportedParameters = new HashSet<>(
+ Arrays.asList("id", "name", "percentage", "productApply", "active",
"approveUser", "locale"));
+
+ private final FromJsonHelper fromApiJsonHelper;
+
+ @Autowired
+ public RateDefinitionCommandFromApiJsonDeserializer(final FromJsonHelper
fromApiJsonHelper) {
+this.fromApiJsonHelper = fromApiJsonHelper;
+ }
+
+ public void validateForCreate(final String json) {
+if (StringUtils.isBlank(json)) {
+ throw new InvalidJsonException();
+}
+
+final Type typeOfMap = new TypeToken>() {
+}.getType();
+
+this.fromApiJsonHelper.checkForUnsupportedParameters(typeOfMap, json,
this.supportedParameters);
+
+final List dataValidationErrors = new ArrayList<>();
+
+final DataValidatorBuilder baseDataValidator = new
DataValidatorBuilder(dataValidationErrors)
+.resource("rate");
+
+final JsonElement element = this.fromApiJsonHelper.parse(json);
+
+final String name = this.fromApiJsonHelper.extractStringNamed("name",
element);
--- End diff --
Its advised to keep all parameter names in a constant file and use
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r208853745
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanUtilService.java
---
@@ -135,10 +135,10 @@ public ScheduleGeneratorDTO
buildScheduleGeneratorDTO(final Loan loan, final Loc
boolean isSkipRepaymentOnFirstMonthEnabled =
configurationDomainService.isSkippingMeetingOnFirstDayOfMonthEnabled();
if(isSkipRepaymentOnFirstMonthEnabled){
isSkipRepaymentOnFirstMonth =
isLoanRepaymentsSyncWithMeeting(loan.group(), calendar);
-if(isSkipRepaymentOnFirstMonth) { numberOfDays =
configurationDomainService.retreivePeroidInNumberOfDaysForSkipMeetingDate().intValue();
}
+if(isSkipRepaymentOnFirstMonth) { numberOfDays =
configurationDomainService.retreivePeroidInNumberOfDaysForSkipMeetingDate().intValue();
}
--- End diff --
No changes are made to this file. Kindly remove this file from PR
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r208863144
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java
---
@@ -304,6 +318,29 @@ private boolean
anyChangeInCriticalFloatingRateLinkedParams(JsonCommand command,
return charges;
}
+private List assembleListOfProductRates(final JsonCommand
command) {
+
+final List rates = new ArrayList<>();
+
+if (command.parameterExists("rates")) {
+final JsonArray ratesArray =
command.arrayOfParameterNamed("rates");
+if (ratesArray != null) {
+List idList = new ArrayList<>();
+for (int i = 0; i < ratesArray.size(); i++) {
+final JsonObject jsonObject =
ratesArray.get(i).getAsJsonObject();
+if (jsonObject.has("id")) {
+idList.add(jsonObject.get("id").getAsLong());
+}
+}
+System.out.println(idList.toString());
--- End diff --
remove Print statement
---
[GitHub] fineract issue #441: FINERACT-574
Github user ShruthiRajaram commented on the issue: https://github.com/apache/fineract/pull/441 @Nenge1 While reviewing the PR, I observed few other scenarios which I mentioned in the JIRA issue. Those needs to be addressed before fixing the current issue ---
[GitHub] fineract issue #452: fineract changes for community app bug 1863
Github user ShruthiRajaram commented on the issue: https://github.com/apache/fineract/pull/452 @tonic889 changes look good. But its advised not to have multiple commits in one PR. So can you please squash these commits to one and resend the PR. ---
[GitHub] fineract issue #437: FINERACT-431 - Loan term greater than expected
Github user ShruthiRajaram commented on the issue: https://github.com/apache/fineract/pull/437 reviewed and can be merged ---
[GitHub] fineract pull request #452: fineract changes for community app bug 1863
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/452#discussion_r206880756
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/accountdetails/service/AccountDetailsReadPlatformServiceJpaRepositoryImpl.java
---
@@ -493,6 +513,113 @@ public LoanAccountSummaryData mapRow(final ResultSet
rs, @SuppressWarnings("unus
return new LoanAccountSummaryData(id, accountNo, externalId,
productId, loanProductName, shortLoanProductName, loanStatus, loanType,
loanCycle,
timeline,
inArrears,originalLoan,loanBalance,amountPaid);
}
+
+}
+private static final class GuarantorLoanAccountSummaryDataMapper
implements
+ RowMapper {
+
+ public String guarantorLoanAccountSummarySchema() {
+
+ final StringBuilder accountsSummary = new StringBuilder(
+ "l.id as id, l.account_no as accountNo,
l.external_id as externalId,");
+ accountsSummary
+ .append(" l.product_id as productId, lp.name as
productName, lp.short_name as shortProductName,")
+ .append(" l.loan_status_id as statusId,
l.loan_type_enum as loanType,")
+
+ .append("l.principal_disbursed_derived as
originalLoan,")
+ .append("l.total_outstanding_derived as
loanBalance,")
+ .append("l.total_repayment_derived as
amountPaid,")
+
+ .append(" l.loan_product_counter as loanCycle,")
+
+ .append(" l.submittedon_date as
submittedOnDate,")
+ .append(" sbu.username as submittedByUsername,
sbu.firstname as submittedByFirstname, sbu.lastname as submittedByLastname,")
+
+ .append(" l.rejectedon_date as rejectedOnDate,")
+ .append(" rbu.username as rejectedByUsername,
rbu.firstname as rejectedByFirstname, rbu.lastname as rejectedByLastname,")
+
+ .append(" l.withdrawnon_date as
withdrawnOnDate,")
+ .append(" wbu.username as withdrawnByUsername,
wbu.firstname as withdrawnByFirstname, wbu.lastname as withdrawnByLastname,")
+
+ .append(" l.approvedon_date as approvedOnDate,")
+ .append(" abu.username as approvedByUsername,
abu.firstname as approvedByFirstname, abu.lastname as approvedByLastname,")
--- End diff --
Since usernames retrieved from appuser table is not used, can you remove
left joins that are not required
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206853841
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductReadPlatformServiceImpl.java
---
@@ -465,7 +473,7 @@ public LoanProductData mapRow(final ResultSet rs,
@SuppressWarnings("unused") fi
installmentAmountInMultiplesOf,
allowAttributeOverrides, isLinkedToFloatingInterestRates, floatingRateId,
floatingRateName, interestRateDifferential,
minDifferentialLendingRate, defaultDifferentialLendingRate,
maxDifferentialLendingRate,
isFloatingInterestRateCalculationAllowed, isVariableIntallmentsAllowed,
minimumGap,
-maximumGap, syncExpectedWithDisbursementDate,
canUseForTopup, isEqualAmortization);
+maximumGap, syncExpectedWithDisbursementDate,
canUseForTopup, isEqualAmortization, null, this.rates);
--- End diff --
instead of directly passing null, initialize to a variable (variable name
similar to the one in called method ) and pass it, for readability. And follow
similar approach in all other places
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request: https://github.com/apache/fineract/pull/465#discussion_r206854050 --- Diff: fineract-provider/src/main/resources/sql/migrations/core_db/V343__rates.sql --- @@ -0,0 +1,62 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + +CREATE TABLE IF NOT EXISTS `m_rate` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(250) NOT NULL, + `percentage` decimal(10,2) NOT NULL, + `active` tinyint(1) DEFAULT '0', + `product_apply` varchar(100) NOT NULL, + `created_date` datetime NULL DEFAULT NULL, + `createdby_id` bigint(20) NOT NULL, + `lastmodifiedby_id` bigint(20) NOT NULL, + `lastmodified_date` datetime NULL DEFAULT NULL, + `approve_user` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK_M_RATE_CREATE_USER` (`createdby_id`), + KEY `FK_M_RATE_APPROVE_USER` (`approve_user`), + CONSTRAINT `FK_M_RATE_APPROVE_USER` FOREIGN KEY (`approve_user`) REFERENCES `m_appuser` (`id`), + CONSTRAINT `FK_M_RATE_CREATE_USER` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; + + +CREATE TABLE IF NOT EXISTS `m_loan_rate` ( + `loan_id` bigint(20) NOT NULL, + `rate_id` bigint(20) NOT NULL, + PRIMARY KEY (`loan_id`,`rate_id`), + KEY `FK_M_LOAN_RATE_RATE` (`rate_id`), + CONSTRAINT `FK_M_LOAN_RATE_LOAN` FOREIGN KEY (`loan_id`) REFERENCES `m_loan` (`id`), + CONSTRAINT `FK_M_LOAN_RATE_RATE` FOREIGN KEY (`rate_id`) REFERENCES `m_rate` (`id`) +) ENGINE=InnoDB DEFAULT CHARSET=latin1; --- End diff -- remove ENGINE=InnoDB DEFAULT CHARSET=latin1; ---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206853561
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanUtilService.java
---
@@ -325,4 +332,35 @@ private LocalDate
generateCalculatedRepaymentStartDate(final CalendarHistoryData
return disbursementDatas;
}
+public List fetchRateData(final JsonArray element) {
+List rates = new ArrayList<>();
+
+if (element != null) {
+for (JsonElement jsonElement : element) {
+final JsonObject rateElement =
jsonElement.getAsJsonObject();
+if (rateElement.has("id")) {
+final Long rateId =
this.fromApiJsonHelper.extractLongNamed("id", rateElement);
+Rate rate = findRateByIdIfProvided(rateId);
+rates.add(rate);
+}
+}
+}else{
--- End diff --
remove else block
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206853418
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/api/LoansApiResource.java
---
@@ -178,30 +180,30 @@
private final EntityDatatableChecksReadService
entityDatatableChecksReadService;
private final BulkImportWorkbookService bulkImportWorkbookService;
private final BulkImportWorkbookPopulatorService
bulkImportWorkbookPopulatorService;
-
+private final RateReadService rateReadService;
@Autowired
public LoansApiResource(final PlatformSecurityContext context, final
LoanReadPlatformService loanReadPlatformService,
-final LoanProductReadPlatformService
loanProductReadPlatformService,
-final LoanDropdownReadPlatformService
dropdownReadPlatformService, final FundReadPlatformService
fundReadPlatformService,
-final ChargeReadPlatformService chargeReadPlatformService,
final LoanChargeReadPlatformService loanChargeReadPlatformService,
-final CollateralReadPlatformService
loanCollateralReadPlatformService,
-final LoanScheduleCalculationPlatformService
calculationPlatformService,
-final GuarantorReadPlatformService
guarantorReadPlatformService,
-final CodeValueReadPlatformService
codeValueReadPlatformService, final GroupReadPlatformService
groupReadPlatformService,
-final DefaultToApiJsonSerializer
toApiJsonSerializer,
-final DefaultToApiJsonSerializer
loanApprovalDataToApiJsonSerializer,
-final DefaultToApiJsonSerializer
loanScheduleToApiJsonSerializer,
-final ApiRequestParameterHelper apiRequestParameterHelper,
final FromJsonHelper fromJsonHelper,
-final PortfolioCommandSourceWritePlatformService
commandsSourceWritePlatformService,
-final CalendarReadPlatformService calendarReadPlatformService,
final NoteReadPlatformServiceImpl noteReadPlatformService,
-final PortfolioAccountReadPlatformService
portfolioAccountReadPlatformServiceImpl,
-final AccountAssociationsReadPlatformService
accountAssociationsReadPlatformService,
-final LoanScheduleHistoryReadPlatformService
loanScheduleHistoryReadPlatformService,
-final AccountDetailsReadPlatformService
accountDetailsReadPlatformService,
-final EntityDatatableChecksReadService
entityDatatableChecksReadService,
-final BulkImportWorkbookService bulkImportWorkbookService,
-final BulkImportWorkbookPopulatorService
bulkImportWorkbookPopulatorService) {
+final LoanProductReadPlatformService
loanProductReadPlatformService,
+final LoanDropdownReadPlatformService dropdownReadPlatformService,
final FundReadPlatformService fundReadPlatformService,
+final ChargeReadPlatformService chargeReadPlatformService, final
LoanChargeReadPlatformService loanChargeReadPlatformService,
+final CollateralReadPlatformService
loanCollateralReadPlatformService,
+final LoanScheduleCalculationPlatformService
calculationPlatformService,
+final GuarantorReadPlatformService guarantorReadPlatformService,
+final CodeValueReadPlatformService codeValueReadPlatformService,
final GroupReadPlatformService groupReadPlatformService,
+final DefaultToApiJsonSerializer
toApiJsonSerializer,
+final DefaultToApiJsonSerializer
loanApprovalDataToApiJsonSerializer,
+final DefaultToApiJsonSerializer
loanScheduleToApiJsonSerializer,
+final ApiRequestParameterHelper apiRequestParameterHelper, final
FromJsonHelper fromJsonHelper,
+final PortfolioCommandSourceWritePlatformService
commandsSourceWritePlatformService,
+final CalendarReadPlatformService calendarReadPlatformService,
final NoteReadPlatformServiceImpl noteReadPlatformService,
+final PortfolioAccountReadPlatformService
portfolioAccountReadPlatformServiceImpl,
+final AccountAssociationsReadPlatformService
accountAssociationsReadPlatformService,
+final LoanScheduleHistoryReadPlatformService
loanScheduleHistoryReadPlatformService,
+final AccountDetailsReadPlatformService
accountDetailsReadPlatformService,
+final EntityDatatableChecksReadService
entityDatatableChecksReadService, RateReadService rateReadService,
+final BulkImportWorkbookService bulkImportWorkbookService,
--- End diff --
Kindly make RateReadService rateReadService as the last parameter of the
method
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request: https://github.com/apache/fineract/pull/465#discussion_r206853778 --- Diff: fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/domain/LoanProduct.java --- @@ -102,6 +103,10 @@ @JoinTable(name = "m_product_loan_charge", joinColumns = @JoinColumn(name = "product_loan_id"), inverseJoinColumns = @JoinColumn(name = "charge_id")) private List charges; +@ManyToMany(fetch = FetchType.EAGER) +@JoinTable(name = "m_product_loan_rate", joinColumns = @JoinColumn(name = "product_loan_id"), inverseJoinColumns = @JoinColumn(name = "rate_id")) --- End diff -- @ManyToMany or OneToMany Can the functionality be achieved by using fetch type lazy ---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206853632
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanUtilService.java
---
@@ -325,4 +332,35 @@ private LocalDate
generateCalculatedRepaymentStartDate(final CalendarHistoryData
return disbursementDatas;
}
+public List fetchRateData(final JsonArray element) {
+List rates = new ArrayList<>();
+
+if (element != null) {
+for (JsonElement jsonElement : element) {
+final JsonObject rateElement =
jsonElement.getAsJsonObject();
+if (rateElement.has("id")) {
+final Long rateId =
this.fromApiJsonHelper.extractLongNamed("id", rateElement);
+Rate rate = findRateByIdIfProvided(rateId);
+rates.add(rate);
+}
+}
+}else{
+System.out.println("");
+}
+
+return rates;
+}
+
+public Rate findRateByIdIfProvided(final Long rateId) {
--- End diff --
kindly provide appropriate name
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request: https://github.com/apache/fineract/pull/465#discussion_r206853956 --- Diff: fineract-provider/src/main/java/org/apache/fineract/portfolio/rate/handler/DeleteRateCommandHandler.java --- @@ -0,0 +1,26 @@ +/** --- End diff -- Is this required? ---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206853697
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/service/LoanUtilService.java
---
@@ -325,4 +332,35 @@ private LocalDate
generateCalculatedRepaymentStartDate(final CalendarHistoryData
return disbursementDatas;
}
+public List fetchRateData(final JsonArray element) {
+List rates = new ArrayList<>();
+
+if (element != null) {
+for (JsonElement jsonElement : element) {
+final JsonObject rateElement =
jsonElement.getAsJsonObject();
+if (rateElement.has("id")) {
+final Long rateId =
this.fromApiJsonHelper.extractLongNamed("id", rateElement);
+Rate rate = findRateByIdIfProvided(rateId);
+rates.add(rate);
+}
+}
+}else{
+System.out.println("");
+}
+
+return rates;
+}
+
+public Rate findRateByIdIfProvided(final Long rateId) {
+Rate rate = null;
+if (rateId != null) {
+rate = this.rateRepository.findOne(rateId);
--- End diff --
As per the fineract existing code its advised to access repository methods
using wrapper class
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206853888
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/portfolio/loanproduct/service/LoanProductWritePlatformServiceJpaRepositoryImpl.java
---
@@ -304,6 +319,32 @@ private boolean
anyChangeInCriticalFloatingRateLinkedParams(JsonCommand command,
return charges;
}
+private List assembleListOfProductRates(final JsonCommand
command) {
+
+final List rates = new ArrayList<>();
+
+if (command.parameterExists("rates")) {
+final JsonArray ratesArray =
command.arrayOfParameterNamed("rates");
+if (ratesArray != null) {
+for (int i = 0; i < ratesArray.size(); i++) {
+
+final JsonObject jsonObject =
ratesArray.get(i).getAsJsonObject();
+if (jsonObject.has("id")) {
+final Long id = jsonObject.get("id").getAsLong();
+
+final Rate rate = this.rateRepository.findOne(id);
--- End diff --
Instead of repeated calls to DB, can you try using single query with in
clause and validate
---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request: https://github.com/apache/fineract/pull/465#discussion_r206854038 --- Diff: fineract-provider/src/main/resources/sql/migrations/core_db/V343__rates.sql --- @@ -0,0 +1,62 @@ +-- +-- Licensed to the Apache Software Foundation (ASF) under one +-- or more contributor license agreements. See the NOTICE file +-- distributed with this work for additional information +-- regarding copyright ownership. The ASF licenses this file +-- to you under the Apache License, Version 2.0 (the +-- "License"); you may not use this file except in compliance +-- with the License. You may obtain a copy of the License at +-- +-- http://www.apache.org/licenses/LICENSE-2.0 +-- +-- Unless required by applicable law or agreed to in writing, +-- software distributed under the License is distributed on an +-- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +-- KIND, either express or implied. See the License for the +-- specific language governing permissions and limitations +-- under the License. +-- + +CREATE TABLE IF NOT EXISTS `m_rate` ( + `id` bigint(20) NOT NULL AUTO_INCREMENT, + `name` varchar(250) NOT NULL, + `percentage` decimal(10,2) NOT NULL, + `active` tinyint(1) DEFAULT '0', + `product_apply` varchar(100) NOT NULL, + `created_date` datetime NULL DEFAULT NULL, + `createdby_id` bigint(20) NOT NULL, + `lastmodifiedby_id` bigint(20) NOT NULL, + `lastmodified_date` datetime NULL DEFAULT NULL, + `approve_user` bigint(20) DEFAULT NULL, + PRIMARY KEY (`id`), + KEY `FK_M_RATE_CREATE_USER` (`createdby_id`), + KEY `FK_M_RATE_APPROVE_USER` (`approve_user`), + CONSTRAINT `FK_M_RATE_APPROVE_USER` FOREIGN KEY (`approve_user`) REFERENCES `m_appuser` (`id`), + CONSTRAINT `FK_M_RATE_CREATE_USER` FOREIGN KEY (`createdby_id`) REFERENCES `m_appuser` (`id`) +) ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; --- End diff -- remove ENGINE=InnoDB AUTO_INCREMENT=21 DEFAULT CHARSET=latin1; ---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request: https://github.com/apache/fineract/pull/465#discussion_r206853497 --- Diff: fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/domain/Loan.java --- @@ -392,20 +395,24 @@ @OneToOne(cascade = CascadeType.ALL, mappedBy = "loan", optional = true, orphanRemoval = true, fetch=FetchType.EAGER) private LoanTopupDetails loanTopupDetails; +@ManyToMany(fetch = FetchType.EAGER) --- End diff -- I think it is OneToMany relationship !! it possible to change fetchtype to lazy and achieve the expected results? ---
[GitHub] fineract pull request #465: Fineract 614: Rates module
Github user ShruthiRajaram commented on a diff in the pull request:
https://github.com/apache/fineract/pull/465#discussion_r206768853
--- Diff:
fineract-provider/src/main/java/org/apache/fineract/infrastructure/core/serialization/JsonParserHelper.java
---
@@ -454,7 +454,7 @@ public static LocalDateTime convertDateTimeFrom(final
String dateTimeAsString, f
LocalDateTime eventLocalDateTime = null;
if (StringUtils.isNotBlank(dateTimeAsString)) {
try {
-eventLocalDateTime =
DateTimeFormat.forPattern(dateTimeFormat).withLocale(clientApplicationLocale)
+eventLocalDateTime =
DateTimeFormat.forPattern(dateTimeFormat).withLocale(clientApplicationLocale)
--- End diff --
Since no changes are made in this file, kindly remove this file from PR
---
[GitHub] fineract pull request #467: FINERACT-628 Savings account APIs for Self Servi...
GitHub user ShruthiRajaram opened a pull request: https://github.com/apache/fineract/pull/467 FINERACT-628 Savings account APIs for Self Service App You can merge this pull request into a Git repository by running: $ git pull https://github.com/ShruthiRajaram/fineract develop_FINERACT_638 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/fineract/pull/467.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #467 commit 424bd0884e7f21cc9c945fbbfd130be6423fbdbe Author: ShruthiRajaram Date: 2018-07-17T11:35:55Z FINERACT-628 Savings account APIs for Self Service App ---
[GitHub] fineract pull request #463: FINERACT-628 Savings account APIs for Self Servi...
Github user ShruthiRajaram closed the pull request at: https://github.com/apache/fineract/pull/463 ---
[GitHub] fineract pull request #466: FINERACT:628 API support for self share accounts
GitHub user ShruthiRajaram opened a pull request: https://github.com/apache/fineract/pull/466 FINERACT:628 API support for self share accounts You can merge this pull request into a Git repository by running: $ git pull https://github.com/ShruthiRajaram/fineract develop_FINERACT_628.1 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/fineract/pull/466.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #466 commit 2d6a19a99814f85fb07c33bdd630da4b430ce355 Author: ShruthiRajaram Date: 2018-07-31T13:31:04Z FINERACT:628 API support for self share accounts ---
[GitHub] fineract pull request #463: FINERACT-628 Savings account APIs for Self Servi...
GitHub user ShruthiRajaram opened a pull request: https://github.com/apache/fineract/pull/463 FINERACT-628 Savings account APIs for Self Service App This support only savings account management APIs Issue: https://issues.apache.org/jira/browse/FINERACT-628 You can merge this pull request into a Git repository by running: $ git pull https://github.com/ShruthiRajaram/fineract develop_FINERACT_638 Alternatively you can review and apply these changes as the patch at: https://github.com/apache/fineract/pull/463.patch To close this pull request, make a commit to your master/trunk branch with (at least) the following in the commit message: This closes #463 commit 424bd0884e7f21cc9c945fbbfd130be6423fbdbe Author: ShruthiRajaram Date: 2018-07-17T11:35:55Z FINERACT-628 Savings account APIs for Self Service App ---
[GitHub] fineract pull request #460: FINERACT-628 Savings account APIs for Self Servi...
Github user ShruthiRajaram closed the pull request at: https://github.com/apache/fineract/pull/460 ---
