Added application evaluation form and form field

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

@@ -669,7 +669,7 @@ public class ApplicationDao {
         return documentIds;
     }
 
-    private List<Long> validateDocumentIds(String documentId) {
+    public List<Long> validateDocumentIds(String documentId) {
         if (documentId != null && !documentId.isEmpty()) {
             return Arrays.stream(documentId.split(","))
                     .map(Long::parseLong)

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

@@ -12,10 +12,7 @@ import net.gepafin.tendermanagement.model.request.*;
 import net.gepafin.tendermanagement.model.response.*;
 import net.gepafin.tendermanagement.repositories.*;
 import net.gepafin.tendermanagement.service.*;
-import net.gepafin.tendermanagement.util.DateTimeUtil;
+import net.gepafin.tendermanagement.util.*;
-import net.gepafin.tendermanagement.util.LoggingUtil;
-import net.gepafin.tendermanagement.util.Utils;
-import net.gepafin.tendermanagement.util.Validator;
 import net.gepafin.tendermanagement.web.rest.api.errors.CustomValidationException;
 import net.gepafin.tendermanagement.web.rest.api.errors.ResourceNotFoundException;
 import net.gepafin.tendermanagement.web.rest.api.errors.Status;
@@ -25,6 +22,7 @@ import org.springframework.stereotype.Component;
 import org.springframework.util.CollectionUtils;
 
 import java.math.BigDecimal;
+import java.text.MessageFormat;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.temporal.ChronoUnit;
@@ -32,6 +30,7 @@ import java.util.*;
 import java.util.function.Function;
 import java.util.stream.Collectors;
 
+import static net.gepafin.tendermanagement.util.Utils.log;
 import static net.gepafin.tendermanagement.util.Utils.setIfUpdated;
 
 @Component
@@ -116,6 +115,27 @@ public class ApplicationEvaluationDao {
     @Autowired
     private HubService hubService;
 
+    @Autowired
+    private EvaluationFormService evaluationFormService;
+
+    @Autowired
+    private EvaluationFormDao evaluationFormDao;
+
+    @Autowired
+    private ApplicationEvaluationFormRepository applicationEvaluationFormRepository;
+
+    @Autowired
+    private ApplicationEvaluationFormFieldRepository applicationEvaluationFormFieldRepository;
+
+    @Autowired
+    private ApplicationDao applicationDao;
+
+    @Autowired
+    private ApplicationEvaluationService applicationEvaluationService;
+
+    @Autowired
+    private CallDao callDao;
+
     private ApplicationEvaluationEntity convertToEntity(UserEntity user, ApplicationEvaluationRequest req, Long assignedApplciationId) {
 
         ApplicationEvaluationEntity entity = new ApplicationEvaluationEntity();
@@ -1907,5 +1927,210 @@ public class ApplicationEvaluationDao {
         loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.UPDATE).oldData(oldApplicationEvaluation).newData(savedEntity).build());
         return convertToResponse(savedEntity);
     }
+
+    public ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationFormId, Long evaluationId){
+        EvaluationFormEntity evaluationFormEntity = evaluationFormService.validateEvaluationForm(evaluationFormId);
+        validateFormFields(applicationRequestBean,evaluationFormEntity);
+        ApplicationEvaluationEntity applicationEvaluationEntity = validateApplicationEvaluation(evaluationId);
+        ApplicationEvaluationFormEntity applicationEvaluationFormEntity = getApplicationEvaluationFormOrCreate(evaluationFormEntity,applicationEvaluationEntity);
+        createOrUpdateMultipleFormFields(applicationRequestBean.getFormFields(), applicationEvaluationFormEntity, evaluationFormEntity);
+        return getEvaluationById(applicationEvaluationEntity.getId(),evaluationFormEntity.getId());
+    }
+
+    private ApplicationEvaluationFormEntity getApplicationEvaluationFormOrCreate(EvaluationFormEntity evaluationFormEntity, ApplicationEvaluationEntity applicationEvaluationEntity) {
+
+        ApplicationEvaluationFormEntity applicationEvaluationFormEntity = applicationEvaluationFormRepository.findByEvaluationIdAndEvaluationFormId(applicationEvaluationEntity.getId(), evaluationFormEntity.getId());
+        ApplicationEvaluationFormEntity oldApplicationEvaluationFormEntity = Utils.getClonedEntityForData(applicationEvaluationFormEntity);
+        if (applicationEvaluationFormEntity == null) {
+            applicationEvaluationFormEntity = createApplicationEvaluationFormEntity(applicationEvaluationEntity, evaluationFormEntity);
+
+            /** This code is responsible for adding a version history log for the "Create application evalaution form" operation. **/
+            loggingUtil.addVersionHistory(
+                    VersionHistoryRequest.builder().request(request).actionType(VersionActionTypeEnum.INSERT).oldData(oldApplicationEvaluationFormEntity).newData(applicationEvaluationFormEntity)
+                            .build());
+        }
+        return applicationEvaluationFormEntity;
+    }
+
+    public ApplicationEvaluationFormEntity createApplicationEvaluationFormEntity(ApplicationEvaluationEntity applicationEvaluationEntity, EvaluationFormEntity evaluationFormEntity) {
+        ApplicationEvaluationFormEntity applicationEvaluationFormEntity = new ApplicationEvaluationFormEntity();
+        applicationEvaluationFormEntity.setApplicationId(applicationEvaluationEntity.getApplicationId());
+        applicationEvaluationFormEntity.setEvaluationForm(evaluationFormEntity);
+        applicationEvaluationFormEntity.setApplicationEvaluation(applicationEvaluationEntity);
+        applicationEvaluationFormEntity.setIsDeleted(false);
+        return saveApplicationEvaluationFormEntity(applicationEvaluationFormEntity);
+    }
+
+    public void validateFormFields(ApplicationRequestBean request, EvaluationFormEntity evaluationFormEntity) {
+
+        List<ContentResponseBean> contentResponseBeans=evaluationFormDao.convertEvaluationFormEntityToEvaluationFormResponseBean(evaluationFormEntity).getContent();
+
+        List<ApplicationFormFieldRequestBean> requestFields = request.getFormFields();
+
+        Map<String, String> contentMap = contentResponseBeans.stream()
+                .collect(Collectors.toMap(ContentResponseBean::getId, ContentResponseBean::getLabel)); // Change getLabel() if needed
+        FieldValidator validator = FieldValidator.create();
+        for (ApplicationFormFieldRequestBean requestField : requestFields) {
+            String fieldId = requestField.getFieldId();
+
+            if (!contentMap.containsKey(fieldId)) {
+                validator.addError(MessageFormat.format(Translator.toLocale(GepafinConstant.FIELD_ID_NOT_FOUND), fieldId));
+            }
+
+        }
+        validator.validate();
+    }
+
+    public ApplicationEvaluationFormEntity saveApplicationEvaluationFormEntity(ApplicationEvaluationFormEntity applicationEvaluationFormEntity) {
+        return applicationEvaluationFormRepository.save(applicationEvaluationFormEntity);
+    }
+
+    public List<ApplicationEvaluationFormFieldEntity> createOrUpdateMultipleFormFields(List<ApplicationFormFieldRequestBean> formFieldRequestBeans,
+                                                                             ApplicationEvaluationFormEntity applicationEvaluationFormEntity, EvaluationFormEntity evaluationFormEntity) {
+
+        List<ApplicationEvaluationFormFieldEntity> existingFields = applicationEvaluationFormFieldRepository.findByApplicationEvaluationFormId(applicationEvaluationFormEntity.getId());
+
+        return formFieldRequestBeans.stream().map(requestBean -> createOrUpdateApplicationEvaluationFormField(requestBean, applicationEvaluationFormEntity, existingFields, evaluationFormEntity))
+                .collect(Collectors.toList());
+    }
+
+    public ApplicationEvaluationFormFieldEntity createOrUpdateApplicationEvaluationFormField(ApplicationFormFieldRequestBean applicationFormFieldRequestBean,
+                                                                                             ApplicationEvaluationFormEntity applicationEvaluationFormEntity,
+                                                                                             List<ApplicationEvaluationFormFieldEntity> applicationEvaluationFormFieldEntities,
+                                                                                             EvaluationFormEntity evaluationFormEntity){
+        ApplicationEvaluationFormFieldEntity applicationEvaluationFormFieldEntity = null;
+        validateFileUploadDocuments(applicationFormFieldRequestBean, evaluationFormEntity);
+        VersionActionTypeEnum actionType = VersionActionTypeEnum.INSERT;
+        ApplicationEvaluationFormFieldEntity oldApplicationEvaluationFormFieldData = null;
+        if (applicationEvaluationFormFieldEntities == null || applicationEvaluationFormFieldEntities.isEmpty()) {
+            applicationEvaluationFormFieldEntity = new ApplicationEvaluationFormFieldEntity();
+            applicationEvaluationFormFieldEntity.setApplicationEvaluationForm(applicationEvaluationFormEntity);
+            applicationEvaluationFormFieldEntity.setIsDeleted(false);
+        }else{
+            for (ApplicationEvaluationFormFieldEntity existingFieldEntity : applicationEvaluationFormFieldEntities) {
+                if (existingFieldEntity.getFieldId().equals(applicationFormFieldRequestBean.getFieldId())) {
+                    applicationEvaluationFormFieldEntity = existingFieldEntity;
+                    oldApplicationEvaluationFormFieldData = Utils.getClonedEntityForData(existingFieldEntity);
+                    actionType = VersionActionTypeEnum.UPDATE;
+                    break;
+                } else {
+                    applicationEvaluationFormFieldEntity.setApplicationEvaluationForm(applicationEvaluationFormEntity);
+                }
+            }
+        }
+        Utils.setIfUpdated(applicationEvaluationFormFieldEntity::getFieldId, applicationEvaluationFormFieldEntity::setFieldId, applicationFormFieldRequestBean.getFieldId());
+
+        if (applicationFormFieldRequestBean.getFieldValue() != null) {
+            applicationEvaluationFormFieldEntity.setFieldValue(Utils.convertObjectToJsonString(applicationFormFieldRequestBean.getFieldValue()));
+        } else {
+            applicationEvaluationFormFieldEntity.setFieldValue(null);
+        }
+
+        ApplicationEvaluationFormFieldEntity savedEvaluationFormFieldEntity = applicationEvaluationFormFieldRepository.save(applicationEvaluationFormFieldEntity);
+
+        loggingUtil.addVersionHistory(VersionHistoryRequest.builder().request(request).actionType(actionType).oldData(oldApplicationEvaluationFormFieldData).newData(savedEvaluationFormFieldEntity).build());
+
+        log.info("Version history logged for action: {}, Field ID: {}", actionType, applicationEvaluationFormFieldEntity.getFieldId());
+
+        return savedEvaluationFormFieldEntity;
+    }
+
+    private List<Long> validateFileUploadDocuments(ApplicationFormFieldRequestBean applicationFormFieldRequestBean, EvaluationFormEntity evaluationFormEntity) {
+        List<Long> documentIds=null;
+
+        List<ContentResponseBean> contentResponseBeans=evaluationFormDao.convertEvaluationFormEntityToEvaluationFormResponseBean(evaluationFormEntity).getContent();
+        for (ContentResponseBean contentResponseBean:contentResponseBeans){
+            if(Boolean.TRUE.equals(contentResponseBean.getName().equals("fileupload"))) {
+                if (contentResponseBean.getId().equals(applicationFormFieldRequestBean.getFieldId())) {
+                    Object fieldValueObject = applicationFormFieldRequestBean.getFieldValue();
+                    if (fieldValueObject instanceof String) {
+                        // Safely cast the object to a string
+                        String documentId = (String) fieldValueObject;
+                        // Now you can use documentId as needed
+                        documentIds = applicationDao.validateDocumentIds(documentId);
+                    }
+                }
+            }
+        }
+        return documentIds;
+    }
+
+    public ApplicationEvaluationResponseBean getEvaluationById(Long evaluationId, Long evaluationFormId){
+        ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(evaluationId);
+
+        ApplicationEvaluationFormEntity applicationEvaluationFormEntity = applicationEvaluationFormRepository.findByEvaluationIdAndEvaluationFormId(applicationEvaluationEntity.getId(),evaluationFormId);
+        List<ApplicationEvaluationFormFieldEntity> applicationEvaluationFormFieldEntities = applicationEvaluationFormFieldRepository.findByApplicationEvaluationFormId(applicationEvaluationFormEntity.getId());
+        List<ApplicationEvaluationFormFieldReponseBean> evaluationFormFieldResponseBeans = createEvaluationFormFieldResponse(applicationEvaluationFormFieldEntities, applicationEvaluationFormEntity);
+        ApplicationEvaluationResponseBean applicationEvaluationResponseBean = convertApplicationEvaluationEntityToApplicationEvaluationResponseBean(applicationEvaluationEntity);
+        applicationEvaluationResponseBean.setFormFields(evaluationFormFieldResponseBeans);
+
+        return applicationEvaluationResponseBean;
+    }
+
+    private List<ApplicationEvaluationFormFieldReponseBean> createEvaluationFormFieldResponse(
+            List<ApplicationEvaluationFormFieldEntity> evaluationFormFieldEntities,
+            ApplicationEvaluationFormEntity applicationEvaluationFormEntity){
+        List<ApplicationEvaluationFormFieldReponseBean> evaluationFormFieldResponseBeans =  new ArrayList<>();
+        List<ContentResponseBean> contentResponseBeans =evaluationFormDao.convertEvaluationFormEntityToEvaluationFormResponseBean(applicationEvaluationFormEntity.getEvaluationForm()).getContent();
+
+        for (ApplicationEvaluationFormFieldEntity applicationEvaluationFormFieldEntity : evaluationFormFieldEntities) {
+
+            Optional<ContentResponseBean> fileUploadContent = contentResponseBeans.stream()
+                    .filter(contentResponseBean -> "fileupload".equals(contentResponseBean.getName()) &&
+                            contentResponseBean.getId().equals(applicationEvaluationFormFieldEntity.getFieldId()))
+                    .findFirst();
+
+            List<DocumentResponseBean> documentResponseBeans = new ArrayList<>();
+            if (fileUploadContent.isPresent()) {
+                String documentId = applicationEvaluationFormFieldEntity.getFieldValue();
+                if (documentId != null && !documentId.isEmpty()) {
+                    documentResponseBeans = Arrays.stream(documentId.split(","))
+                            .map(String::trim)
+                            .map(Long::parseLong)
+                            .map(docId -> {
+                                DocumentEntity documentEntity = documentService.validateDocument(docId);
+//                                if (Boolean.FALSE.equals(DocumentSourceTypeEnum.APPLICATION.getValue().equals(documentEntity.getSource()))) {
+//                                    throw new CustomValidationException(Status.NOT_FOUND,Translator.toLocale(GepafinConstant.DOCUMENT_NOT_FOUND));
+//                                }
+                                return documentEntity;
+                            })
+                            .map(callDao::convertToDocumentResponseBean)
+                            .collect(Collectors.toList());
+                }
+            }
+            ApplicationEvaluationFormFieldReponseBean responseBean = convertToEvaluationFormFieldResponseBean(
+                    applicationEvaluationFormFieldEntity, applicationEvaluationFormEntity.getId());
+            if (!documentResponseBeans.isEmpty()) {
+                responseBean.setFieldValue(documentResponseBeans);
+            }
+            evaluationFormFieldResponseBeans.add(responseBean);
+        }
+        return evaluationFormFieldResponseBeans;
+
+    }
+
+    private ApplicationEvaluationFormFieldReponseBean convertToEvaluationFormFieldResponseBean(ApplicationEvaluationFormFieldEntity entity,Long applicationEvaluationFormId){
+        ApplicationEvaluationFormFieldReponseBean applicationEvaluationFormFieldReponseBean = new ApplicationEvaluationFormFieldReponseBean();
+        applicationEvaluationFormFieldReponseBean.setApplicationEvaluationFormId(applicationEvaluationFormId);
+        applicationEvaluationFormFieldReponseBean.setFieldId(entity.getFieldId());
+        if(entity.getFieldValue() != null) {
+            applicationEvaluationFormFieldReponseBean.setFieldValue(Utils.getFieldValueAsObject(entity.getFieldValue()));
+        }
+        applicationEvaluationFormFieldReponseBean.setId(entity.getId());
+        applicationEvaluationFormFieldReponseBean.setCreatedDate(entity.getCreatedDate());
+        applicationEvaluationFormFieldReponseBean.setUpdatedDate(entity.getUpdatedDate());
+        return applicationEvaluationFormFieldReponseBean;
+    }
+
+    private ApplicationEvaluationResponseBean convertApplicationEvaluationEntityToApplicationEvaluationResponseBean(ApplicationEvaluationEntity entity){
+        ApplicationEvaluationResponseBean response = new ApplicationEvaluationResponseBean();
+        response.setId(entity.getId());
+        response.setApplicationId(entity.getApplicationId());
+        response.setEvaluationId(entity.getId());
+        response.setNote(entity.getNote());
+        response.setCreatedDate(entity.getCreatedDate());
+        response.setUpdatedDate(entity.getUpdatedDate());
+        return response;
+    }
 }
 

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

@@ -0,0 +1,22 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "APPLICATION_EVALUATION_FORM")
+public class ApplicationEvaluationFormEntity extends BaseEntity{
+    private Long applicationId;
+
+    @Column(name="IS_DELETED")
+    private Boolean isDeleted;
+
+    @ManyToOne
+    @JoinColumn(name = "EVALUATION_ID")
+    private ApplicationEvaluationEntity applicationEvaluation;
+
+    @ManyToOne
+    @JoinColumn(name = "EVALUATION_FORM_ID")
+    private EvaluationFormEntity evaluationForm;
+}

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

@@ -0,0 +1,24 @@
+package net.gepafin.tendermanagement.entities;
+
+import jakarta.persistence.*;
+import lombok.Data;
+
+@Entity
+@Data
+@Table(name = "APPLICATION_EVALUATION_FORM_FIELD")
+public class ApplicationEvaluationFormFieldEntity extends BaseEntity {
+
+    @ManyToOne
+    @JoinColumn(name = "APPLICATION_EVALUATION_FORM_ID")
+    private ApplicationEvaluationFormEntity applicationEvaluationForm;
+
+    @Column(name = "FIELD_ID")
+    private String fieldId;
+
+    @Column(name = "FIELD_VALUE")
+    private String fieldValue;
+
+    @Column(name="IS_DELETED")
+    private Boolean isDeleted;
+
+}

src/main/java/net/gepafin/tendermanagement/enums/UserActionContextEnum.java

@@ -97,6 +97,7 @@ public enum UserActionContextEnum {
     CREATE_UPDATE_APPLICATION_EVALUATION("CREATE_UPDATE_APPLICATION_EVALUATION"),
     GET_APPLICATION_EVALUATION("GET_APPLICATION_EVALUATION"),
     DELETE_APPLICATION_EVALUATION("DELETE_APPLICATION_EVALUATION"),
+    CREATE_UPDATE_APPLICATION_EVALUATION_FORM("CREATE_UPDATE_APPLICATION_EVALUATION_FORM"),
 
     /** Beneficiary Preferred Call action context  **/
     CREATE_BENEFICIARY_PREFERRED_CALL("CREATE_BENEFICIARY_PREFERRED_CALL"),

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+@Data
+public class ApplicationEvaluationFormFieldReponseBean extends BaseBean {
+    private Long id;
+
+    private Long applicationEvaluationFormId;
+
+    private String fieldId;
+
+    private Object fieldValue;
+}

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

@@ -0,0 +1,15 @@
+package net.gepafin.tendermanagement.model.response;
+
+import lombok.Data;
+import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
+import net.gepafin.tendermanagement.model.BaseBean;
+
+import java.util.List;
+
+@Data
+public class ApplicationEvaluationResponseBean extends BaseBean {
+    private Long applicationId;
+    private Long evaluationId;
+    private String note;
+    private List<ApplicationEvaluationFormFieldReponseBean> formFields;
+}

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationFormFieldRepository.java

@@ -0,0 +1,18 @@
+package net.gepafin.tendermanagement.repositories;
+
+import net.gepafin.tendermanagement.entities.ApplicationEvaluationFormFieldEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+import java.util.List;
+
+@Repository
+public interface ApplicationEvaluationFormFieldRepository extends JpaRepository<ApplicationEvaluationFormFieldEntity,Long> {
+    @Query("SELECT f FROM ApplicationEvaluationFormFieldEntity f " +
+            "WHERE f.applicationEvaluationForm.id = :applicationEvaluationFormId " +
+            "AND f.isDeleted = false")
+    List<ApplicationEvaluationFormFieldEntity> findByApplicationEvaluationFormId(
+            @Param("applicationEvaluationFormId") Long applicationEvaluationFormId);
+}

src/main/java/net/gepafin/tendermanagement/repositories/ApplicationEvaluationFormRepository.java

@@ -0,0 +1,19 @@
+package net.gepafin.tendermanagement.repositories;
+
+import net.gepafin.tendermanagement.entities.ApplicationEvaluationFormEntity;
+import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
+import org.springframework.stereotype.Repository;
+
+@Repository
+public interface ApplicationEvaluationFormRepository extends JpaRepository<ApplicationEvaluationFormEntity,Long> {
+
+    @Query("SELECT a FROM ApplicationEvaluationFormEntity a " +
+            "WHERE a.applicationEvaluation.id = :evaluationId " +
+            "AND a.evaluationForm.id = :evaluationFormId " +
+            "AND a.isDeleted = false")
+    ApplicationEvaluationFormEntity findByEvaluationIdAndEvaluationFormId(
+            @Param("evaluationId") Long evaluationId,
+            @Param("evaluationFormId") Long evaluationFormId);
+}

src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java

@@ -3,8 +3,11 @@ package net.gepafin.tendermanagement.service;
 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
+import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
 import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
+import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponseBean;
+import net.gepafin.tendermanagement.model.response.ApplicationResponseBean;
 
 import java.util.List;
 
@@ -21,4 +24,6 @@ public interface ApplicationEvaluationService {
 
 	ApplicationEvaluationEntity validateApplicationEvaluationByApplicationId(Long applicationId);
 
+    ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationId, Long evaluationFormId);
+
 }

src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java

@@ -7,9 +7,11 @@ import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
+import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
 import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
 
+import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponseBean;
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
 import net.gepafin.tendermanagement.service.ApplicationEvaluationService;
 import net.gepafin.tendermanagement.service.AssignedApplicationsService;
@@ -78,4 +80,11 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
     	return applicationEvaluationDao.validateApplicationEvaluationByApplicationId(applicationId);
     }
 
+    @Override
+    public ApplicationEvaluationResponseBean createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationId, Long evaluationFormId) {
+        ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(evaluationId);
+        validator.validatePreInstructor(request, applicationEvaluationEntity.getUserId());
+        return applicationEvaluationDao.createApplicationEvaluation(request,applicationRequestBean,evaluationFormId,evaluationId);
+    }
+
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationEvaluationApi.java

@@ -8,8 +8,11 @@ import io.swagger.v3.oas.annotations.responses.ApiResponse;
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.validation.Valid;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
+import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
 import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
+import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponseBean;
+import net.gepafin.tendermanagement.model.response.ApplicationResponseBean;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.web.rest.api.errors.ErrorConstants;
 import org.springframework.http.MediaType;
@@ -56,4 +59,20 @@ public interface ApplicationEvaluationApi {
             @Parameter( required = true) @PathVariable("id") Long id);
 
 
+    @Operation(summary = "Api to create or update application evaluation form ( Evaluation V2 )",
+            responses = {
+                    @ApiResponse(responseCode = "200", description = "OK"),
+                    @ApiResponse(responseCode = "404", description = "Not Found", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.NOTFOUND_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) })),
+                    @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
+                            @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
+    @PutMapping(value = "/{evaluationId}/form",
+            produces = { "application/json" })
+    ResponseEntity<Response<ApplicationEvaluationResponseBean>> createApplicationEvaluation(HttpServletRequest request,
+                                                                                            @Valid @RequestBody ApplicationRequestBean applicationRequestBean,
+                                                                                            @Parameter(description = "The evaluation id", required = true) @PathVariable(value = "evaluationId", required = true) Long evaluationId,
+                                                                                            @Parameter(description = "The evaluation form ID", required = true) @RequestParam("evaluationFormId") Long evaluationFormId);
+
 }

src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationEvaluationApiController.java

@@ -6,9 +6,12 @@ import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.enums.UserActionContextEnum;
 import net.gepafin.tendermanagement.enums.UserActionLogsEnum;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
+import net.gepafin.tendermanagement.model.request.ApplicationRequestBean;
 import net.gepafin.tendermanagement.model.request.EvaluationDocumentRequest;
 import net.gepafin.tendermanagement.model.request.UserActionRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
+import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponseBean;
+import net.gepafin.tendermanagement.model.response.ApplicationResponseBean;
 import net.gepafin.tendermanagement.model.response.EvaluationDocumentResponse;
 import net.gepafin.tendermanagement.model.util.Response;
 import net.gepafin.tendermanagement.service.ApplicationEvaluationService;
@@ -83,4 +86,17 @@ public class ApplicationEvaluationApiController implements ApplicationEvaluation
                 .body(new Response<>(null, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_DELETED_SUCCESSFULLY)));
     }
 
+    @Override
+    public ResponseEntity<Response<ApplicationEvaluationResponseBean>> createApplicationEvaluation(HttpServletRequest request, ApplicationRequestBean applicationRequestBean, Long evaluationId, Long evaluationFormId) {
+
+        /** This code is responsible for creating user action logs for the "Create or update application evaluation form" operation. **/
+        loggingUtil.logUserAction(
+                UserActionRequest.builder().request(request).actionType(UserActionLogsEnum.UPDATE).actionContext(UserActionContextEnum.CREATE_UPDATE_APPLICATION_EVALUATION_FORM).build());
+
+        ApplicationEvaluationResponseBean applicationEvaluationResponseBean = applicationEvaluationService.createApplicationEvaluation(request, applicationRequestBean, evaluationId, evaluationFormId);
+
+        return ResponseEntity.status(HttpStatus.CREATED)
+                .body(new Response<>(applicationEvaluationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.EVALUATION_CREATED_SUCCESSFULLY)));
+    }
+
 }

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

@@ -2305,5 +2305,60 @@
         </update>
     </changeSet>
 
+    <changeSet id="27-01-2025_RK_130515" author="Rajesh Khore">
+    <createTable tableName="application_evaluation_form">
+        <column name="id" type="INTEGER" autoIncrement="true">
+            <constraints nullable="false" primaryKey="true" primaryKeyName="application_evaluation_form_pkey"/>
+        </column>
+        <column name="application_id" type="BIGINT">
+            <constraints nullable="true"/>
+        </column>
+        <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+            <constraints nullable="false"/>
+        </column>
+        <column name="evaluation_id" type="INTEGER">
+            <constraints nullable="false" foreignKeyName="fk_application_evaluation_form_application_evaluation"
+                         references="application_evaluation(id)"/>
+        </column>
+        <column name="evaluation_form_id" type="INTEGER">
+            <constraints nullable="false" foreignKeyName="fk_application_evaluation_form_evaluation_form"
+                         references="evaluation_form(id)"/>
+        </column>
+        <column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
+            <constraints nullable="false"/>
+        </column>
+        <column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
+            <constraints nullable="true"/>
+        </column>
+    </createTable>
+    </changeSet>
+
+    <changeSet id="27-01-2025_RK_131020" author="Rajesh Khore">
+        <createTable tableName="application_evaluation_form_field">
+            <column name="id" type="INTEGER" autoIncrement="true">
+                <constraints nullable="false" primaryKey="true" primaryKeyName="application_evaluation_form_field_pkey"/>
+            </column>
+            <column name="application_evaluation_form_id" type="INTEGER">
+                <constraints nullable="false" foreignKeyName="fk_application_evaluation_form_application_evaluation_form_field"
+                             references="application_evaluation_form(id)"/>
+            </column>
+            <column name="field_id" type="VARCHAR(255)">
+                <constraints nullable="true"/>
+            </column>
+            <column name="field_value" type="VARCHAR(255)">
+                <constraints nullable="true"/>
+            </column>
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+            <column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="false"/>
+            </column>
+            <column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="true"/>
+            </column>
+        </createTable>
+    </changeSet>
+    
 
 </databaseChangeLog>