Resolved conflict

src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java

@@ -992,9 +992,11 @@ public class ApplicationDao {
 //		call = callService.validatePublishedCall(call.getId());
 //		checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
         HubEntity hubEntity = hubService.valdateHub(call.getHub().getId());
+        if(call.getAllowMultipleApplications() == null || Boolean.FALSE.equals(call.getAllowMultipleApplications())){
             if(hubEntity.getUniqueUuid().equals(defaultHubUuid)){
                 checkIfApplicationExists(call, userWithCompanyEntity, userEntity);
             }
+        }
         ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity);
 		applicationEntity.setComments(applicationRequest.getComments());
 		applicationEntity = saveApplicationEntity(applicationEntity);

src/main/java/net/gepafin/tendermanagement/dao/CallDao.java

@@ -224,6 +224,10 @@ public class CallDao {
 		callEntity.setHub(userEntity.getHub());
 		callEntity.setNumberOfCheck(createCallRequest.getNumberOfCheck());
 		callEntity.setAppointmentTemplateId(createCallRequest.getAppointmentTemplateId());
+		callEntity.setAllowMultipleApplications(false);
+		if (createCallRequest.getAllowMultipleApplications() != null) {
+			callEntity.setAllowMultipleApplications(createCallRequest.getAllowMultipleApplications());
+		}
 		callEntity = callRepository.save(callEntity);
 		log.info("CallEntity saved with ID: {} for call name: '{}'", callEntity.getId(), callEntity.getName());
 		
@@ -406,6 +410,7 @@ public class CallDao {
 		createCallResponseBean.setDocumentationRequested(callEntity.getDocumentationRequested());
 		createCallResponseBean.setPriorityArea(callEntity.getPriorityArea());
 		createCallResponseBean.setConfidi(callEntity.getConfidi());
+		createCallResponseBean.setAllowMultipleApplications(callEntity.getAllowMultipleApplications());
 		createCallResponseBean.setAmountMin(callEntity.getAmountMin());
 		createCallResponseBean.setPhoneNumber(callEntity.getPhoneNumber());
 		createCallResponseBean.setEndTime(callEntity.getEndTime());
@@ -683,6 +688,7 @@ public class CallDao {
 		setIfUpdated(callEntity::getEvaluationVersion, callEntity::setEvaluationVersion, updateCallRequest.getEvaluationVersion().getValue());
 		setIfUpdated(callEntity::getNumberOfCheck, callEntity::setNumberOfCheck, updateCallRequest.getNumberOfCheck());
 		setIfUpdated(callEntity::getAppointmentTemplateId, callEntity::setAppointmentTemplateId, updateCallRequest.getAppointmentTemplateId());
+		setIfUpdated(callEntity::getAllowMultipleApplications, callEntity::setAllowMultipleApplications, updateCallRequest.getAllowMultipleApplications());
 		callEntity = callRepository.save(callEntity);
 		
 		/** This code is responsible for adding a version history log for the "update call step 1" operation **/
@@ -792,6 +798,7 @@ public class CallDao {
 		callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate());
 		callDetailsResponseBean.setNumberOfCheck(callEntity.getNumberOfCheck());
 		callDetailsResponseBean.setAppointmentTemplateId(callEntity.getAppointmentTemplateId());
+		callDetailsResponseBean.setAllowMultipleApplications(callEntity.getAllowMultipleApplications());
 		return callDetailsResponseBean;
 	}
 

src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java

@@ -99,5 +99,8 @@ public class CallEntity extends BaseEntity {
 
     @Column(name = "APPOINTMENT_TEMPLATE_ID")
     private Long appointmentTemplateId;
+
+    @Column(name = "allow_multiple_applications")
+    private Boolean allowMultipleApplications;
 }
 

src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java

@@ -44,6 +44,8 @@ public class CreateCallRequestStep1 {
 
     private Boolean confidi;
 
+    private Boolean allowMultipleApplications;
+
     private List<FaqReq> faq;
 
     private EvaluationVersionEnum evaluationVersion;

src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java

@@ -38,6 +38,8 @@ public class UpdateCallRequestStep1 {
 
 	private Boolean confidi;
 
+	private Boolean allowMultipleApplications;
+
 	private List<FaqReq> faq;
 
 	private Long numberOfCheck;

src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java

@@ -23,6 +23,8 @@ public class CallDetailsResponseBean {
 
     private Boolean confidi;
 
+    private Boolean allowMultipleApplications;
+
     private CallStatusEnum status;
 
     private Long regionId;

src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java

@@ -44,6 +44,8 @@ public class CallResponse {
     
     private Boolean confidi;
 
+    private Boolean allowMultipleApplications;
+
     private BigDecimal amountMin;
 
     private String email;

src/main/resources/db/changelog/db.changelog-1.0.0.xml

@@ -2990,4 +2990,10 @@
             <column name="vat_number" type="VARCHAR(255)"></column>
         </addColumn>
     </changeSet>
+
+    <changeSet id="02-07-2025_RK_152053" author="Rajesh Khore">
+        <addColumn tableName="call">
+            <column name="allow_multiple_applications" type="BOOLEAN" defaultValueBoolean="false"></column>
+             </addColumn>
+    </changeSet>
 </databaseChangeLog>