From dcf8fa6cbc762bf3262225cc373113d9b6762dbb Mon Sep 17 00:00:00 2001 From: harish Date: Thu, 22 Aug 2024 15:08:58 +0530 Subject: [PATCH] Inserted data for user,role and region --- .../constants/GepafinConstant.java | 2 + .../gepafin/tendermanagement/dao/CallDao.java | 25 +++-- .../db/changelog/db.changelog-1.0.0.xml | 97 +++++++++++++++++++ src/main/resources/message_en.properties | 1 + src/main/resources/message_it.properties | 2 + 5 files changed, 113 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index add54e21..75b748fe 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -40,5 +40,7 @@ public class GepafinConstant { public static final String LOGIN_SUCCESS_MSG="login.successfully"; public static final String PASSWORD_MIN_LEN ="pass.min.len.msg"; public static final String EMAIL_ALREADY_EXISTS = "email.already.exists"; + public static final String DOCUMENT_ID_NOT_FOUND="document.id.not.found"; + } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java index d034f8a7..03e65b45 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/CallDao.java @@ -118,8 +118,11 @@ public class CallDao { } private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) { - DocumentEntity documentEntity = new DocumentEntity(); - validateDocumentEntity(documentReq.getFileName()); + validateDocumentEntity(documentReq.getId(),documentReq.getFileName()); + DocumentEntity documentEntity = documentRepository.findById(documentReq.getId()); + if(documentEntity==null){ + throw new ResourceNotFoundException(Status.VALIDATION_ERROR,GepafinConstant.DOCUMENT_NOT_FOUND); + } documentEntity.setFileName(documentReq.getFileName()); documentEntity.setFilePath(documentReq.getUrl()); documentEntity.setCall(callEntity); @@ -160,7 +163,11 @@ public class CallDao { } } - public void validateDocumentEntity(String name) { + public void validateDocumentEntity(Long documentId,String name) { + if(documentId==null){ + throw new CustomValidationException(Status.VALIDATION_ERROR,Translator.toLocale(GepafinConstant.DOCUMENT_ID_NOT_FOUND)); + } + if (!StringUtils.hasText(name)) { throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG)); } @@ -276,16 +283,14 @@ public class CallDao { private List createCallTargetAudienceCheckList(CallEntity callEntity, List lookUpDataEntities) { List lookUpDataResponses=new ArrayList<>(); - List callTargetAudienceChecklistEntities=new ArrayList<>(); for(LookUpDataEntity lookUpDataEntity:lookUpDataEntities){ CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity=new CallTargetAudienceChecklistEntity(); callTargetAudienceChecklistEntity.setIsValidated(false); callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity); callTargetAudienceChecklistEntity.setCall(callEntity); - callTargetAudienceChecklistEntities.add(callTargetAudienceChecklistEntity); + callTargetAudienceChecklistEntity= callTargetAudienceChecklistRepository.save(callTargetAudienceChecklistEntity); lookUpDataResponses.add(convertToLookUpDataResponseBean(lookUpDataEntity,callTargetAudienceChecklistEntity)); } - callTargetAudienceChecklistRepository.saveAll(callTargetAudienceChecklistEntities); return lookUpDataResponses; } @@ -301,14 +306,6 @@ public class CallDao { .orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); } - private CallTargetAudienceChecklistEntity createChecklistEntity(CallEntity callEntity, LookUpDataEntity lookUpDataEntity) { - CallTargetAudienceChecklistEntity checklistEntity = new CallTargetAudienceChecklistEntity(); - checklistEntity.setCall(callEntity); - checklistEntity.setLookupData(lookUpDataEntity); - checklistEntity.setIsValidated(false); - return checklistEntity; - } - public LookUpDataResponse convertToLookUpDataResponseBean(LookUpDataEntity lookUpDataEntity,CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity) { LookUpDataResponse lookUpDataResponse = new LookUpDataResponse(); lookUpDataResponse.setId(callTargetAudienceChecklistEntity.getId()); diff --git a/src/main/resources/db/changelog/db.changelog-1.0.0.xml b/src/main/resources/db/changelog/db.changelog-1.0.0.xml index eb0d2fdc..ffd93d80 100644 --- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml +++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml @@ -292,4 +292,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/main/resources/message_en.properties b/src/main/resources/message_en.properties index 93821549..1960099c 100644 --- a/src/main/resources/message_en.properties +++ b/src/main/resources/message_en.properties @@ -41,6 +41,7 @@ files.uploaded=Files uploaded successfully. call.created.successfully=Call created successfully. file.deleted.successfully=File deleted successfully. document.not.found=Document not found. +document.id.not.found=Document ID not found. # Login-related messages login.successfully=Login successfully. diff --git a/src/main/resources/message_it.properties b/src/main/resources/message_it.properties index ff2e2019..4ed41cc8 100644 --- a/src/main/resources/message_it.properties +++ b/src/main/resources/message_it.properties @@ -41,6 +41,8 @@ files.uploaded=File caricati correttamente. call.created.successfully=Chiamata creata correttamente. file.deleted.successfully=File eliminato con successo. document.not.found=Documento non trovato. +document.id.not.found=ID documento non trovato. + # Login-related messages login.successfully=Accesso effettuato con successo. pass.min.len.msg=La password deve essere lunga almeno 8 caratteri.