Updated code

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

@@ -4,6 +4,7 @@ import jakarta.servlet.http.HttpServletRequest;
 import net.gepafin.tendermanagement.config.Translator;
 import net.gepafin.tendermanagement.constants.GepafinConstant;
 import net.gepafin.tendermanagement.entities.ApplicationEntity;
+import net.gepafin.tendermanagement.entities.ApplicationEvaluationEntity;
 import net.gepafin.tendermanagement.entities.AssignedApplicationsEntity;
 import net.gepafin.tendermanagement.entities.UserEntity;
 import net.gepafin.tendermanagement.enums.ApplicationStatusTypeEnum;
@@ -11,6 +12,7 @@ import net.gepafin.tendermanagement.enums.AssignedApplicationEnum;
 import net.gepafin.tendermanagement.model.request.ApplicationEvaluationRequest;
 import net.gepafin.tendermanagement.model.request.AssignedApplicationsRequest;
 import net.gepafin.tendermanagement.model.response.AssignedApplicationsResponse;
+import net.gepafin.tendermanagement.repositories.ApplicationEvaluationRepository;
 import net.gepafin.tendermanagement.repositories.ApplicationRepository;
 import net.gepafin.tendermanagement.repositories.AssignedApplicationsRepository;
 import net.gepafin.tendermanagement.service.ApplicationService;
@@ -26,6 +28,7 @@ import org.springframework.stereotype.Component;
 
 import java.time.LocalDateTime;
 import java.util.List;
+import java.util.Optional;
 import java.util.stream.Collectors;
 
 import static net.gepafin.tendermanagement.util.Utils.log;
@@ -51,6 +54,9 @@ public class AssignedApplicationsDao {
     @Autowired
     private ApplicationEvaluationDao applicationEvaluationDao;
 
+    @Autowired
+    private ApplicationEvaluationRepository applicationEvaluationRepository;
+
     public AssignedApplicationsResponse createAssignedApplications(Long applicationId, Long userId, UserEntity assignedByUser, AssignedApplicationsRequest assignedApplicationsRequest){
         log.info("Assigning application to pre-Instructor with details: {}", applicationId,userId);
 
@@ -71,8 +77,8 @@ public class AssignedApplicationsDao {
         applicationRepository.save(application);
         UserEntity user = userService.validateUser(userId);
         AssignedApplicationsEntity assignment = createAssignmentEntity(application, user.getId(), assignedByUser, assignedApplicationsRequest);
+        applicationEvaluationDao.createOrUpdateApplicationEvaluation(user, new ApplicationEvaluationRequest(), assignment.getId());
         AssignedApplicationsResponse assignApplicationToInstructorResponse = convertEntityToResponse(assignment);
-        applicationEvaluationDao.createOrUpdateApplicationEvaluation(user, new ApplicationEvaluationRequest(), assignApplicationToInstructorResponse.getId());
         log.info("Application assigned succesfully {}", assignApplicationToInstructorResponse);
         return assignApplicationToInstructorResponse;
     }
@@ -105,6 +111,7 @@ public class AssignedApplicationsDao {
 
         ApplicationEntity application = applicationService.validateApplication(assignedApplications.getApplication().getId());
         String callName = application.getCall() != null ? application.getCall().getName() : "";
+        Optional<ApplicationEvaluationEntity> applicationEvaluationEntity=applicationEvaluationRepository.findByApplicationIdAndIsDeletedFalse(application.getId());
         LocalDateTime callEndDate = application.getCall().getEndDate();
         LocalDateTime callStartDate = application.getCall().getStartDate();
 
@@ -136,7 +143,9 @@ public class AssignedApplicationsDao {
         assignedApplicationsResponse.setSubmissionDate(submissionDate);
         assignedApplicationsResponse.setCallEndDate(callEndDate);
         assignedApplicationsResponse.setCallStartDate(callStartDate);
-
+        if(applicationEvaluationEntity.isPresent()){
+            assignedApplicationsResponse.setEvaluationEndDate(applicationEvaluationEntity.get().getEndDate());
+        }
         return assignedApplicationsResponse;
     }
 

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

@@ -21,6 +21,7 @@ public class AssignedApplicationsResponse extends BaseBean {
     private LocalDateTime callStartDate;
     private LocalDateTime callEndDate;
     private String companyName;
+    private LocalDateTime evaluationEndDate;
 
 }