CBSNexora/cbsnexora-backend
4
0
Fork 0
Code Issues Pull Requests Actions 37 Packages Projects Releases Wiki Activity

FINERACT-2202: Bulk import fix

Browse Source
This commit is contained in:
danielales2541
2025-05-10 14:39:06 +02:00
committed by Arnold Gálovics
parent 9026fb9546
commit e70e00328a
3 changed files with 12 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
fineract-core/src/main/java/org/apache/fineract/portfolio/savings/SavingsApiConstants.java
+4 -1
View File
@@ -71,7 +71,7 @@ public class SavingsApiConstants {
public static final String dateFormatParamName = "dateFormat";
public static final String monthDayFormatParamName = "monthDayFormat";
public static final String staffIdParamName = "savingsOfficerId";
public static final String accountIdParamName = "accountId";
// savings product and account parameters
public static final String idParamName = "id";
public static final String isGSIM = "isGSIM";
@@ -170,6 +170,9 @@ public class SavingsApiConstants {
public static final String amountOutstandingParamName = "amountOutstanding";
public static final String amountOrPercentageParamName = "amountOrPercentage";
public static final String amountParamName = "amount";
public static final String isManualTransaction = "isManualTransaction";
public static final String lienTransaction = "lienTransaction";
public static final String chargesPaidByData = "chargesPaidByData";
public static final String amountPaidParamName = "amountPaid";
public static final String chargeOptionsParamName = "chargeOptions";
public static final String chargePaymentModeParamName = "chargePaymentMode";
fineract-provider/src/main/java/org/apache/fineract/infrastructure/bulkimport/importhandler/savings/SavingsTransactionImportHandler.java
+3 -3
View File
@@ -66,7 +66,7 @@ public class SavingsTransactionImportHandler implements ImportHandler {
@Override
public Count process(final Workbook workbook, final String locale, final String dateFormat) {
List<SavingsAccountTransactionData> savingsTransactions = readExcelFile(workbook, locale, dateFormat);
return importEntity(workbook, savingsTransactions, dateFormat);
return importEntity(workbook, savingsTransactions, dateFormat, locale);
}
private List<SavingsAccountTransactionData> readExcelFile(final Workbook workbook, final String locale, final String dateFormat) {
@@ -115,13 +115,13 @@ public class SavingsTransactionImportHandler implements ImportHandler {
}
private Count importEntity(final Workbook workbook, final List<SavingsAccountTransactionData> savingsTransactions,
final String dateFormat) {
final String dateFormat, final String locale) {
Sheet savingsTransactionSheet = workbook.getSheet(TemplatePopulateImportConstants.SAVINGS_TRANSACTION_SHEET_NAME);
int successCount = 0;
int errorCount = 0;
String errorMessage = "";
GsonBuilder gsonBuilder = GoogleGsonSerializerHelper.createGsonBuilder();
gsonBuilder.registerTypeAdapter(LocalDate.class, new DateSerializer(dateFormat));
gsonBuilder.registerTypeAdapter(LocalDate.class, new DateSerializer(dateFormat, locale));
gsonBuilder.registerTypeAdapter(SavingsAccountTransactionEnumData.class, new SavingsAccountTransactionEnumValueSerialiser());
for (SavingsAccountTransactionData transaction : savingsTransactions) {
fineract-savings/src/main/java/org/apache/fineract/portfolio/savings/data/SavingsAccountConstant.java
+5 -4
View File
@@ -46,10 +46,11 @@ public class SavingsAccountConstant extends SavingsApiConstants {
* get response parameters to match those of request parameters.
*/
protected static final Set<String> SAVINGS_ACCOUNT_TRANSACTION_REQUEST_DATA_PARAMETERS = new HashSet<>(
Arrays.asList(localeParamName, dateFormatParamName, transactionDateParamName, transactionAmountParamName,
paymentTypeIdParamName, transactionAccountNumberParamName, checkNumberParamName, routingCodeParamName,
receiptNumberParamName, bankNumberParamName, retailEntriesParamName, childAccountIdParamName, noteParamName));
protected static final Set<String> SAVINGS_ACCOUNT_TRANSACTION_REQUEST_DATA_PARAMETERS = new HashSet<>(Arrays.asList(localeParamName,
dateFormatParamName, transactionDateParamName, transactionAmountParamName, paymentTypeIdParamName,
transactionAccountNumberParamName, checkNumberParamName, routingCodeParamName, receiptNumberParamName, bankNumberParamName,
retailEntriesParamName, childAccountIdParamName, noteParamName, amountParamName, dateParamName, isManualTransaction,
lienTransaction, chargesPaidByData, submittedOnDateParamName, accountIdParamName));
protected static final Set<String> SAVINGS_ACCOUNT_TRANSACTION_RESPONSE_DATA_PARAMETERS = new HashSet<>(
Arrays.asList(idParamName, accountNoParamName));