BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
rajesh
2024-09-16 16:22:40 +05:30
parent 721451586b b4212ee219
commit 1d91828219
6 changed files with 20 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -114,9 +114,18 @@ public class ApplicationDao {
log.info("Application deleted with ID: {}", id); 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"); log.info("Fetching all applications");
List<ApplicationResponse> applicationResponses=new ArrayList<>(); 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()); List<ApplicationEntity> applicationEntities = applicationRepository.findByUserIdAndIsDeletedFalse(userEntity.getId());
for(ApplicationEntity applicationEntity:applicationEntities){ for(ApplicationEntity applicationEntity:applicationEntities){
ApplicationResponse responseBean = getApplicationResponse(applicationEntity); ApplicationResponse responseBean = getApplicationResponse(applicationEntity);
@@ -298,7 +307,9 @@ public class ApplicationDao {
public ApplicationResponse createApplicationByCallId(ApplicationRequest applicationRequest,Long callId,UserEntity userEntity){ public ApplicationResponse createApplicationByCallId(ApplicationRequest applicationRequest,Long callId,UserEntity userEntity){
CallEntity call=callService.validateCall(callId); CallEntity call=callService.validateCall(callId);
checkIfApplicationExists(call,userEntity); 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); ApplicationResponse applicationResponse=getApplicationResponse(applicationEntity);
return applicationResponse; return applicationResponse;
} }

4
src/main/java/net/gepafin/tendermanagement/model/request/ApplicationRequest.java
View File

@@ -7,10 +7,6 @@ import java.time.LocalDateTime;
@Data @Data
public class ApplicationRequest { public class ApplicationRequest {
private LocalDateTime submissionDate;
private String status;
private String comments; private String comments;
} }

2
src/main/java/net/gepafin/tendermanagement/service/ApplicationService.java
View File

@@ -19,7 +19,7 @@ public interface ApplicationService {
ApplicationGetResponseBean getApplicationByFormId(HttpServletRequest request, Long applicationId,Long formId); ApplicationGetResponseBean getApplicationByFormId(HttpServletRequest request, Long applicationId,Long formId);
List<ApplicationResponse> getAllApplications(HttpServletRequest request); List<ApplicationResponse> getAllApplications(HttpServletRequest request,Long callId);
void deleteApplication(HttpServletRequest request, Long applicationId); void deleteApplication(HttpServletRequest request, Long applicationId);

4
src/main/java/net/gepafin/tendermanagement/service/impl/ApplicationServiceImpl.java
View File

@@ -80,8 +80,8 @@ public class ApplicationServiceImpl implements ApplicationService {
@Override @Override
@Transactional(readOnly = true) @Transactional(readOnly = true)
public List<ApplicationResponse> getAllApplications(HttpServletRequest request) { public List<ApplicationResponse> getAllApplications(HttpServletRequest request,Long callId) {
UserEntity userEntity = validator.validateUser(request); UserEntity userEntity = validator.validateUser(request);
return applicationDao.getAllApplications(userEntity); return applicationDao.getAllApplications(userEntity,callId);
} }
} }

3
src/main/java/net/gepafin/tendermanagement/web/rest/api/ApplicationApi.java
View File

@@ -65,7 +65,8 @@ public interface ApplicationApi {
@ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = { @ApiResponse(responseCode = "400", description = "Bad Request", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
@ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) }) @ExampleObject(value = ErrorConstants.BADREQUEST_ERROR_EXAMPLE) })) })
@GetMapping(value = "", produces = "application/json") @GetMapping(value = "", produces = "application/json")
ResponseEntity<Response<List<ApplicationResponse>>> getAllApplications(HttpServletRequest request); ResponseEntity<Response<List<ApplicationResponse>>> getAllApplications(HttpServletRequest request,
@Parameter(description = "The call id", required = false) @RequestParam(value = "callId", required = false) Long callId);
@Operation(summary = "Api to delete application", @Operation(summary = "Api to delete application",
responses = { responses = {

4
src/main/java/net/gepafin/tendermanagement/web/rest/api/impl/ApplicationApiController.java
View File

@@ -66,8 +66,8 @@ public class ApplicationApiController implements ApplicationApi {
.body(new Response<>(applicationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_CREATED_SUCCESS_MSG))); .body(new Response<>(applicationResponseBean, Status.SUCCESS, Translator.toLocale(GepafinConstant.APPLICATION_CREATED_SUCCESS_MSG)));
} }
@Override @Override
public ResponseEntity<Response<List<ApplicationResponse>>> getAllApplications(HttpServletRequest request) { public ResponseEntity<Response<List<ApplicationResponse>>> getAllApplications(HttpServletRequest request,Long callId) {
List<ApplicationResponse> applications = applicationService.getAllApplications(request); List<ApplicationResponse> applications = applicationService.getAllApplications(request,callId);
log.info("Get All Applications"); log.info("Get All Applications");
return ResponseEntity.status(HttpStatus.OK) return ResponseEntity.status(HttpStatus.OK)
.body(new Response<>(applications, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_SUCCESS_MSG))); .body(new Response<>(applications, Status.SUCCESS, Translator.toLocale(GepafinConstant.GET_APPLICATION_SUCCESS_MSG)));