From f238790f26e35659bfd6343693d03448936cbf11 Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Wed, 23 Oct 2024 21:11:17 +0530
Subject: [PATCH] resolved conflicts

---
 src/main/java/net/gepafin/tendermanagement/dao/CallDao.java  | 1 +
 .../gepafin/tendermanagement/dao/EvaluationCriteriaDao.java  | 5 ++++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
index 5a8a604a..e7b303d2 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
@@ -223,6 +223,7 @@ public class CallDao {
 			criteriaEntity = new EvaluationCriteriaEntity();
 			criteriaEntity.setCall(callEntity);
 			criteriaEntity.setLookupData(lookupDataEntity);
+			criteriaEntity.setScore(0L);
 			criteriaEntity.setIsDeleted(false);
 		}
 		setIfUpdated(criteriaEntity::getScore, criteriaEntity::setScore, criteriaReq.getScore());
diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java
index f747d38f..1be3cf7d 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/EvaluationCriteriaDao.java
@@ -43,7 +43,10 @@ public class EvaluationCriteriaDao {
 				.validateLookUpData(evaluationCriteriaRequest.getLookUpDataId());
 		entity.setCall(callEntity);
 		entity.setLookupData(looDataEntity);
-		entity.setScore(evaluationCriteriaRequest.getScore());
+		entity.setScore(0L);
+		if (evaluationCriteriaRequest.getScore() != null) {
+			entity.setScore(evaluationCriteriaRequest.getScore());
+		}
 		entity = evaluationCriteriaRepository.save(entity);
 		return entity;
 	}