updatedCode

2024-10-27 22:22:03 +05:30
parent c684e2d70e
commit 516a64f858
13 changed files with 116 additions and 64 deletions
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationAmendmentRequestDao.java
@@ -12,6 +12,7 @@ import net.gepafin.tendermanagement.model.request.ApplicationFormFieldRequestBea
 import net.gepafin.tendermanagement.model.response.AmendmentFormFieldResponse;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
 import net.gepafin.tendermanagement.repositories.*;
+import net.gepafin.tendermanagement.service.ApplicationEvaluationService;
 import net.gepafin.tendermanagement.service.ApplicationService;
 import net.gepafin.tendermanagement.service.UserService;
 import net.gepafin.tendermanagement.util.DateTimeUtil;
@@ -50,8 +51,14 @@ public class ApplicationAmendmentRequestDao {
    @Autowired
    private DocumentRepository documentRepository;

-    public  List<ApplicationAmendmentRequestResponse> getApplicationDataForAmendment(HttpServletRequest request,Long applicationId){
-        log.info("Fetching the application data for the Amendment process {}", applicationId);
+
+    @Autowired
+    private ApplicationEvaluationService applicationEvaluationService;
+
+    public  List<ApplicationAmendmentRequestResponse> getApplicationDataForAmendment(HttpServletRequest request,Long applicationEvaluationId){
+        log.info("Fetching the application data for the Amendment process {}", applicationEvaluationId);
+        ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId);
+        Long applicationId = applicationEvaluationEntity.getApplicationId();
        ApplicationEntity application = applicationService.validateApplication(applicationId);
        String callName = application.getCall().getName();
        Long protocolNumber = (application.getProtocol() != null && application.getProtocol().getProtocolNumber() != null)
@@ -149,19 +156,23 @@ public class ApplicationAmendmentRequestDao {
        return filteredList;
    }

-    public ApplicationAmendmentRequestResponse createApplicationAmendmentRequest(Long applicationId, ApplicationAmendmentRequest applicationAmendmentRequest){
-        log.info("Submiting application data for amendment Process with details: {}", applicationId);
+    public ApplicationAmendmentRequestResponse createApplicationAmendmentRequest(Long applicationEvaluationId, ApplicationAmendmentRequest applicationAmendmentRequest){
+        log.info("Submiting application data for amendment Process with details: {}", applicationEvaluationId);

-        ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = createApplicationAmendmentRequestEntity(applicationAmendmentRequest);
+        ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = createApplicationAmendmentRequestEntity(applicationAmendmentRequest,applicationEvaluationId);
        ApplicationAmendmentRequestResponse applicationAmendmentRequestResponse = convertEntityToResponse(applicationAmendmentRequestEntity);
        log.info("Application submitted successfully for amendment", applicationAmendmentRequestResponse);
        return applicationAmendmentRequestResponse;
    }

-    public ApplicationAmendmentRequestEntity createApplicationAmendmentRequestEntity(ApplicationAmendmentRequest applicationAmendmentRequest){
+    public ApplicationAmendmentRequestEntity createApplicationAmendmentRequestEntity(ApplicationAmendmentRequest applicationAmendmentRequest,Long applicationEvaluationId){
        ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity = new ApplicationAmendmentRequestEntity();
        applicationAmendmentRequestEntity.setNote(applicationAmendmentRequest.getNote());
        applicationAmendmentRequestEntity.setResponseDays(applicationAmendmentRequest.getResponseDays());
+        ApplicationEvaluationEntity applicationEvaluationEntity = applicationEvaluationService.validateApplicationEvaluation(applicationEvaluationId);
+
+        applicationAmendmentRequestEntity.setApplicationEvaluationEntity(applicationEvaluationEntity);
+        applicationAmendmentRequestEntity.setApplicationId(applicationEvaluationEntity.getApplicationId());

        if (applicationAmendmentRequest.getFormFields() != null) {
            String fieldIdsString = applicationAmendmentRequest.getFormFields().stream()
@@ -185,8 +196,11 @@ public class ApplicationAmendmentRequestDao {
    public ApplicationAmendmentRequestResponse convertEntityToResponse(ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity){
        ApplicationAmendmentRequestResponse applicationAmendmentRequestResponse = new ApplicationAmendmentRequestResponse();
        applicationAmendmentRequestResponse.setId(applicationAmendmentRequestEntity.getId());
-        Long applicationId = 1L;
+        Long applicationId= applicationAmendmentRequestEntity.getApplicationId();
+
        ApplicationEntity application = applicationService.validateApplication(applicationId);
+        applicationAmendmentRequestResponse.setApplicationId(applicationId);
+        applicationAmendmentRequestResponse.setApplicationEvaluationId(applicationAmendmentRequestEntity.getApplicationEvaluationEntity().getId());
        applicationAmendmentRequestResponse.setNote(applicationAmendmentRequestEntity.getNote());
        applicationAmendmentRequestResponse.setResponseDays(applicationAmendmentRequestEntity.getResponseDays());
        applicationAmendmentRequestResponse.setStartDate(applicationAmendmentRequestEntity.getCreatedDate());
@@ -244,6 +258,7 @@ public class ApplicationAmendmentRequestDao {
        return applicationAmendmentRequestEntity;
    }

+
    public void deleteById(Long id) {
        log.info("Deleting assigned application with ID: {}", id);
        ApplicationAmendmentRequestEntity applicationAmendmentRequestEntity= validateApplicationAmendmentRequest(id);
--- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
+++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationEvaluationDao.java
@@ -459,7 +459,7 @@ public class ApplicationEvaluationDao {
        return updatedFieldList;
    }

-    private ApplicationEvaluationEntity validateApplicationEvaluation(Long id) {
+    public ApplicationEvaluationEntity validateApplicationEvaluation(Long id) {
        Optional<ApplicationEvaluationEntity> entityOptional = applicationEvaluationRepository.findById(id);
        if (entityOptional.isEmpty()) {
            throw new ResourceNotFoundException(Status.NOT_FOUND,
--- a/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
+++ b/src/main/java/net/gepafin/tendermanagement/entities/ApplicationAmendmentRequestEntity.java
@@ -1,8 +1,6 @@
 package net.gepafin.tendermanagement.entities;

-import jakarta.persistence.Column;
-import jakarta.persistence.Entity;
-import jakarta.persistence.Table;
+import jakarta.persistence.*;
 import lombok.Data;

@Entity
@@ -22,10 +20,17 @@ public class ApplicationAmendmentRequestEntity extends BaseEntity {
    @Column(name = "IS_EMAIL")
    private Boolean isEmail=false;

+    @Column(name = "APPLICATION_ID")
+    private Long applicationId;
+
    @Column(name = "FORM_FIELDS")
    private String formFields;

    @Column(name="IS_DELETED")
    private Boolean isDeleted=false;

+    @ManyToOne
+    @JoinColumn(name = "APPLICATION_EVALUATION_ID", nullable = false)
+    private ApplicationEvaluationEntity applicationEvaluationEntity;
+
 }
--- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java
+++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationAmendmentRequestResponse.java
@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.model.response;

 import lombok.Data;
+import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;

 import java.time.LocalDateTime;
 import java.util.List;
@@ -17,6 +18,8 @@ public class ApplicationAmendmentRequestResponse {
    private String callName;
    private String beneficiaryName;
    private List<AmendmentFormFieldResponse> formFields;
-    private List<ApplicationFormFieldResponseBean> updatedFormFields;
+    private List<ApplicationFormFieldResponseBean> applicationFormFields;
+    private Long applicationId;
+    private Long applicationEvaluationId;

 }
--- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationAmendmentRequestService.java
@@ -1,6 +1,7 @@
 package net.gepafin.tendermanagement.service;

 import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
 import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
 import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
 import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestResponse;
@@ -8,11 +9,12 @@ import net.gepafin.tendermanagement.model.response.ApplicationAmendmentRequestRe
 import java.util.List;

 public interface ApplicationAmendmentRequestService {
-    public List<ApplicationAmendmentRequestResponse> getApplicationDataForAmendment(HttpServletRequest request,Long applicationId);
+    public List<ApplicationAmendmentRequestResponse> getApplicationDataForAmendment(HttpServletRequest request,Long applicationEvaluationId);
    public ApplicationAmendmentRequestResponse createApplicationAmendmentRequest(HttpServletRequest request, Long applicationEvaluationId , ApplicationAmendmentRequest applicationAmendmentRequest);
    void deleteApplicationAmendmentRequest(HttpServletRequest request, Long id);
    ApplicationAmendmentRequestResponse getApplicationAmendmentRequestById(HttpServletRequest request,Long id);
    List<ApplicationAmendmentRequestResponse> getAllApplicationAmendmentRequest(HttpServletRequest request);
    ApplicationAmendmentRequestResponse updateApplicationAmendment(HttpServletRequest request, Long id, ApplicationAmendmentRequestBean applicationAmendmentRequestBean);
+    ApplicationAmendmentRequestEntity validateApplicationAmendmentRequest(Long applicationAmendmentId);

 }
--- a/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/ApplicationEvaluationService.java
@@ -1,12 +1,11 @@
 package net.gepafin.tendermanagement.service;

 import jakarta.servlet.http.HttpServletRequest;
+import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
-import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
-import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
-import net.gepafin.tendermanagement.model.response.ApplicationResponse;
+

 import java.util.List;

@@ -18,4 +17,5 @@ public interface ApplicationEvaluationService {
    ApplicationEvaluationResponse updateApplicationEvaluationStatus(HttpServletRequest request, Long applicationEvaluationId, ApplicationEvaluationStatusTypeEnum status);


+    ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId);
 }
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationAmendmentRequestServiceImpl.java
@@ -2,6 +2,7 @@ package net.gepafin.tendermanagement.service.impl;

 import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.dao.ApplicationAmendmentRequestDao;
+import net.gepafin.tendermanagement.entities.ApplicationAmendmentRequestEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequest;
 import net.gepafin.tendermanagement.model.request.ApplicationAmendmentRequestBean;
@@ -23,9 +24,9 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm
    private ApplicationAmendmentRequestDao applicationAmendmentRequestDao;

    @Override
-    public List<ApplicationAmendmentRequestResponse> getApplicationDataForAmendment(HttpServletRequest request, Long applicationId) {
+    public List<ApplicationAmendmentRequestResponse> getApplicationDataForAmendment(HttpServletRequest request, Long applicationEvaluationId) {
        UserEntity user= validator.validateUser(request);
-        return applicationAmendmentRequestDao.getApplicationDataForAmendment(request,applicationId);
+        return applicationAmendmentRequestDao.getApplicationDataForAmendment(request,applicationEvaluationId);
    }

    @Override
@@ -57,5 +58,10 @@ public class ApplicationAmendmentRequestServiceImpl implements ApplicationAmendm
        return applicationAmendmentRequestDao.updateApplicationAmendment(id,applicationAmendmentRequestBean);
    }

+    @Override
+    public ApplicationAmendmentRequestEntity validateApplicationAmendmentRequest(Long applicationAmendmentId) {
+        return applicationAmendmentRequestDao.validateApplicationAmendmentRequest(applicationAmendmentId);
+    }
+

 }
--- a/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
+++ b/src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationEvaluationServiceImpl.java
@@ -5,14 +5,13 @@ import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.dao.ApplicationEvaluationDao;

+import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.ApplicationEvaluationStatusTypeEnum;
-import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
-import net.gepafin.tendermanagement.model.request.UpdateApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.response.ApplicationEvaluationResponse;
-import net.gepafin.tendermanagement.model.response.ApplicationResponse;
+
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
 import net.gepafin.tendermanagement.service.ApplicationEvaluationService;
 import net.gepafin.tendermanagement.util.Validator;
@@ -23,7 +22,7 @@ import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;

-import java.util.List;
+
 import java.util.Optional;

@Service
@@ -84,4 +83,9 @@ public class ApplicationEvaluationServiceImpl implements ApplicationEvaluationSe
        return applicationEvaluationDao.updateApplicationEvaluationStatus(applicationId, status);

    }
+
+    @Override
+    public ApplicationEvaluationEntity validateApplicationEvaluation(Long applicationEvaluationId) {
+        return applicationEvaluationDao.validateApplicationEvaluation(applicationEvaluationId);
+    }
 }
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationAmendmentRequestApi.java
@@ -30,8 +30,8 @@ public interface ApplicationAmendmentRequestApi {
                            @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) })) })
-    @GetMapping(value = "/{applicationId}", produces = "application/json")
-    ResponseEntity<Response<List<ApplicationAmendmentRequestResponse>>> getApplicationDataForAmendment(HttpServletRequest request, @Parameter(description = "The application id", required = true) @PathVariable(value = "applicationId", required = true) Long applicationId);
+    @GetMapping(value = "applicationEvaluation/{id}", produces = "application/json")
+    ResponseEntity<Response<List<ApplicationAmendmentRequestResponse>>> getApplicationDataForAmendment(HttpServletRequest request, @Parameter(description = "The Application Evaluation id", required = true) @PathVariable(value = "id", required = true) Long applicationEvaluationId);

    @Operation(summary = "Api to submit the application data for the Amendment",
            responses = {
--- a/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java
+++ b/src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationAmendmentRequestController.java
@@ -27,8 +27,8 @@ public class ApplicationAmendmentRequestController implements ApplicationAmendme
    ApplicationAmendmentRequestService applicationAmendmentRequestService;

    @Override
-    public ResponseEntity<Response<List<ApplicationAmendmentRequestResponse>>> getApplicationDataForAmendment(HttpServletRequest request, Long applicationId) {
-        List<ApplicationAmendmentRequestResponse> applicationAmendmentBean = applicationAmendmentRequestService.getApplicationDataForAmendment(request,applicationId);
+    public ResponseEntity<Response<List<ApplicationAmendmentRequestResponse>>> getApplicationDataForAmendment(HttpServletRequest request, Long applicationEvaluationId) {
+        List<ApplicationAmendmentRequestResponse> applicationAmendmentBean = applicationAmendmentRequestService.getApplicationDataForAmendment(request,applicationEvaluationId);
        return ResponseEntity.status(HttpStatus.OK)
                .body(new Response<>(applicationAmendmentBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_DATA_FOR_AMENDMENT_SUCCESS_MSG)));
    }
--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -1345,43 +1345,7 @@
                             referencedColumnNames="id"/>
 	</changeSet>

-    <changeSet id="27-10-2024_1" author="Rajesh Khore">
-        <createTable tableName="application_amendment_request">
-            <column autoIncrement="true" name="id" type="INTEGER">
-                <constraints nullable="false" primaryKey="true"
-                             primaryKeyName="pk_application_amendment_request"/>
-            </column>

-            <column name="note" type="TEXT">
-                <constraints nullable="true"/>
-            </column>
-
-            <column name="response_days" type="INTEGER">
-                <constraints nullable="true"/>
-            </column>
-
-            <column name="is_notification" type="BOOLEAN">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="is_email" type="BOOLEAN">
-                <constraints nullable="false"/>
-            </column>
-
-            <column name="form_fields" type="TEXT">
-                <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="true"/>
-            </column>
-        </createTable>
-    </changeSet>
-    
    
    <changeSet id="24-10-2024_1" author="Rajesh Khore">
        <dropUniqueConstraint 
@@ -1576,5 +1540,56 @@
                onDelete="CASCADE" />
    </changeSet>

-    
+    <changeSet id="27-10-2024_1" author="Rajesh Khore">
+        <createTable tableName="application_amendment_request">
+            <column autoIncrement="true" name="id" type="INTEGER">
+                <constraints nullable="false" primaryKey="true"
+                             primaryKeyName="pk_application_amendment_request"/>
+            </column>
+
+            <column name="note" type="TEXT">
+                <constraints nullable="true"/>
+            </column>
+
+            <column name="response_days" type="INTEGER">
+                <constraints nullable="true"/>
+            </column>
+
+            <column name="is_notification" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="is_email" type="BOOLEAN">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="form_fields" type="TEXT">
+                <constraints nullable="true"/>
+            </column>
+
+            <column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
+                <constraints nullable="false"/>
+            </column>
+
+            <column name="application_id" type="INTEGER">
+                <constraints nullable="true"/>
+            </column>
+
+            <column name="application_evaluation_id" type="INTEGER">
+                <constraints nullable="false"
+                             foreignKeyName="fk_application_evaluation_application_amendment_request"
+                             references="application_evaluation(id)"/>
+            </column>
+
+            <column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="true"/>
+            </column>
+            <column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
+                <constraints nullable="true"/>
+            </column>
+        </createTable>
+    </changeSet>
+
+
+
 </databaseChangeLog>
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -287,6 +287,7 @@ invalid.application.status = Invalid Application status.

 application.data.amendment.success = Successfully retrieved the application data for the amendment process.
 delete.application.amendment.success = Application Amendment successfully deleted.
+create.application.data.amendment.msg = Application amendment submited succesfully.
 application.amendment.not.found = Application Amendment Request not found with the given ID.
 application.amendment.get.success = Application Amendment details fetched successfully with given ID.
 application.amendment.update.successfully = Application Amendment Updated Successfully.
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -284,4 +284,5 @@ application.data.amendment.success = Recupero riuscito dei dati dell'applicazion
 delete.application.amendment.success =Emendamento all'applicazione eliminato con successo.
 application.amendment.not.found = Richiesta di modifica dell'applicazione non trovata con l'ID indicato.
 application.amendment.get.success  = Dettagli della modifica dell'applicazione recuperati correttamente con l'ID fornito.
-application.amendment.update.successfully = Emendamento all'applicazione aggiornato con successo.
+application.amendment.update.successfully = Emendamento all'applicazione aggiornato con successo.
+create.application.data.amendment.msg =Emendamento alla domanda inviato con successo