FINERACT-2169: Refactor api to concrete types and add validation;
This commit is contained in:
committed by
Arnold Gálovics
parent
1b0cc27eec
commit
81ed0260b1
+6
@@ -34,6 +34,7 @@ import org.apache.fineract.infrastructure.core.service.PaginationHelper;
|
||||
import org.apache.fineract.infrastructure.core.service.SearchParameters;
|
||||
import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.infrastructure.security.service.SqlValidator;
|
||||
import org.apache.fineract.infrastructure.security.utils.ColumnValidator;
|
||||
import org.apache.fineract.organisation.monetary.data.CurrencyData;
|
||||
import org.apache.fineract.organisation.monetary.service.CurrencyReadPlatformService;
|
||||
@@ -70,6 +71,7 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement
|
||||
private final DatabaseSpecificSQLGenerator sqlGenerator;
|
||||
private final PaginationHelper paginationHelper;
|
||||
private final ColumnValidator columnValidator;
|
||||
private final SqlValidator sqlValidator;
|
||||
|
||||
private static final class TellerMapper implements RowMapper<TellerData> {
|
||||
|
||||
@@ -399,6 +401,8 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement
|
||||
public CashierTransactionsWithSummaryData retrieveCashierTransactionsWithSummary(final Long cashierId, final boolean includeAllTellers,
|
||||
final LocalDate fromDate, final LocalDate toDate, final String currencyCode, final SearchParameters searchParameters) {
|
||||
|
||||
sqlValidator.validate(searchParameters.getOrderBy());
|
||||
sqlValidator.validate(searchParameters.getSortOrder());
|
||||
final String nextDay = sqlGenerator.incrementDateByOneDay("c.end_date");
|
||||
|
||||
final CashierTransactionSummaryMapper ctsm = new CashierTransactionSummaryMapper();
|
||||
@@ -442,6 +446,8 @@ public class TellerManagementReadPlatformServiceImpl implements TellerManagement
|
||||
public Page<CashierTransactionData> retrieveCashierTransactions(final Long cashierId, final boolean includeAllTellers,
|
||||
final LocalDate fromDate, final LocalDate toDate, final String currencyCode, final SearchParameters searchParameters) {
|
||||
|
||||
sqlValidator.validate(searchParameters.getOrderBy());
|
||||
sqlValidator.validate(searchParameters.getSortOrder());
|
||||
final String nextDay = sqlGenerator.incrementDateByOneDay("c.end_date");
|
||||
|
||||
final CashierTransactionMapper ctm = new CashierTransactionMapper();
|
||||
|
||||
+4
-2
@@ -23,6 +23,7 @@ import org.apache.fineract.accounting.journalentry.domain.JournalEntryRepository
|
||||
import org.apache.fineract.infrastructure.core.service.PaginationHelper;
|
||||
import org.apache.fineract.infrastructure.core.service.database.DatabaseSpecificSQLGenerator;
|
||||
import org.apache.fineract.infrastructure.security.service.PlatformSecurityContext;
|
||||
import org.apache.fineract.infrastructure.security.service.SqlValidator;
|
||||
import org.apache.fineract.infrastructure.security.utils.ColumnValidator;
|
||||
import org.apache.fineract.organisation.monetary.service.CurrencyReadPlatformService;
|
||||
import org.apache.fineract.organisation.office.domain.OfficeRepositoryWrapper;
|
||||
@@ -51,9 +52,10 @@ public class OrganisationTellerConfiguration {
|
||||
public TellerManagementReadPlatformService tellerManagementReadPlatformService(JdbcTemplate jdbcTemplate,
|
||||
PlatformSecurityContext context, OfficeReadPlatformService officeReadPlatformService,
|
||||
StaffReadPlatformService staffReadPlatformService, CurrencyReadPlatformService currencyReadPlatformService,
|
||||
DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper, ColumnValidator columnValidator) {
|
||||
DatabaseSpecificSQLGenerator sqlGenerator, PaginationHelper paginationHelper, ColumnValidator columnValidator,
|
||||
SqlValidator sqlValidator) {
|
||||
return new TellerManagementReadPlatformServiceImpl(jdbcTemplate, context, officeReadPlatformService, staffReadPlatformService,
|
||||
currencyReadPlatformService, sqlGenerator, paginationHelper, columnValidator);
|
||||
currencyReadPlatformService, sqlGenerator, paginationHelper, columnValidator, sqlValidator);
|
||||
}
|
||||
|
||||
@Bean
|
||||
|
||||
Reference in New Issue
Block a user