From bba7efe6dbe60ea729fbf8e4036b16690761d396 Mon Sep 17 00:00:00 2001 From: Piyush Date: Mon, 10 Feb 2025 20:27:17 +0530 Subject: [PATCH 1/4] Updated null to 0 --- .../java/net/gepafin/tendermanagement/dao/DashboardDao.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java index 0e7f7802..29304f15 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/DashboardDao.java @@ -510,8 +510,8 @@ public class DashboardDao { stats.put(GepafinConstant.REQUESTED_VS_APPROVED_AMOUNTS, requestedVsApprovedAmounts.stream().map(result -> { Map data = new HashMap<>(); data.put(GepafinConstant.MONTH, result[0]); - data.put(GepafinConstant.TOTAL_REQUESTED, result[1]); - data.put(GepafinConstant.TOTAL_APPROVED, result[2]); + data.put(GepafinConstant.TOTAL_REQUESTED, result[1]!= null ? result[1] : 0L); + data.put(GepafinConstant.TOTAL_APPROVED, result[2] != null ? result[2] : 0L); return data; }).toList()); return stats; From acab068ef1b10597b22a78214cca906863fae92f Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 11 Feb 2025 11:38:56 +0530 Subject: [PATCH 2/4] Done ticket GEPAFINBE-166 --- .../constants/GepafinConstant.java | 92 ++++++------------- .../dao/EmailNotificationDao.java | 14 +-- .../dao/SystemEmailTemplatesDao.java | 6 +- .../entities/SystemEmailTemplatesEntity.java | 7 +- .../SystemEmailTemplatesRespository.java | 3 + .../db/changelog/db.changelog-1.0.0.xml | 20 ++++ ...nt_mail_notification_mail_31_01_2024_1.sql | 65 +++++++++++++ 7 files changed, 126 insertions(+), 81 deletions(-) create mode 100644 src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql diff --git a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java index 80f30960..35b2d6c1 100644 --- a/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java +++ b/src/main/java/net/gepafin/tendermanagement/constants/GepafinConstant.java @@ -180,27 +180,27 @@ public class GepafinConstant { public static final String UNAUTHORIZED = "UNAUTHORIZED"; public static final String COMPANY_ID_MANDATORY = "company.id.mandatory"; public static final String USER_ALREADY_CONNECTED_TO_COMPANY = "user.already.connected.to.company"; - public static final String YYYY_MM_DD_DASH = "yyyy-MM-dd"; - public static final String YYYY_MM_DD_SLASH = "yyyy/MM/dd"; - public static final String DELEGATION_TEMPLATE = "DELEGATION_TEMPLATE"; - public static final String VALIDATION_ERROR_MISSING_FIRSTNAME = "validation.error.missing.firstName"; - public static final String VALIDATION_ERROR_MISSING_LASTNAME = "validation.error.missing.lastName"; - public static final String VALIDATION_ERROR_MISSING_CODICEFISCALE = "validation.error.missing.codiceFiscale"; - public static final String DELEGATION_FILE_UPLOAD_SUCCESS = "delegation.file.upload.success"; - public static final String DELEGATION_FETCH_SUCCESS = "delegation.fetch.success"; - public static final String DELEGATION_TEMPLATE_GENERATION_ERROR = "delegation.template.generation.error"; - public static final String VALIDATION_ERROR_FILE_EMPTY = "validation.error.file.empty"; - public static final String VALIDATION_ERROR_FILE_INVALIDTYPE = "validation.error.file.invalidType"; - public static final String UPLOAD_ERROR_S3 = "upload.error.s3"; + public static final String YYYY_MM_DD_DASH = "yyyy-MM-dd"; + public static final String YYYY_MM_DD_SLASH = "yyyy/MM/dd"; + public static final String DELEGATION_TEMPLATE = "DELEGATION_TEMPLATE"; + public static final String VALIDATION_ERROR_MISSING_FIRSTNAME = "validation.error.missing.firstName"; + public static final String VALIDATION_ERROR_MISSING_LASTNAME = "validation.error.missing.lastName"; + public static final String VALIDATION_ERROR_MISSING_CODICEFISCALE = "validation.error.missing.codiceFiscale"; + public static final String DELEGATION_FILE_UPLOAD_SUCCESS = "delegation.file.upload.success"; + public static final String DELEGATION_FETCH_SUCCESS = "delegation.fetch.success"; + public static final String DELEGATION_TEMPLATE_GENERATION_ERROR = "delegation.template.generation.error"; + public static final String VALIDATION_ERROR_FILE_EMPTY = "validation.error.file.empty"; + public static final String VALIDATION_ERROR_FILE_INVALIDTYPE = "validation.error.file.invalidType"; + public static final String UPLOAD_ERROR_S3 = "upload.error.s3"; public static final String CALL_NOT_STARTED_YET = "call.not.started.yet"; public static final String CALL_ALREADY_ENDED = "call.already.ended"; public static final String APPLICATION_STATUS_UPDATED_SUCCESSFULLY = "application.status.updated.successfully"; public static final String APPLICATION_ALREADY_IN_PREVIOUS_STATUS = "application.already.in.provided.status"; - public static final String DELEGATION_NOT_FOUND = "delegation.not.found"; - public static final String USER_COMPANY_RELATION_NOT_FOUND = "user.company.relation.not.found"; - public static final String DELEGATION_DELETE_SUCCESS = "delegation.delete.success"; - public static final String HH_MM_SS = "HH:mm:ss"; + public static final String DELEGATION_NOT_FOUND = "delegation.not.found"; + public static final String USER_COMPANY_RELATION_NOT_FOUND = "user.company.relation.not.found"; + public static final String DELEGATION_DELETE_SUCCESS = "delegation.delete.success"; + public static final String HH_MM_SS = "HH:mm:ss"; public static final String USER_NOT_AUTHORIZED_TO_CREATE_APPLICATION = "user.not.authorized.create.application"; public static final String APPLICATION_SUBMITTED_CANNOT_CHANGE = "application.submitted.cannot.change"; @@ -218,11 +218,11 @@ public class GepafinConstant { public static final String USER_ID_AND_BENEFICIARY_ID_ERROR = "userId.and.beneficiaryId.error"; public static final String EITHER_USER_OR_BENEFICIARY_ID_REQUIRED = "either.user.or.beneficiary.id.required"; public static final String USER_NOT_FOUND_WITH_BENEFICIARYID_MSG = "User.not.found.with.the.given.beneficiaryID"; - public static final String PERMISSION_DENIED = "permission.denied"; - public static final String SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS = "signed.document.file.upload.success"; - public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success"; - public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found"; - public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success"; + public static final String PERMISSION_DENIED = "permission.denied"; + public static final String SIGNED_DOCUMENT_FILE_UPLOAD_SUCCESS = "signed.document.file.upload.success"; + public static final String GET_SIGNED_DOCUMENT_FILE_SUCCESS = "get.signed.document.file.success"; + public static final String APPLICATION_SIGNED_DOCUMENT_NOT_FOUND = "application.signed.document.not.found"; + public static final String DELETE_SIGNED_DOCUMENT_FILE_SUCCESS = "delete.signed.document.file.success"; public static final String DD_MM_YYYY = "dd/MM/yyyy"; public static final String DASHBOARD_WIDGET_FETCHED_SUCCESSFULLY="dashboard.widget.fetched.successfully"; @@ -251,16 +251,16 @@ public class GepafinConstant { public static final String DELETE_ASSIGNED_APPLICATION_SUCCESS_MSG = "assigned.application.deleted.success"; public static final String GET_ASSIGNED_APPLICATION_SUCCESS_MSG = "assigned.application.get.success"; public static final String ASSIGNED_APPLICATION_UPDATE_SUCCESSFULLY_MSG = "assigned.application.update.successfully"; - + public static final String HUB_CREATE_SUCCESS = "hub_create_success"; public static final String HUB_UPDATE_SUCCESS = "hub_update_success"; public static final String HUB_GET_SUCCESS = "hub_get_success"; public static final String HUB_GET_ALL_SUCCESS = "hub_get_all_success"; public static final String HUB_DELETE_SUCCESS = "hub_delete_success"; public static final String HUB_NOT_FOUND = "hub_not_found"; - public static final String EVALUATIONCRITERIA_INVALID = "evaluationCriteria.invalid"; + public static final String EVALUATIONCRITERIA_INVALID = "evaluationCriteria.invalid"; public static final String APPLICATION_NOT_IN_DRAFT_STATUS="application.not.in.draft.status"; - public static final String GET_ERROR_S3 = "get.error.s3"; + public static final String GET_ERROR_S3 = "get.error.s3"; public static final String BENEFICIARY_EMAIL_NOT_FOUND_MSG = "beneficiary.email.not.found.msg"; public static final String ADDED_S3_PATH_STRUCTURE ="added.s3.path.structure"; public static final String S3_PATH_STRUCTURE_BY_TYPE ="fetched.s3.path.structure.by.type.successfully"; @@ -391,7 +391,7 @@ public class GepafinConstant { public static final String NON_EMPTY_TABLES="nonEmptyTables"; public static final String VALIDATION_IN_TABLE = "validation.table.message"; public static final String CALL_EXPIRED="call.expired"; - public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero"; + public static final String AMOUNT_REQUEST_SHOULD_GREATED_THEN_ZERO = "amount.request.should.greated.then.zero"; @@ -410,44 +410,8 @@ public class GepafinConstant { public static final String REQUIRED_REQUESTED_AMOUNT_MSG = "validation.required.requested.amount"; public static final String FORMULA_AMOUNT_NOT_MATCHED="formula.amount.not.matches.requested.amount"; public static final String CRITERIA_TABLE_COLUMNS="criteria_table_columns"; - - public static final String DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA= "\n" + - " \n" + - "
\n" + - "

RICHIESTA INTEGRAZIONE DOCUMENTALE

\n" + - "

Buongiorno,

\n" + - "

In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Bando \n" + - " “{{call_name}}“ di cui al Protocollo n. {{protocol_number}} del\n" + - " {{protocol_date}} e {{protocol_time}}, alla luce dell'attività istruttoria svolta,\n" + - " segnaliamo quanto segue:\n" + - "

\n" + - " {{note}}\n" + - "

Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione caricandola all'interno dello sportello\n" + - " online {{platform_link}} entro e non oltre {{response_days}} giorni dal ricevimento della presente comunicazione,\n" + - " precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.\n" + - "

\n" + - "

La documentazione trasmessa e le informazioni fornite saranno processate dall'istruttore assegnatario della pratica.\n" + - "

\n" + - "

Distinti Saluti,

\n" + - "

{{email_signature}}

\n" + - "
\n" + - " \n" + - ""; - - - public static final String APPLICATION_REJECTED_SVILUPPUMBRIA = "\n" + - " \n" + - "
\n" + - "

Buongiorno,

\n" + - "

Si comunica che, in riferimento alla domanda a valere sul bando “{{call_name}}” di cui al\n" + - " Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}},\n" + - " la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.

\n" + - "

Le motivazioni sono le seguenti: {{form_text}}

\n" + - "

Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno finoltrare richiesta di chiarimenti e/o osservazioni alla scrivente Società ai sensi e per gli effetti dell’art.10 bis della L.241/1990 e s.m.i.

\n" + - "

Distinti Saluti,

\n" + - "

{{email_signature}}

\n" + - "
\n" + - " \n" + - ""; } + + + diff --git a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java index 8133e5f7..3988b35a 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/EmailNotificationDao.java @@ -94,19 +94,7 @@ public class EmailNotificationDao { subjectPlaceholders.put("{{company_name}}", company.getCompanyName()); // bodyPlaceholders.put("{{legal_mail}}", legalMail); String subject = Utils.replacePlaceholders(systemEmailTemplateResponse.getSubject(), subjectPlaceholders); - String body; - if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.DOCUMENTATION_INTEGRATION_REQUEST)) { - bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature()); - bodyPlaceholders.put("{{platform_link}}",hubEntity.getDomainName()); - body = Utils.replacePlaceholders(GepafinConstant.DOCUMENTATION_INTEGRATION_REQUEST_SVILUPPUMBRIA, bodyPlaceholders); - } - else if ("t7jh5wfg9QXylNaTZkPoE".equals(hubEntity.getUniqueUuid()) && templateType.equals(SystemEmailTemplatesEntity.SystemEmailTemplatesEntityTypeEnum.INADMISSIBILITY_TEMPLATE)) { - bodyPlaceholders.put("{{email_signature}}", hubEntity.getEmailSignature()); - body = Utils.replacePlaceholders(GepafinConstant.APPLICATION_REJECTED_SVILUPPUMBRIA, bodyPlaceholders); - } - else { - body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders); - } + String body = Utils.replacePlaceholders(systemEmailTemplateResponse.getHtmlContent(), bodyPlaceholders); return new EmailContentResponse(subject, body, systemEmailTemplateResponse); } diff --git a/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java b/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java index 514506f5..8808abfd 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/SystemEmailTemplatesDao.java @@ -33,10 +33,10 @@ public class SystemEmailTemplatesDao { public SystemEmailTemplateResponse retrieveTemplate(SystemEmailTemplatesEntityTypeEnum type, HubEntity hub, Locale language) { SystemEmailTemplatesEntity dbSystemEmailTemplatesEntity = null; if(hub != null){ -// dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository -// .findByTypeAndCallId(type.getValue(), call.getId()); + dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository + .findByTypeAndHubEntityId(type.getValue(), hub.getId()); } - if(dbSystemEmailTemplatesEntity == null) { + if(dbSystemEmailTemplatesEntity == null){ dbSystemEmailTemplatesEntity = systemEmailTemplatesRespository .findByType(type.getValue()); } diff --git a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java index dac3a432..8a3c964b 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/SystemEmailTemplatesEntity.java @@ -38,7 +38,12 @@ public class SystemEmailTemplatesEntity extends BaseEntity { @Column(name = "email_scenario") private String emailScenario; - + + @ManyToOne + @JoinColumn(name = "HUB_ID") + private HubEntity hubEntity; + + public enum SystemEmailTemplatesEntityTypeEnum { APPLICATION_SUBMISSION_TO_USER_AND_COMPANY("APPLICATION_SUBMISSION_TO_USER_AND_COMPANY"), diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java b/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java index 9e3e9bb9..d86c7216 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/SystemEmailTemplatesRespository.java @@ -13,5 +13,8 @@ public interface SystemEmailTemplatesRespository extends JpaRepository + + + + + + + + + + + + select + setval('gepafin_schema.system_email_template_id_seq', (select + max(id)+1 + from gepafin_schema.system_email_template), false) + + + diff --git a/src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql b/src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql new file mode 100644 index 00000000..e148c879 --- /dev/null +++ b/src/main/resources/db/dump/insert_system_email_template_for_updating_amendment_mail_notification_mail_31_01_2024_1.sql @@ -0,0 +1,65 @@ +INSERT INTO gepafin_schema.system_email_template (template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date, email_scenario, hub_id) +VALUES +( + 'Instructional Aid/Request for Documentation Integration Template For Sviluppumbria', + 'DOCUMENTATION_INTEGRATION_REQUEST', + ' + +
+

RICHIESTA INTEGRAZIONE DOCUMENTALE

+

Buongiorno,

+

In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Bando + "{{call_name}}" di cui al Protocollo n. {{protocol_number}} del + {{protocol_date}} e {{protocol_time}}, alla luce dell''attività istruttoria svolta, + segnaliamo quanto segue: +

+ {{note}} +

Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione caricandola all''interno dello sportello + online {{platform_link}} entro e non oltre {{response_days}} giorni dal ricevimento della presente comunicazione, + precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento. +

+

La documentazione trasmessa e le informazioni fornite saranno processate dall''istruttore assegnatario della pratica. +

+

Distinti Saluti,

+

{{email_signature}}

+
+ + ', + 'BANDO {{call_name}}- Domanda di concessione di finanziamento agevolato {{company_name}}', + NULL, + false, + false, + CURRENT_TIMESTAMP, + CURRENT_TIMESTAMP, + 'APPLICATION_AMENDMENT_REQUESTED', + 2 +); + +INSERT INTO gepafin_schema.system_email_template (template_name, "type", html_content, subject, "json", "system", is_deleted, created_date, updated_date, email_scenario, hub_id) +VALUES +( + 'Notification of Inadmissibility Template', + 'INADMISSIBILITY_NOTIFICATION', + ' + +
+

Buongiorno,

+

Si comunica che, in riferimento alla domanda a valere sul bando “{{call_name}}” di cui al + Protocollo n. {{protocol_number}} del {{protocol_date}} alle {{protocol_time}}, + la stessa è stata sottoposta ad istruttoria di ammissibilità con esito negativo.

+

Le motivazioni sono le seguenti: {{form_text}}

+

Vi ricordiamo che i Beneficiari che hanno presentato richieste valutate non ammissibili entro 10 giorni dalla data di ricevimento della presente potranno finoltrare richiesta di chiarimenti e/o osservazioni alla scrivente Società ai sensi e per gli effetti dell’art.10 bis della L.241/1990 e s.m.i.

+

Distinti Saluti,

+

{{email_signature}}

+
+ + ', + 'BANDO {{call_name}} – Esito negativo istruttoria di ammissibilità {{company_name}}', + NULL, + false, + false, + CURRENT_TIMESTAMP, + CURRENT_TIMESTAMP, + 'APPLICATION_REJECTED', + 2 +); \ No newline at end of file From 6bb531789a0d2276e54644f71ca0e56c6e5648c6 Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 11 Feb 2025 18:24:18 +0530 Subject: [PATCH 3/4] Changes in create Application api for gepafin --- .../tendermanagement/dao/ApplicationDao.java | 16 ++++++++++++++++ .../repositories/ApplicationRepository.java | 4 ++++ 2 files changed, 20 insertions(+) diff --git a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java index 35ecc113..fb2a1749 100644 --- a/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java +++ b/src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java @@ -888,6 +888,10 @@ public class ApplicationDao { checkCallEndDate(call); // call = callService.validatePublishedCall(call.getId()); // checkIfApplicationExists(call, userWithCompanyEntity, userEntity); + HubEntity hubEntity = hubService.valdateHub(call.getHub().getId()); + if(hubEntity.getUniqueUuid().equals(defaultHubUuid)){ + checkIfApplicationExists(call, userWithCompanyEntity, userEntity); + } ApplicationEntity applicationEntity = createApplicationEntity(userEntity, call, userWithCompanyEntity); applicationEntity.setComments(applicationRequest.getComments()); applicationEntity = saveApplicationEntity(applicationEntity); @@ -900,6 +904,18 @@ public class ApplicationDao { // } // } + public void checkIfApplicationExists(CallEntity call, UserWithCompanyEntity userWithCompanyEntity, UserEntity userEntity){ + + List applications = applicationRepository.findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot( + userEntity.getId(), userWithCompanyEntity.getId(), call.getId(), ApplicationStatusTypeEnum.REJECTED.name() + ); + + if (!applications.isEmpty()) { + throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.APPLICATION_ALREADY_EXISTS)); + } + } + + public ApplicationResponse updateApplicationStatus(HttpServletRequest request, Long applicationId, ApplicationStatusTypeEnum status) { ApplicationEntity applicationEntity = validateApplication(applicationId); diff --git a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java index 2434fac9..5ed76d55 100644 --- a/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java +++ b/src/main/java/net/gepafin/tendermanagement/repositories/ApplicationRepository.java @@ -158,4 +158,8 @@ public interface ApplicationRepository extends JpaRepository findByUserIdAndUserWithCompany_IdAndCall_IdAndIsDeletedFalseAndStatusNot( + Long userId, Long userWithCompanyId, Long callId, String status + ); } From 8a08fd6b3e95054afd31cbed2ab489c43bbf221d Mon Sep 17 00:00:00 2001 From: rajesh Date: Tue, 11 Feb 2025 18:24:55 +0530 Subject: [PATCH 4/4] updated code --- .../net/gepafin/tendermanagement/entities/CallEntity.java | 4 ++-- .../model/request/CreateCallRequestStep1.java | 4 ++-- .../model/request/UpdateCallRequestStep1.java | 4 ++-- .../model/response/ApplicationEvaluationResponse.java | 4 ++-- .../model/response/AssignedApplicationsResponse.java | 4 ++-- .../model/response/CallDetailsResponseBean.java | 4 ++-- .../tendermanagement/model/response/CallResponse.java | 4 ++-- src/main/resources/db/changelog/db.changelog-1.0.0.xml | 5 +++++ 8 files changed, 19 insertions(+), 14 deletions(-) diff --git a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java index a9098234..36c370d1 100644 --- a/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java +++ b/src/main/java/net/gepafin/tendermanagement/entities/CallEntity.java @@ -93,9 +93,9 @@ public class CallEntity extends BaseEntity { private String evaluationVersion; @Column(name = "NUMBER_OF_CHECK") - private BigDecimal numberOfCheck; + private Long numberOfCheck; @Column(name = "PRODUCT_ID") - private BigDecimal productId; + private Long productId; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java index ca8abd99..c54a1454 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/CreateCallRequestStep1.java @@ -24,9 +24,9 @@ public class CreateCallRequestStep1 { private BigDecimal amountMax; - private BigDecimal numberOfCheck; + private Long numberOfCheck; - private BigDecimal productId; + private Long productId; private List aimedTo; diff --git a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java index 2ebda4b5..ad55d544 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java +++ b/src/main/java/net/gepafin/tendermanagement/model/request/UpdateCallRequestStep1.java @@ -41,9 +41,9 @@ public class UpdateCallRequestStep1 { private List faq; - private BigDecimal numberOfCheck; + private Long numberOfCheck; - private BigDecimal productId; + private Long productId; private EvaluationVersionEnum evaluationVersion; diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java index 312e6f35..44f27c13 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/ApplicationEvaluationResponse.java @@ -44,8 +44,8 @@ public class ApplicationEvaluationResponse { private BigDecimal amountAccepted; private LocalDateTime dateAccepted; private LocalDateTime dateRejected; - private BigDecimal numberOfCheck; - private BigDecimal productId; + private Long numberOfCheck; + private Long productId; private EvaluationVersionEnum evaluationVersion; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java index 8597cafa..37311ff6 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/AssignedApplicationsResponse.java @@ -24,8 +24,8 @@ public class AssignedApplicationsResponse extends BaseBean { private LocalDateTime callEndDate; private String companyName; private LocalDateTime evaluationEndDate; - private BigDecimal numberOfCheck; - private BigDecimal productId; + private Long numberOfCheck; + private Long productId; private EvaluationVersionEnum evaluationVersion; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java index 256a564b..76e892d1 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallDetailsResponseBean.java @@ -57,9 +57,9 @@ public class CallDetailsResponseBean { private Long preferredCallId; - private BigDecimal numberOfCheck; + private Long numberOfCheck; - private BigDecimal productId; + private Long productId; private EvaluationVersionEnum evaluationVersion; } diff --git a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java index 6390e91c..a566ab37 100644 --- a/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java +++ b/src/main/java/net/gepafin/tendermanagement/model/response/CallResponse.java @@ -50,9 +50,9 @@ public class CallResponse { private String phoneNumber; - private BigDecimal numberOfCheck; + private Long numberOfCheck; - private BigDecimal productId; + private Long productId; @JsonSerialize(using = DynamicLocalTimeSerializer.class) private LocalTime startTime; 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 cb626eb9..37c34586 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 @@ -2413,4 +2413,9 @@ + + + + +