Merge pull request #5747

FINERACT-2582: Move constant repository lookups outside loops in email campaign and notification services

Author: adamsaghy

fineract-provider/src/main/java/org/apache/fineract/infrastructure/campaigns/jobs/updateemailoutboundwithcampaignmessage/UpdateEmailOutboundWithCampaignMessageTasklet.java

@@ -90,10 +90,10 @@ private void insertDirectCampaignIntoEmailOutboundTable(final String emailParams
             List<HashMap<String, Object>> runReportObject = emailCampaignWritePlatformService
                     .getRunReportByServiceImpl(campaignParams.get("reportName"), queryParamForRunReport);
             if (runReportObject != null) {
+                EmailCampaign emailCampaign = emailCampaignRepository.findById(campaignId).orElse(null);
                 for (HashMap<String, Object> entry : runReportObject) {
                     String message = compileEmailTemplate(messageTemplate, campaignName, entry);
                     Integer clientId = (Integer) entry.get("id");
-                    EmailCampaign emailCampaign = emailCampaignRepository.findById(campaignId).orElse(null);
                     Client client = clientRepositoryWrapper.findOneWithNotFoundDetection(clientId.longValue());
                     String emailAddress = client.emailAddress();
 

fineract-provider/src/main/java/org/apache/fineract/notification/service/NotificationWritePlatformServiceImpl.java

@@ -61,11 +61,11 @@ public Long notify(Collection<Long> userIds, String objectType, Long objectId, S
 
     private List<Long> insertIntoNotificationMapper(Collection<Long> userIds, Long generatedNotificationId) {
         List<Long> mappedIds = new ArrayList<>();
+        Notification notification = this.notificationGeneratorReadRepositoryWrapper.findById(generatedNotificationId);
         for (Long userId : userIds) {
             AppUser appUser = this.appUserRepository.findById(userId).orElseThrow();
-            NotificationMapper notificationMapper = new NotificationMapper()
-                    .setNotification(this.notificationGeneratorReadRepositoryWrapper.findById(generatedNotificationId)).setUserId(appUser)
-                    .setRead(false).setCreatedAt(DateUtils.getLocalDateTimeOfSystem());
+            NotificationMapper notificationMapper = new NotificationMapper().setNotification(notification).setUserId(appUser).setRead(false)
+                    .setCreatedAt(DateUtils.getLocalDateTimeOfSystem());
             this.notificationMapperWritePlatformService.create(notificationMapper);
             mappedIds.add(notificationMapper.getId());
         }