From 1fc54445b5db1d8f2592af18c6e9fbb03998445a Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Wed, 13 Nov 2024 20:48:38 +0530
Subject: [PATCH] Updated code

---
 .../dao/BeneficiaryPreferredCallDao.java       | 18 +++++++++++-------
 1 file changed, 11 insertions(+), 7 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java
index 1ab1c980..60f8ea20 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/BeneficiaryPreferredCallDao.java
@@ -21,6 +21,7 @@ import org.springframework.stereotype.Component;
 import jakarta.servlet.http.HttpServletRequest;
 
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 
@@ -36,16 +37,19 @@ public class BeneficiaryPreferredCallDao {
     private Validator validator;
 
 
-    public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(HttpServletRequest httpServletRequest, BeneficiaryPreferredCallReq request,UserEntity user) {
+    public BeneficiaryPreferredCallResponseBean createBeneficiaryPreferredCall(HttpServletRequest httpServletRequest, BeneficiaryPreferredCallReq request, UserEntity user) {
         log.info("Creating new beneficiary preferred call with details: {}", request);
         validator.validateUserWithCompany(httpServletRequest, request.getCompanyId());
-        boolean exists = beneficiaryPreferredCallRepository
-                .findByUserIdAndCallIdAndCompanyIdAndIsDeletedFalse(user.getId(), request.getCallId(), request.getCompanyId())
-                .isPresent();
-        if (exists) {
-            throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.DUPLICATE_BENEFICIARY_CALL));
+
+        Optional<BeneficiaryPreferredCallEntity> existingCall = beneficiaryPreferredCallRepository
+                .findByUserIdAndCallIdAndCompanyIdAndIsDeletedFalse(user.getId(), request.getCallId(), request.getCompanyId());
+
+        if (existingCall.isPresent()) {
+            log.warn("Duplicate beneficiary preferred call detected: {}", existingCall.get());
+            throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.DUPLICATE_BENEFICIARY_CALL));
         }
-        BeneficiaryPreferredCallEntity entity = convertRequestToEntity(request,user);
+
+        BeneficiaryPreferredCallEntity entity = convertRequestToEntity(request, user);
         entity = beneficiaryPreferredCallRepository.save(entity);
         log.info("Beneficiary preferred call created with ID: {}", entity.getId());
         return convertEntityToResponse(entity);