From bb34972c044b5187a098d25f8ce858a7ac15a01d Mon Sep 17 00:00:00 2001 From: rajesh Date: Sun, 24 Nov 2024 22:03:15 +0530 Subject: [PATCH] removed code smells --- .../dao/ApplicationAmendmentRequestDao.java | 28 ++++++------------- 1 file changed, 9 insertions(+), 19 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java index 45d6fdb3..8f7fe151 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java @@ -1,6 +1,5 @@ package net.gepafin.tendermanagement.dao; -import com.fasterxml.jackson.core.JsonProcessingException; import com.fasterxml.jackson.core.type.TypeReference; import com.fasterxml.jackson.databind.ObjectMapper; import jakarta.persistence.criteria.Join; @@ -33,7 +32,6 @@ import java.time.LocalDateTime; import java.time.temporal.ChronoUnit; import java.util.*; import java.util.function.Function; -import java.util.stream.Collector; import java.util.stream.Collectors; import static net.gepafin.tendermanagement.util.Utils.log; @@ -85,21 +83,11 @@ public class ApplicationAmendmentRequestDao { @Autowired private SystemEmailTemplatesService systemEmailTemplatesService; - @Autowired - private CallDao callDao; - - @Autowired - private DocumentRepository documentRepository; - @Autowired private HubService hubService; -// @Autowired -// private MailUtil mailUtil; @Autowired private Validator validator; - @Autowired - private ApplicationDao applicationDao; @Autowired private EmailLogDao emailLogDao; @@ -460,13 +448,15 @@ public class ApplicationAmendmentRequestDao { .stream().collect(Collectors.toMap(AmendmentFormField::getFieldId, Function.identity())); Map applicationFormFieldMap = getApplicationFormFieldList(existingApplicationAmendment, amendmentFormFieldMap.keySet().stream().toList()).stream().collect(Collectors.toMap(ApplicationFormFieldEntity::getFieldId, Function.identity())); - updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{ - AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId()); - ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId()); - updateApplicationFormField(applicationFormFieldEntity,applicationFormFieldRequest, amendmentFormField); - updateFormField(applicationFormFieldRequest, amendmentFormField); - }); - existingApplicationAmendment.setFormFields(Utils.convertListToJsonString(amendmentFormFieldMap.values().stream().toList())); + if(updateRequest.getApplicationFormFields() != null) { + updateRequest.getApplicationFormFields().stream().forEach(applicationFormFieldRequest->{ + AmendmentFormField amendmentFormField = getAmendmentFormField(amendmentFormFieldMap,applicationFormFieldRequest.getFieldId()); + ApplicationFormFieldEntity applicationFormFieldEntity = getApplicationFormField(applicationFormFieldMap, applicationFormFieldRequest.getFieldId()); + updateApplicationFormField(applicationFormFieldEntity,applicationFormFieldRequest, amendmentFormField); + updateFormField(applicationFormFieldRequest, amendmentFormField); + }); + existingApplicationAmendment.setFormFields(Utils.convertListToJsonString(amendmentFormFieldMap.values().stream().toList())); + } ApplicationAmendmentRequestEntity updatedApplicationAmendment = saveApplicationAmendmentRequestEntity(existingApplicationAmendment); ApplicationAmendmentRequestResponse response = convertEntityToResponse(updatedApplicationAmendment);