From 8ac474672e386a7808252774c6e10c0cf8e78d80 Mon Sep 17 00:00:00 2001
From: harish <harish.bagora1@gmail.com>
Date: Tue, 15 Oct 2024 15:07:53 +0530
Subject: [PATCH 1/2] Created default instructor user

---
 .../db/changelog/db.changelog-1.0.0.xml       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
index 03f3d5db..556e6ef3 100644
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -1051,5 +1051,22 @@
         <sqlFile dbms="postgresql"
                  path="db/dump/update_system_email_template_of_application_submission.sql" />
     </changeSet>
-
+    <changeSet id="15-10-2024_1" author="Harish Bagora">
+    <insert tableName="gepafin_user">
+        <column name="password" value="$2a$10$doUyOcEm8WPuFfpFT5y18.1DvZzF7exbqgy9X0P27cUBK7YWbfzzS"/>
+        <column name="email" value="instructor@test.test"/>
+        <column name="first_name" value="Test"/>
+        <column name="last_name" value="Instructor"/>
+        <column name="phone_number" value="9876543210"/>
+        <column name="role_id" valueComputed="3"/>
+        <column name="status" value="ACTIVE"/>
+        <column name="last_login" value="2024-10-15 00:00:00"/>
+        <column name="created_date" value="2024-10-15 00:00:00"/>
+        <column name="updated_date" value="2024-10-15 00:00:00"/>
+        <column name="organization" value="PreInstructorOrg"/>
+        <column name="address" value="789 Victory Road"/>
+        <column name="city" value="Naples"/>
+        <column name="country" value="Italy"/>
+    </insert>
+    </changeSet>
 </databaseChangeLog>

From 0a1c6035c7e809fb767e11189e1b457eddeca204 Mon Sep 17 00:00:00 2001
From: rajesh <rajeshkhoreupwork@gmail.com>
Date: Tue, 15 Oct 2024 17:12:03 -0700
Subject: [PATCH 2/2] Fixed aimed to issue

---
 src/main/java/net/gepafin/tendermanagement/dao/CallDao.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
index 0827b62a..13101423 100644
--- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
@@ -551,9 +551,9 @@ public class CallDao {
 		}
 		List<CallTargetAudienceChecklistEntity> existingChecklist = callTargetAudienceChecklistRepository
 				.findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), type.getValue());
-		List<Long> incomingIds = lookupDataReqList.stream().map(LookUpDataReq::getLookUpDataId)
+		List<Long> incomingIds = lookupDataReqList.stream().map(LookUpDataReq::getId)
 				.filter(id -> id != null && id > 0).collect(Collectors.toList());
-		existingChecklist.stream().filter(checklist -> !incomingIds.contains(checklist.getLookupData().getId()))
+		existingChecklist.stream().filter(checklist -> !incomingIds.contains(checklist.getId()))
 				.forEach(this::softDeleteCallTargetAudienceChecklist);
 		lookupDataReqList
 				.forEach(lookUpDataReq -> createOrUpdateCallTargetAudienceChecklist(lookUpDataReq, callEntity, type));