Merge pull request #204 from Kitzanos/feature/GEPAFINBE-164

GEPAFINBE-164 (Add 2 fields in Table Call)

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

@@ -200,6 +200,8 @@ public class AssignedApplicationsDao {
         if(applicationEvaluationEntity.isPresent()){
             assignedApplicationsResponse.setEvaluationEndDate(applicationEvaluationEntity.get().getEndDate());
         }
+        assignedApplicationsResponse.setNumberOfCheck(application.getCall().getNumberOfCheck());
+        assignedApplicationsResponse.setProductId(application.getCall().getProductId());
         return assignedApplicationsResponse;
     }
 

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

@@ -201,6 +201,8 @@ public class CallDao {
 		callEntity.setStartTime(DateTimeUtil.parseTime(createCallRequest.getStartTime()));
 		callEntity.setEndTime(DateTimeUtil.parseTime(createCallRequest.getEndTime()));
 		callEntity.setHub(userEntity.getHub());
+		callEntity.setNumberOfCheck(createCallRequest.getNumberOfCheck());
+		callEntity.setProductId(createCallRequest.getProductId());
 		callEntity = callRepository.save(callEntity);
 		
 		/** This code is responsible for adding a version history log for the "Create Call" operation. **/
@@ -607,6 +609,8 @@ public class CallDao {
 		setIfUpdated(callEntity::getEndTime, callEntity::setEndTime, DateTimeUtil.parseTime(updateCallRequest.getEndTime()));
 		setIfUpdated(callEntity::getConfidi, callEntity::setConfidi, updateCallRequest.getConfidi());
 		setIfUpdated(callEntity::getEvaluationVersion, callEntity::setEvaluationVersion, updateCallRequest.getEvaluationVersion().getValue());
+		setIfUpdated(callEntity::getNumberOfCheck, callEntity::setNumberOfCheck, updateCallRequest.getNumberOfCheck());
+		setIfUpdated(callEntity::getProductId, callEntity::setProductId, updateCallRequest.getProductId());
 		callEntity = callRepository.save(callEntity);
 		
 		/** This code is responsible for adding a version history log for the "update call step 1" operation **/
@@ -713,7 +717,8 @@ public class CallDao {
 		callDetailsResponseBean.setPhoneNumber(callEntity.getPhoneNumber());
 		callDetailsResponseBean.setCreatedDate(callEntity.getCreatedDate());
 		callDetailsResponseBean.setUpdatedDate(callEntity.getUpdatedDate());
-
+		callDetailsResponseBean.setNumberOfCheck(callEntity.getNumberOfCheck());
+		callDetailsResponseBean.setProductId(callEntity.getProductId());
 		return callDetailsResponseBean;
 	}
 
@@ -737,6 +742,8 @@ public class CallDao {
 		createCallResponseBean.setFaq(faqService.getFaqByCallId(callEntity.getId()));
 		createCallResponseBean.setAimedTo(amiedTo);
 		createCallResponseBean.setCheckList(checkList);
+		createCallResponseBean.setNumberOfCheck(callEntity.getNumberOfCheck());
+		createCallResponseBean.setProductId(callEntity.getProductId());
 		return createCallResponseBean;
 	}
 

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

@@ -91,5 +91,11 @@ public class CallEntity extends BaseEntity {
 
     @Column(name = "evaluationVersion")
     private String evaluationVersion;
+
+    @Column(name = "NUMBER_OF_CHECK")
+    private BigDecimal numberOfCheck;
+
+    @Column(name = "PRODUCT_ID")
+    private BigDecimal productId;
 }
 

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

@@ -24,6 +24,10 @@ public class CreateCallRequestStep1 {
 
     private BigDecimal amountMax;
 
+    private BigDecimal numberOfCheck;
+
+    private BigDecimal productId;
+
     private List<LookUpDataReq> aimedTo;
 
     private String documentationRequested;

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

@@ -41,6 +41,10 @@ public class UpdateCallRequestStep1 {
 
 	private List<FaqReq> faq;
 
+	private BigDecimal numberOfCheck;
+
+	private BigDecimal productId;
+
 	private EvaluationVersionEnum evaluationVersion;
 
 }

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

@@ -5,6 +5,7 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.enums.EvaluationVersionEnum;
 import net.gepafin.tendermanagement.model.BaseBean;
 
+import java.math.BigDecimal;
 import java.time.LocalDateTime;
 
 @Data
@@ -23,6 +24,8 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime callEndDate;
     private String companyName;
     private LocalDateTime evaluationEndDate;
+    private BigDecimal numberOfCheck;
+    private BigDecimal productId;
     private EvaluationVersionEnum evaluationVersion;
 
 }

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

@@ -57,5 +57,9 @@ public class CallDetailsResponseBean {
 
     private Long preferredCallId;
 
+    private BigDecimal numberOfCheck;
+
+    private BigDecimal productId;
+
     private EvaluationVersionEnum evaluationVersion;
 }

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

@@ -50,6 +50,10 @@ public class CallResponse {
 
     private String phoneNumber;
 
+    private BigDecimal numberOfCheck;
+
+    private BigDecimal productId;
+
     @JsonSerialize(using = DynamicLocalTimeSerializer.class)
     private LocalTime startTime;
 

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

@@ -2380,6 +2380,12 @@
                  path="db/dump/update_system_email_template_application_rejected_04_02_2025.sql"/>
     </changeSet>
 
+    <changeSet id="06-02-2025_NK_155519" author="Nisha Kashyap">
+        <addColumn tableName="call">
+            <column name="number_of_check" type="numeric"></column>
+            <column name="product_id" type="numeric"></column>
+        </addColumn>
+    </changeSet>
     <changeSet id="06-02-2025_PK_165700" author="Piyush Kag">
 
         <sqlFile dbms="postgresql"