FINERACT-2461: Refactor EmailReadPlatformServiceImpl to use Prepared Statements

Author: Saifulhuq01

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/email/service/EmailReadPlatformServiceImpl.java

@@ -21,6 +21,7 @@
 import java.sql.ResultSet;
 import java.sql.SQLException;
 import java.time.LocalDate;
+import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 import lombok.RequiredArgsConstructor;
@@ -98,7 +99,8 @@ public EmailData mapRow(final ResultSet rs, @SuppressWarnings("unused") final in
 
             final EnumOptionData status = EmailMessageEnumerations.status(statusId);
 
-            return EmailData.instance(id, groupId, clientId, staffId, status, emailAddress, emailSubject, message, null, null, null, null,
+            return EmailData.instance(id, groupId, clientId, staffId, status, emailAddress, emailSubject, message, null,
+                    null, null, null,
                     null, campaignName, sentDate, errorMessage);
         }
     }
@@ -124,42 +126,41 @@ public EmailData retrieveOne(final Long resourceId) {
 
     @Override
     public Collection<EmailData> retrieveAllPending(final SearchParameters searchParameters) {
-        final String sqlPlusLimit = (searchParameters.getLimit() > 0) ? " " + sqlGenerator.limit(searchParameters.getLimit()) : "";
-        final String sql = "select " + this.emailRowMapper.schema() + " where emo.status_enum =? " + sqlPlusLimit;
-
-        return this.jdbcTemplate.query(sql, this.emailRowMapper, EmailMessageStatusType.PENDING.getValue()); // NOSONAR
+        final String sqlPlusLimit = (searchParameters.getLimit() > 0)
+                ? " " + sqlGenerator.limit(searchParameters.getLimit())
+                : "";
+        return retrieveEmailByStatus(EmailMessageStatusType.PENDING.getValue(), sqlPlusLimit);
     }
 
     @Override
     public Collection<EmailData> retrieveAllSent(final SearchParameters searchParameters) {
-        final String sqlPlusLimit = (searchParameters.getLimit() > 0) ? " " + sqlGenerator.limit(searchParameters.getLimit()) : "";
-        final String sql = "select " + this.emailRowMapper.schema() + " where emo.status_enum = ?" + sqlPlusLimit;
-
-        return this.jdbcTemplate.query(sql, this.emailRowMapper, EmailMessageStatusType.SENT.getValue()); // NOSONAR
+        final String sqlPlusLimit = (searchParameters.getLimit() > 0)
+                ? " " + sqlGenerator.limit(searchParameters.getLimit())
+                : "";
+        return retrieveEmailByStatus(EmailMessageStatusType.SENT.getValue(), sqlPlusLimit);
     }
 
     @Override
     public List<Long> retrieveExternalIdsOfAllSent(final Integer limit) {
         final String sqlPlusLimit = (limit > 0) ? " " + sqlGenerator.limit(limit) : "";
-        final String sql = "select external_id from " + this.emailRowMapper.tableName() + " where status_enum =? " + sqlPlusLimit;
+        final String sql = "select external_id from " + this.emailRowMapper.tableName() + " where status_enum =? "
+                + sqlPlusLimit;
 
         return this.jdbcTemplate.queryForList(sql, Long.class, EmailMessageStatusType.SENT.getValue()); // NOSONAR
     }
 
     @Override
     public Collection<EmailData> retrieveAllDelivered(final Integer limit) {
         final String sqlPlusLimit = (limit > 0) ? " " + sqlGenerator.limit(limit) : "";
-        final String sql = "select " + this.emailRowMapper.schema() + " where emo.status_enum = ?" + sqlPlusLimit;
-
-        return this.jdbcTemplate.query(sql, this.emailRowMapper, EmailMessageStatusType.DELIVERED.getValue()); // NOSONAR
+        return retrieveEmailByStatus(EmailMessageStatusType.DELIVERED.getValue(), sqlPlusLimit);
     }
 
     @Override
     public Collection<EmailData> retrieveAllFailed(final SearchParameters searchParameters) {
-        final String sqlPlusLimit = (searchParameters.getLimit() > 0) ? " " + sqlGenerator.limit(searchParameters.getLimit()) : "";
-        final String sql = "select " + this.emailRowMapper.schema() + " where emo.status_enum = ?" + sqlPlusLimit;
-
-        return this.jdbcTemplate.query(sql, this.emailRowMapper, EmailMessageStatusType.FAILED.getValue()); // NOSONAR
+        final String sqlPlusLimit = (searchParameters.getLimit() > 0)
+                ? " " + sqlGenerator.limit(searchParameters.getLimit())
+                : "";
+        return retrieveEmailByStatus(EmailMessageStatusType.FAILED.getValue(), sqlPlusLimit);
     }
 
     @Override
@@ -185,4 +186,16 @@ public Page<EmailData> retrieveEmailByStatus(final Integer limit, final Integer
         return this.paginationHelper.fetchPage(this.jdbcTemplate, sqlBuilder.toString(),
                 new Object[] { status, fromDateString, toDateString }, this.emailRowMapper);
     }
+
+    private Collection<EmailData> retrieveEmailByStatus(Integer status, String sqlPlusLimit) {
+        String sql = "select " + this.emailRowMapper.schema() + " where emo.status_enum = ?";
+        List<Object> args = new ArrayList<>();
+        args.add(status);
+
+        if (sqlPlusLimit != null) {
+            sql += sqlPlusLimit;
+        }
+
+        return this.jdbcTemplate.query(sql, this.emailRowMapper, args.toArray());
+    }
 }

integration-tests/src/test/java/org/apache/fineract/integrationtests/DelinquencyBucketsIntegrationTest.java

@@ -120,7 +120,8 @@ public void testCreateDelinquencyRanges() {
         assertNotNull(delinquencyRangeResponse01);
         assertNotNull(ranges);
         assertFalse(ranges.isEmpty());
-        DelinquencyRangeData range = ranges.get(ranges.size() - 1);
+        DelinquencyRangeData range = ranges.stream().filter(r -> r.getId().equals(delinquencyRangeResponse01.getResourceId())).findFirst()
+                .orElseThrow(() -> new AssertionError("Range with id " + delinquencyRangeResponse01.getResourceId() + " not found"));
         assertEquals(1, range.getMinimumAgeDays(), "Expected Min Age Days to 1");
         assertEquals(3, range.getMaximumAgeDays(), "Expected Max Age Days to 3");
     }