Resolving merge conflicts
Project: http://git-wip-us.apache.org/repos/asf/fineract/repo Commit: http://git-wip-us.apache.org/repos/asf/fineract/commit/d0fa56dd Tree: http://git-wip-us.apache.org/repos/asf/fineract/tree/d0fa56dd Diff: http://git-wip-us.apache.org/repos/asf/fineract/diff/d0fa56dd Branch: refs/heads/develop Commit: d0fa56dd00d174001d6aad0e4e61e221f83acd72 Parents: 5004815 cbfdfa0 Author: ThisuraThejith <[email protected]> Authored: Tue Jun 13 06:20:34 2017 +0530 Committer: ThisuraThejith <[email protected]> Committed: Tue Jun 13 06:20:34 2017 +0530 ---------------------------------------------------------------------- docs/system-architecture/404.css | 154 ++++++++++++ docs/system-architecture/404.html | 146 +---------- .../WebContent/META-INF/MANIFEST.MF | 3 + fineract-provider/build.gradle | 1 + .../service/AccountingProcessorHelper.java | 57 +++-- .../internal/ApplyLoanCommandStrategy.java | 4 +- .../internal/ApplySavingsCommandStrategy.java | 4 +- .../internal/ApproveLoanCommandStrategy.java | 4 +- .../internal/CollectChargesCommandStrategy.java | 4 +- .../internal/CreateChargeCommandStrategy.java | 4 +- .../internal/DisburseLoanCommandStrategy.java | 4 +- .../serialization/BatchRequestJsonHelper.java | 2 +- .../fineract/batch/service/BatchApiService.java | 4 +- .../batch/service/ResolutionHelper.java | 4 +- .../commands/annotation/CommandType.java | 4 +- .../fineract/commands/domain/CommandSource.java | 23 ++ .../commands/domain/CommandWrapper.java | 27 ++- .../provider/CommandHandlerProvider.java | 9 +- .../commands/service/CommandWrapperBuilder.java | 38 ++- ...ioCommandSourceWritePlatformServiceImpl.java | 7 +- .../core/api/ApiRequestParameterHelper.java | 2 +- .../infrastructure/core/api/JsonCommand.java | 29 ++- .../boot/AbstractApplicationConfiguration.java | 2 +- .../core/boot/WarWebApplicationInitializer.java | 2 +- .../core/data/DataValidatorBuilder.java | 23 +- .../CommandProcessingResultJsonSerializer.java | 2 +- ...ettyPrintingOffJsonSerializerGoogleGson.java | 2 +- ...rettyPrintingOnJsonSerializerGoogleGson.java | 2 +- .../core/serialization/FromJsonHelper.java | 2 +- .../api/CreditBureauConfigurationAPI.java | 239 +++++++++++++++++++ .../data/CreditBureauConfigurationData.java | 68 ++++++ .../creditbureau/data/CreditBureauData.java | 77 ++++++ .../CreditBureauLoanProductMappingData.java | 112 +++++++++ .../data/CreditBureauMasterData.java | 52 ++++ .../creditbureau/data/CreditBureauProduct.java | 53 ++++ .../data/OrganisationCreditBureauData.java | 91 +++++++ .../creditbureau/domain/CreditBureau.java | 112 +++++++++ .../domain/CreditBureauConfiguration.java | 101 ++++++++ .../domain/CreditBureauLoanProductMapping.java | 150 ++++++++++++ ...reditBureauLoanProductMappingRepository.java | 27 +++ .../domain/CreditBureauRepository.java | 30 +++ .../domain/OrganisationCreditBureau.java | 100 ++++++++ .../OrganisationCreditBureauRepository.java | 27 +++ ...dOrganisationCreditBureauCommandHandler.java | 45 ++++ ...tBureauLoanProductMappingCommandHandler.java | 46 ++++ .../UpdateCreditBureauCommandHandler.java | 48 ++++ ...tBureauLoanProductMappingCommandHandler.java | 49 ++++ ...ditBureauCommandFromApiJsonDeserializer.java | 90 +++++++ ...anProductCommandFromApiJsonDeserializer.java | 137 +++++++++++ ...auLoanProductMappingReadPlatformService.java | 33 +++ ...anProductMappingReadPlatformServiceImpl.java | 122 ++++++++++ ...uLoanProductMappingWritePlatformService.java | 30 +++ ...nProductMappingWritePlatformServiceImpl.java | 96 ++++++++ .../CreditBureauMasterReadPlatformService.java | 31 +++ .../CreditBureauReadConfigurationService.java | 33 +++ ...reditBureauReadConfigurationServiceImpl.java | 102 ++++++++ .../CreditBureauReadPlatformService.java | 29 +++ .../CreditBureauReadPlatformServiceImpl.java | 77 ++++++ ...nisationCreditBureauReadPlatformService.java | 29 +++ ...tionCreditBureauReadPlatformServiceImpl.java | 93 ++++++++ ...sationCreditBureauWritePlatflormService.java | 29 +++ ...onCreditBureauWritePlatflormServiceImpl.java | 94 ++++++++ .../ReadWriteNonCoreDataServiceImpl.java | 22 +- .../ContentRepositoryUtils.java | 2 +- .../domain/ReportMailingJob.java | 16 +- ...eportMailingJobWritePlatformServiceImpl.java | 6 +- .../validation/ReportMailingJobValidator.java | 6 +- .../InvalidTenantIdentiferException.java | 2 +- .../sms/data/SmsMessageApiResponseData.java | 4 +- .../sms/data/SmsMessageDeliveryReportData.java | 4 +- .../organisation/teller/data/CashierData.java | 37 +-- .../organisation/teller/data/TellerData.java | 2 +- .../teller/data/TellerJournalData.java | 2 +- .../teller/data/TellerTransactionData.java | 2 +- .../organisation/teller/domain/Cashier.java | 22 +- .../teller/domain/CashierTransaction.java | 4 +- .../calendar/domain/CalendarFrequencyType.java | 4 +- .../client/domain/ClientTransaction.java | 4 +- .../CollectionSheetConstants.java | 1 + ...CollectionSheetTransactionDataValidator.java | 3 +- .../collectionsheet/data/SavingsDueData.java | 13 +- .../CollectionSheetReadPlatformServiceImpl.java | 22 +- .../common/domain/DaysInMonthType.java | 3 +- .../portfolio/common/domain/DaysInYearType.java | 3 +- .../service/CenterReadPlatformServiceImpl.java | 24 -- .../loanaccount/api/LoansApiResource.java | 11 +- .../portfolio/loanaccount/domain/Loan.java | 7 +- .../loanaccount/domain/LoanCharge.java | 8 +- .../loanaccount/domain/LoanSummary.java | 2 +- .../loanaccount/domain/LoanTransaction.java | 5 + ...ingBalanceInterestLoanScheduleGenerator.java | 2 +- .../LoanRescheduleRequestDataValidator.java | 6 +- .../domain/LoanRescheduleRequest.java | 4 +- .../LoanRescheduleRequestNotFoundException.java | 2 +- ...scheduleRequestWritePlatformServiceImpl.java | 4 +- .../service/LoanReadPlatformService.java | 2 + .../service/LoanReadPlatformServiceImpl.java | 18 ++ ...anWritePlatformServiceJpaRepositoryImpl.java | 4 +- .../InterestRecalculationCompoundingMethod.java | 3 +- .../InterestRecalculationPeriodMethod.java | 3 +- .../domain/LoanRescheduleStrategyMethod.java | 4 +- .../savings/DepositAccountOnClosureType.java | 2 +- ...avingsInterestCalculationDaysInYearType.java | 3 +- .../savings/SavingsInterestCalculationType.java | 3 +- .../data/SavingsAccountTransactionDTO.java | 13 +- .../savings/data/SavingsProductData.java | 11 + .../savings/domain/DepositAccountAssembler.java | 5 +- .../domain/DepositAccountDomainService.java | 3 + .../domain/DepositAccountDomainServiceJpa.java | 17 +- .../savings/domain/RecurringDepositAccount.java | 2 +- .../domain/SavingsAccountDomainServiceJpa.java | 6 +- ...ntWritePlatformServiceJpaRepositoryImpl.java | 28 ++- ...ntWritePlatformServiceJpaRepositoryImpl.java | 5 +- .../ShareAccountCommandsServiceImpl.java | 2 +- .../ShareProductCommandsServiceImpl.java | 2 +- ...erWritePlatformServiceJpaRepositoryImpl.java | 12 +- .../resources/META-INF/spring/appContext.xml | 2 +- .../V327__creditbureau_configuration.sql | 89 +++++++ .../provider/CommandHandlerProviderTest.java | 2 +- 119 files changed, 3155 insertions(+), 366 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/fineract/blob/d0fa56dd/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java ---------------------------------------------------------------------- diff --cc fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java index 9b8ca2f,bb4e9b0..5ce58e4 --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/CollectionSheetConstants.java @@@ -50,4 -50,20 +50,5 @@@ public class CollectionSheetConstants public static final String loanIdParamName = "loanId"; public static final String savingsIdParamName = "savingsId"; public static final String transactionAmountParamName = "transactionAmount"; + public static final String depositAccountTypeParamName = "depositAccountType"; - - public static final Set<String> COLLECTIONSHEET_REQUEST_DATA_PARAMETERS = new HashSet<>(Arrays.asList(localeParamName, - dateFormatParamName, transactionDateParamName, actualDisbursementDateParamName, bulkRepaymentTransactionsParamName, - bulkDisbursementTransactionsParamName, noteParamName, calendarIdParamName, clientsAttendanceParamName, - bulkSavingsDueTransactionsParamName, PaymentDetailConstants.paymentTypeParamName, - PaymentDetailConstants.accountNumberParamName, PaymentDetailConstants.checkNumberParamName, - PaymentDetailConstants.routingCodeParamName, PaymentDetailConstants.receiptNumberParamName, - PaymentDetailConstants.bankNumberParamName, isTransactionDateOnNonMeetingDateParamName)); - - public static final Set<String> INDIVIDUAL_COLLECTIONSHEET_REQUEST_DATA_PARAMETERS = new HashSet<>(Arrays.asList(localeParamName, - dateFormatParamName, transactionDateParamName, actualDisbursementDateParamName, bulkRepaymentTransactionsParamName, - bulkDisbursementTransactionsParamName, noteParamName, bulkSavingsDueTransactionsParamName)); - - public static final Set<String> INDIVIDUAL_COLLECTIONSHEET_SUPPORTED_PARAMS = new HashSet<>(Arrays.asList(transactionDateParamName, - localeParamName, dateFormatParamName, officeIdParamName, staffIdParamName)); } http://git-wip-us.apache.org/repos/asf/fineract/blob/d0fa56dd/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/CollectionSheetTransactionDataValidator.java ---------------------------------------------------------------------- diff --cc fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/CollectionSheetTransactionDataValidator.java index 826f4a3,56edceb..ec6192e --- a/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/CollectionSheetTransactionDataValidator.java +++ b/fineract-provider/src/main/java/org/apache/fineract/portfolio/collectionsheet/data/CollectionSheetTransactionDataValidator.java @@@ -35,7 -48,7 +35,8 @@@ import org.apache.fineract.infrastructu 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.apache.fineract.portfolio.collectionsheet.CollectionSheetConstants; + import org.apache.fineract.infrastructure.core.service.DateUtils; import org.apache.fineract.portfolio.paymentdetail.PaymentDetailConstants; import org.joda.time.LocalDate; import org.springframework.beans.factory.annotation.Autowired; @@@ -135,15 -119,12 +136,15 @@@ public class CollectionSheetTransaction final JsonElement element = this.fromApiJsonHelper.parse(json); - final LocalDate transactionDate = this.fromApiJsonHelper.extractLocalDateNamed(transactionDateParamName, element); - baseDataValidator.reset().parameter(transactionDateParamName).value(transactionDate).notNull().validateDateBeforeOrEqual(DateUtils.getLocalDateOfTenant()); + final LocalDate transactionDate = this.fromApiJsonHelper.extractLocalDateNamed(CollectionSheetConstants + .transactionDateParamName, element); + baseDataValidator.reset().parameter(CollectionSheetConstants.transactionDateParamName).value(transactionDate) - .notNull(); ++ .notNull().validateDateBeforeOrEqual(DateUtils.getLocalDateOfTenant()); - final String note = this.fromApiJsonHelper.extractStringNamed(noteParamName, element); + final String note = this.fromApiJsonHelper.extractStringNamed(CollectionSheetConstants.noteParamName, element); if (StringUtils.isNotBlank(note)) { - baseDataValidator.reset().parameter(noteParamName).value(note).notExceedingLengthOf(1000); + baseDataValidator.reset().parameter(CollectionSheetConstants.noteParamName).value(note) + .notExceedingLengthOf(1000); } validateDisbursementTransactions(element, baseDataValidator); http://git-wip-us.apache.org/repos/asf/fineract/blob/d0fa56dd/fineract-provider/src/main/java/org/apache/fineract/portfolio/loanaccount/rescheduleloan/data/LoanRescheduleRequestDataValidator.java ----------------------------------------------------------------------
