Merge branch 'develop' of https://github.com/Kitzanos/GEPAFIN-BE into develop

This commit is contained in:
rajesh
2024-09-16 16:22:40 +05:30
6 changed files with 20 additions and 12 deletions

View File

@@ -114,9 +114,18 @@ public class ApplicationDao {
log.info("Application deleted with ID: {}", id);
}
public List<ApplicationResponse> getAllApplications(UserEntity userEntity) {
public List<ApplicationResponse> getAllApplications(UserEntity userEntity,Long callId) {
log.info("Fetching all applications");
List<ApplicationResponse> applicationResponses=new ArrayList<>();
if(callId!=null) {
CallEntity call = callService.validateCall(callId);
Optional<ApplicationEntity> applicationEntity1 = applicationRepository.findByUserIdAndCallIdAndIsDeletedFalse(userEntity.getId(), call.getId());
if (applicationEntity1.isPresent()) {
ApplicationResponse responseBean = getApplicationResponse(applicationEntity1.get());
applicationResponses.add(responseBean);
return applicationResponses;
}
}
List<ApplicationEntity> applicationEntities = applicationRepository.findByUserIdAndIsDeletedFalse(userEntity.getId());
for(ApplicationEntity applicationEntity:applicationEntities){
ApplicationResponse responseBean = getApplicationResponse(applicationEntity);
@@ -298,7 +307,9 @@ public class ApplicationDao {
public ApplicationResponse createApplicationByCallId(ApplicationRequest applicationRequest,Long callId,UserEntity userEntity){
CallEntity call=callService.validateCall(callId);
checkIfApplicationExists(call,userEntity);
ApplicationEntity applicationEntity=saveApplicationEntity(createApplicationEntity(userEntity,call));
ApplicationEntity applicationEntity=createApplicationEntity(userEntity,call);
applicationEntity.setComments(applicationRequest.getComments());
applicationEntity=saveApplicationEntity(applicationEntity);
ApplicationResponse applicationResponse=getApplicationResponse(applicationEntity);
return applicationResponse;
}