BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolved conflict

Browse Source
This commit is contained in:
nisha
2024-10-15 18:12:50 +05:30
parent e896c6ab1b 0a1c6035c7
commit 251f0606fd
2 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
View File

@@ -551,9 +551,9 @@ public class CallDao {
} }
List<CallTargetAudienceChecklistEntity> existingChecklist = callTargetAudienceChecklistRepository List<CallTargetAudienceChecklistEntity> existingChecklist = callTargetAudienceChecklistRepository
.findByCallIdAndLookupDataTypeAndIsDeletedFalse(callEntity.getId(), type.getValue()); .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()); .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); .forEach(this::softDeleteCallTargetAudienceChecklist);
lookupDataReqList lookupDataReqList
.forEach(lookUpDataReq -> createOrUpdateCallTargetAudienceChecklist(lookUpDataReq, callEntity, type)); .forEach(lookUpDataReq -> createOrUpdateCallTargetAudienceChecklist(lookUpDataReq, callEntity, type));

20
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -1052,7 +1052,7 @@
path="db/dump/update_system_email_template_of_application_submission.sql" /> path="db/dump/update_system_email_template_of_application_submission.sql" />
</changeSet> </changeSet>
<changeSet id="15-10-2024" author="Nisha Kashyap"> <changeSet id="15-10-2024_2" author="Nisha Kashyap">
<preConditions onFail="MARK_RAN"> <preConditions onFail="MARK_RAN">
<not> <not>
<tableExists tableName="login_attempt" /> <tableExists tableName="login_attempt" />
@@ -1083,4 +1083,22 @@
</changeSet> </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> </databaseChangeLog>