You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@fineract.apache.org by ra...@apache.org on 2016/11/14 14:06:15 UTC
[13/14] incubator-fineract git commit: Merge branch 'PR240' into
develop
Merge branch 'PR240' into develop
Project: http://git-wip-us.apache.org/repos/asf/incubator-fineract/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-fineract/commit/19ba91a6
Tree: http://git-wip-us.apache.org/repos/asf/incubator-fineract/tree/19ba91a6
Diff: http://git-wip-us.apache.org/repos/asf/incubator-fineract/diff/19ba91a6
Branch: refs/heads/develop
Commit: 19ba91a6d383d3b8359771941032cb86775fd82c
Parents: b86a337 2d1f6ab
Author: Adi Narayana Raju <ad...@confluxtechnologies.com>
Authored: Mon Nov 14 18:11:41 2016 +0530
Committer: Adi Narayana Raju <ad...@confluxtechnologies.com>
Committed: Mon Nov 14 18:11:41 2016 +0530
----------------------------------------------------------------------
api-docs/apiLive.htm | 473 ++++++++++++-
.../commands/service/CommandWrapperBuilder.java | 47 ++
.../campaigns/constants/CampaignType.java | 76 ++
.../campaigns/helper/SmsConfigUtils.java | 76 ++
.../sms/api/SmsCampaignApiResource.java | 195 ++++++
.../sms/constants/SmsCampaignConstants.java | 32 +
.../sms/constants/SmsCampaignEnumerations.java | 94 +++
.../sms/constants/SmsCampaignStatus.java | 72 ++
.../sms/constants/SmsCampaignTriggerType.java | 98 +++
.../campaigns/sms/data/CampaignPreviewData.java | 39 ++
.../data/MessageGatewayConfigurationData.java | 81 +++
.../sms/data/SmsBusinessRulesData.java | 92 +++
.../campaigns/sms/data/SmsCampaignData.java | 206 ++++++
.../campaigns/sms/data/SmsCampaignTimeLine.java | 44 ++
.../campaigns/sms/data/SmsProviderData.java | 72 ++
.../campaigns/sms/domain/SmsCampaign.java | 561 +++++++++++++++
.../sms/domain/SmsCampaignRepository.java | 40 ++
.../domain/SmsCampaignStatusEnumerations.java | 55 ++
.../exception/ConnectionFailureException.java | 30 +
.../GatewayConnectionConfigurationNotFound.java | 30 +
...ampaignMustBeClosedToBeDeletedException.java | 28 +
.../SmsCampaignMustBeClosedToEditException.java | 29 +
.../sms/exception/SmsCampaignNotFound.java | 28 +
.../ActivateSmsCampaignCommandHandler.java | 47 ++
.../handler/CloseSmsCampaignCommandHandler.java | 43 ++
.../CreateSmsCampaignCommandHandler.java | 46 ++
.../DeleteSmsCampaignCommandHandler.java | 45 ++
.../ReactivateSmsCampaignCommandHandler.java | 45 ++
.../UpdateSmsCampaignCommandHandler.java | 46 ++
.../sms/serialization/SmsCampaignValidator.java | 302 ++++++++
.../sms/service/SmsCampaignDomainService.java | 25 +
.../service/SmsCampaignDomainServiceImpl.java | 499 ++++++++++++++
.../SmsCampaignDropdownReadPlatformService.java | 40 ++
...CampaignDropdownReadPlatformServiceImpl.java | 118 ++++
.../service/SmsCampaignReadPlatformService.java | 36 +
.../SmsCampaignReadPlatformServiceImpl.java | 260 +++++++
.../SmsCampaignWritePlatformService.java | 59 ++
.../SmsCampaignWritePlatformServiceJpaImpl.java | 686 +++++++++++++++++++
...ropertiesCommandFromApiJsonDeserializer.java | 6 +
.../service/ExternalServicesConstants.java | 37 +
...alServicesPropertiesReadPlatformService.java | 3 +
...rvicesPropertiesReadPlatformServiceImpl.java | 39 ++
...ExternalServicesReadPlatformServiceImpl.java | 4 +
.../core/serialization/FromJsonHelper.java | 4 +
.../core/serialization/JsonParserHelper.java | 13 +
.../core/service/PaginationHelper.java | 10 +
.../core/service/SearchParameters.java | 16 +
.../service/ReadReportingService.java | 5 +
.../service/ReadReportingServiceImpl.java | 31 +
.../infrastructure/jobs/service/JobName.java | 5 +-
.../infrastructure/sms/SmsApiConstants.java | 5 +-
.../infrastructure/sms/api/SmsApiResource.java | 34 +
.../infrastructure/sms/data/SmsData.java | 54 +-
.../data/SmsMessageApiQueueResourceData.java | 125 ++++
.../data/SmsMessageApiReportResourceData.java | 75 ++
.../sms/data/SmsMessageApiResponseData.java | 67 ++
.../sms/data/SmsMessageDeliveryReportData.java | 113 +++
.../infrastructure/sms/domain/SmsMessage.java | 104 ++-
.../sms/domain/SmsMessageAssembler.java | 18 +-
.../sms/domain/SmsMessageRepository.java | 5 +-
.../sms/domain/SmsMessageStatusType.java | 4 +
.../SmsCountryCodeNotFoundException.java | 28 +
.../SmsMessageScheduledJobService.java | 47 ++
.../SmsMessageScheduledJobServiceImpl.java | 295 ++++++++
.../sms/service/SmsReadPlatformService.java | 20 +
.../sms/service/SmsReadPlatformServiceImpl.java | 145 +++-
.../portfolio/client/domain/Client.java | 8 +-
.../client/domain/ClientTransaction.java | 4 +
...ntWritePlatformServiceJpaRepositoryImpl.java | 70 +-
.../BusinessEventNotificationConstants.java | 31 +-
.../loanaccount/api/LoansApiResource.java | 12 +-
.../portfolio/loanaccount/domain/Loan.java | 6 +-
.../loanaccount/domain/LoanTransaction.java | 8 +
.../exception/InvalidLoanTypeException.java | 32 +
...onWritePlatformServiceJpaRepositoryImpl.java | 2 +-
.../service/LoanReadPlatformServiceImpl.java | 1 -
.../paymentdetail/domain/PaymentDetail.java | 1 +
.../domain/SavingsAccountDomainServiceJpa.java | 28 +-
.../domain/SavingsAccountTransaction.java | 8 +-
...ntWritePlatformServiceJpaRepositoryImpl.java | 75 +-
...ssWritePlatformServiceJpaRepositoryImpl.java | 20 +-
...erWritePlatformServiceJpaRepositoryImpl.java | 37 +-
.../resources/META-INF/spring/appContext.xml | 1 +
.../migrations/core_db/V322__sms_campaign.sql | 277 ++++++++
84 files changed, 6634 insertions(+), 94 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/19ba91a6/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java
----------------------------------------------------------------------
diff --cc fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java
index a181438,ae1b0f4..f255ea6
--- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java
+++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountDomainServiceJpa.java
@@@ -82,11 -89,12 +89,12 @@@ public class SavingsAccountDomainServic
final boolean isSavingsInterestPostingAtCurrentPeriodEnd = this.configurationDomainService
.isSavingsInterestPostingAtCurrentPeriodEnd();
final Integer financialYearBeginningMonth = this.configurationDomainService.retrieveFinancialYearBeginningMonth();
-
if (transactionBooleanValues.isRegularTransaction() && !account.allowWithdrawal()) { throw new DepositAccountTransactionNotAllowedException(
account.getId(), "withdraw", account.depositAccountType()); }
+ this.businessEventNotifierService.notifyBusinessEventToBeExecuted(BUSINESS_EVENTS.SAVINGS_WITHDRAWAL,
+ constructEntityMap(BUSINESS_ENTITY.SAVING, account));
final Set<Long> existingTransactionIds = new HashSet<>();
- final boolean interestPostAsOn = false;
+ final LocalDate postInterestOnDate = null;
final Set<Long> existingReversedTransactionIds = new HashSet<>();
updateExistingTransactionsDetails(account, existingTransactionIds, existingReversedTransactionIds);
final SavingsAccountTransactionDTO transactionDTO = new SavingsAccountTransactionDTO(fmt, transactionDate, transactionAmount,
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/19ba91a6/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/domain/SavingsAccountTransaction.java
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-fineract/blob/19ba91a6/fineract-provider/src/main/java/org/apache/fineract/portfolio/savings/service/SavingsAccountWritePlatformServiceJpaRepositoryImpl.java
----------------------------------------------------------------------