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

Merge pull request #4 from Kitzanos/data-insertion

Browse Source 
Inserted default data for user,role and region
This commit is contained in:
bagoraharish92
2024-08-22 15:11:40 +05:30
committed by GitHub
parent 6df3bddf86 dcf8fa6cbc
commit cbd160fa14
5 changed files with 113 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java
View File

@@ -40,5 +40,7 @@ public class GepafinConstant {
public static final String LOGIN_SUCCESS_MSG="login.successfully"; public static final String LOGIN_SUCCESS_MSG="login.successfully";
public static final String PASSWORD_MIN_LEN ="pass.min.len.msg"; 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 EMAIL_ALREADY_EXISTS = "email.already.exists";
public static final String DOCUMENT_ID_NOT_FOUND="document.id.not.found";
} }

25
src/main/java/net/gepafin/tendermanagement/dao/CallDao.java
View File

@@ -118,8 +118,11 @@ public class CallDao {
} }
private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) { private DocumentEntity convertToDocumentEntity(DocumentReq documentReq, CallEntity callEntity) {
DocumentEntity documentEntity = new DocumentEntity(); validateDocumentEntity(documentReq.getId(),documentReq.getFileName());
validateDocumentEntity(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.setFileName(documentReq.getFileName());
documentEntity.setFilePath(documentReq.getUrl()); documentEntity.setFilePath(documentReq.getUrl());
documentEntity.setCall(callEntity); 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)) { if (!StringUtils.hasText(name)) {
throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG)); throw new CustomValidationException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.NAME_NOT_EMPTY_MSG));
} }
@@ -276,16 +283,14 @@ public class CallDao {
private List<LookUpDataResponse> createCallTargetAudienceCheckList(CallEntity callEntity, List<LookUpDataEntity> lookUpDataEntities) { private List<LookUpDataResponse> createCallTargetAudienceCheckList(CallEntity callEntity, List<LookUpDataEntity> lookUpDataEntities) {
List<LookUpDataResponse> lookUpDataResponses=new ArrayList<>(); List<LookUpDataResponse> lookUpDataResponses=new ArrayList<>();
List<CallTargetAudienceChecklistEntity> callTargetAudienceChecklistEntities=new ArrayList<>();
for(LookUpDataEntity lookUpDataEntity:lookUpDataEntities){ for(LookUpDataEntity lookUpDataEntity:lookUpDataEntities){
CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity=new CallTargetAudienceChecklistEntity(); CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity=new CallTargetAudienceChecklistEntity();
callTargetAudienceChecklistEntity.setIsValidated(false); callTargetAudienceChecklistEntity.setIsValidated(false);
callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity); callTargetAudienceChecklistEntity.setLookupData(lookUpDataEntity);
callTargetAudienceChecklistEntity.setCall(callEntity); callTargetAudienceChecklistEntity.setCall(callEntity);
callTargetAudienceChecklistEntities.add(callTargetAudienceChecklistEntity); callTargetAudienceChecklistEntity= callTargetAudienceChecklistRepository.save(callTargetAudienceChecklistEntity);
lookUpDataResponses.add(convertToLookUpDataResponseBean(lookUpDataEntity,callTargetAudienceChecklistEntity)); lookUpDataResponses.add(convertToLookUpDataResponseBean(lookUpDataEntity,callTargetAudienceChecklistEntity));
} }
callTargetAudienceChecklistRepository.saveAll(callTargetAudienceChecklistEntities);
return lookUpDataResponses; return lookUpDataResponses;
} }
@@ -301,14 +306,6 @@ public class CallDao {
.orElseThrow(() -> new ResourceNotFoundException(Status.VALIDATION_ERROR, Translator.toLocale(GepafinConstant.LOOK_UP_DATA_NOT_VALID_MSG))); .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) { public LookUpDataResponse convertToLookUpDataResponseBean(LookUpDataEntity lookUpDataEntity,CallTargetAudienceChecklistEntity callTargetAudienceChecklistEntity) {
LookUpDataResponse lookUpDataResponse = new LookUpDataResponse(); LookUpDataResponse lookUpDataResponse = new LookUpDataResponse();
lookUpDataResponse.setId(callTargetAudienceChecklistEntity.getId()); lookUpDataResponse.setId(callTargetAudienceChecklistEntity.getId());

97
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -292,4 +292,101 @@
</createTable> </createTable>
</changeSet> </changeSet>
<changeSet id="22-08-2024_1" author="Harish Bagora">
<insert tableName="region">
<column name="region_name" value="Italy"/>
<column name="description" value="A beautiful country in Southern Europe known for its art, culture, and history."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="country" value="Italy"/>
<column name="status" value="ACTIVE"/>
<column name="priority_area" value="Tourism"/>
<column name="population" value="60000000"/>
<column name="area_size" value="301340"/>
<column name="gdp" value="2000000"/>
<column name="unemployment_rate" value="8.3"/>
<column name="infrastructure_score" value="85"/>
<column name="education_level" value="78"/>
<column name="healthcare_access" value="88"/>
<column name="environmental_score" value="75"/>
</insert>
</changeSet>
<changeSet id="22-08-2024_2" author="Harish Bagora">
<!-- Insert data for Beneficiaries role -->
<insert tableName="role">
<column name="role_name" value="BENEFICIARIES"/>
<column name="description" value="Companies or individuals looking for financing opportunities. They can view, search, and apply to available calls."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="permissions" value="VIEW_CALLS, APPLY_CALLS"/>
<column name="region_id" valueComputed="1"/>
</insert>
<!-- Insert data for Super Admin role -->
<insert tableName="role">
<column name="role_name" value="SUPER_ADMIN"/>
<column name="description" value="Manages the creation and publication of tenders and administers internal system users."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="permissions" value="MANAGE_TENDERS, MANAGE_USERS"/>
<column name="region_id" valueComputed="1"/>
</insert>
<!-- Insert data for Pre-instructors role -->
<insert tableName="role">
<column name="role_name" value="PRE_INSTRUCTORS"/>
<column name="description" value="They evaluate the applications sent by beneficiaries and manage the preliminary relief process."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="permissions" value="EVALUATE_APPLICATIONS, MANAGE_PRELIMINARY_RELIEF"/>
<column name="region_id" valueComputed="1"/>
</insert>
<!-- Insert data for Gepafin Operators role -->
<insert tableName="role">
<column name="role_name" value="GEPAFIN_OPERATORS"/>
<column name="description" value="They manage the subsequent phases of the evaluation after the pre-investigation."/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="permissions" value="MANAGE_SUBSEQUENT_PHASES"/>
<column name="region_id" valueComputed="1"/>
</insert>
</changeSet>
<changeSet id="22-08-2024_3" author="Harish Bagora">
<!-- Insert Super User -->
<insert tableName="gepafin_user">
<column name="password" value="$2a$10$doUyOcEm8WPuFfpFT5y18.1DvZzF7exbqgy9X0P27cUBK7YWbfzzS"/>
<column name="email" value="superUser@test.test"/>
<column name="first_name" value="Super"/>
<column name="last_name" value="User"/>
<column name="phone_number" value="1234567890"/>
<column name="role_id" valueComputed="2"/>
<column name="status" value="ACTIVE"/>
<column name="last_login" value="2024-08-14 00:00:00"/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="organization" value="SuperOrg"/>
<column name="address" value="123 Main Street"/>
<column name="city" value="Rome"/>
<column name="country" value="Italy"/>
</insert>
<!-- Insert Beneficiary User -->
<insert tableName="gepafin_user">
<column name="password" value="$2a$10$doUyOcEm8WPuFfpFT5y18.1DvZzF7exbqgy9X0P27cUBK7YWbfzzS"/>
<column name="email" value="test@test.test"/>
<column name="first_name" value="Test"/>
<column name="last_name" value="User"/>
<column name="phone_number" value="0987654321"/>
<column name="role_id" valueComputed="1"/>
<column name="status" value="ACTIVE"/>
<column name="last_login" value="2024-08-14 00:00:00"/>
<column name="created_date" value="2024-08-14 00:00:00"/>
<column name="updated_date" value="2024-08-14 00:00:00"/>
<column name="organization" value="TestOrg"/>
<column name="address" value="456 Market Street"/>
<column name="city" value="Milan"/>
<column name="country" value="Italy"/>
</insert>
</changeSet>
</databaseChangeLog> </databaseChangeLog>

1
src/main/resources/message_en.properties
View File

@@ -41,6 +41,7 @@ files.uploaded=Files uploaded successfully.
call.created.successfully=Call created successfully. call.created.successfully=Call created successfully.
file.deleted.successfully=File deleted successfully. file.deleted.successfully=File deleted successfully.
document.not.found=Document not found. document.not.found=Document not found.
document.id.not.found=Document ID not found.
# Login-related messages # Login-related messages
login.successfully=Login successfully. login.successfully=Login successfully.

2
src/main/resources/message_it.properties
View File

@@ -41,6 +41,8 @@ files.uploaded=File caricati correttamente.
call.created.successfully=Chiamata creata correttamente. call.created.successfully=Chiamata creata correttamente.
file.deleted.successfully=File eliminato con successo. file.deleted.successfully=File eliminato con successo.
document.not.found=Documento non trovato. document.not.found=Documento non trovato.
document.id.not.found=ID documento non trovato.
# Login-related messages # Login-related messages
login.successfully=Accesso effettuato con successo. login.successfully=Accesso effettuato con successo.
pass.min.len.msg=La password deve essere lunga almeno 8 caratteri. pass.min.len.msg=La password deve essere lunga almeno 8 caratteri.