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

Resolved conflicts

Browse Source
This commit is contained in:
Piyush
2025-03-05 20:37:35 +05:30
parent e937f33aeb d1153333ce
commit 69c8726d40
22 changed files with 464 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2532,6 +2532,11 @@
newColumnName="appointment_template_id"/>
</changeSet>
<changeSet id="27-02-2025_RK_192415" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/updated_system_email_template_email_scenario_27_02_2025.sql"/>
</changeSet>
<changeSet id="26-02-2025_NK_180530" author="Nisha Kashyap">
<sqlFile dbms="postgresql"
path="db/dump/updated_hub_data_for_email_service_config_25-02-2025.sql"/>
@@ -2545,5 +2550,75 @@
</column>
</addColumn>
</changeSet>
<changeSet id="03-03-2025_RK_120515" author="Rajesh Khore">
<sql dbms="postgresql">select
setval('gepafin_schema.form_field_id_seq', (select
max(id)+1
from gepafin_schema.form_field), false)
</sql>
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_03-03-2025.sql"/>
</changeSet>
<changeSet id="05-03-2025_NK_190115" author="Nisha Kashyap">
<sql dbms="postgresql">select
setval('gepafin_schema.role_id_seq', (select
max(id)+1
from gepafin_schema.role), false)
</sql>
<sql dbms="postgresql">select
setval('gepafin_schema.beneficiary_id_seq', (select
max(id)+1
from gepafin_schema.beneficiary), false)
</sql>
<insert tableName="role">
<column name="role_name" value="confidi"/>
<column name="role_type" value="ROLE_CONFIDI"/>
<column name="description"
value="Companies or individuals looking for financing opportunities. They can view, search, and apply to available confidi calls."/>
<column name="created_date" value="2025-03-05 00:00:00"/>
<column name="updated_date" value="2025-03-05 00:00:00"/>
<column name="permissions" value="VIEW_CONFIDI_CALLS, APPLY_CONFIDI_CALLS"/>
<column name="region_id" valueComputed="1"/>
</insert>
<insert tableName="BENEFICIARY">
<column name="EMAIL" value="confidi@test.test"/>
<column name="FIRST_NAME" value="Test"/>
<column name="LAST_NAME" value="Confidi"/>
<column name="PHONE_NUMBER" value="1234567890"/>
<column name="ORGANIZATION" value="ConfidiOrg"/>
<column name="ADDRESS" value="789 Victory Road"/>
<column name="CITY" value="Naples"/>
<column name="COUNTRY" value="Italy"/>
<column name="CODICE_FISCALE" value="0123456789"/>
<column name="DATE_OF_BIRTH" value="1985-06-15T00:00:00"/>
<column name="PRIVACY" value="true"/>
<column name="TERMS" value="true"/>
<column name="MARKETING" value="false"/>
<column name="OFFERS" value="true"/>
<column name="THIRD_PARTY" value="false"/>
<column name="HUB_ID" value="1"/>
</insert>
<insert tableName="GEPAFIN_USER">
<column name="email" value="confidi@test.test"/>
<column name="password" value="$2a$10$doUyOcEm8WPuFfpFT5y18.1DvZzF7exbqgy9X0P27cUBK7YWbfzzS"/>
<column name="first_name" value="Test"/>
<column name="last_name" value="Confidi"/>
<column name="last_login" value="2024-03-05T12:00:00"/>
<column name="organization" value="ConfidiOrg"/>
<column name="role_id" valueComputed="(SELECT id FROM role WHERE role_type = 'ROLE_CONFIDI')"/>
<column name="status" value="ACTIVE"/>
<column name="last_login" value="2024-12-19 00:00:00"/>
<column name="organization" value="ConfidiOrg"/>
<column name="address" value="789 Victory Road"/>
<column name="city" value="Naples"/>
<column name="country" value="Italy"/>
<column name="hub_id" value="1"/>
<column name="beneficiary_id" valueComputed="(SELECT id FROM BENEFICIARY WHERE EMAIL = 'confidi@test.test' ORDER BY id DESC LIMIT 1)"/>
</insert>
</changeSet>
</databaseChangeLog>

13
src/main/resources/db/dump/update_form_field_data_03-03-2025.sql Normal file
View File

@@ -0,0 +1,13 @@
INSERT INTO FORM_FIELD (SORT_ORDER, NAME, LABEL, DESCRIPTION, SETTINGS, VALIDATORS, CREATED_DATE, UPDATED_DATE)
VALUES
(
23,
'fileselect',
'Caricamento File',
'Per selezionare di documenti o immagini',
'[{name: "label",value: "Seleziona File"},{ name: "isDelegation", value: false }]',
'{"isRequired":false}',
CURRENT_TIMESTAMP,
CURRENT_TIMESTAMP
);

2
src/main/resources/db/dump/updated_system_email_template_email_scenario_27_02_2025.sql Normal file
View File

@@ -0,0 +1,2 @@
UPDATE gepafin_schema.system_email_template SET email_scenario='APPLICATION_ADMISSIBLE' WHERE "type"='ADMISSIBILITY_NOTIFICATION' AND "system"=true ;

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

@@ -390,9 +390,9 @@ company.document.copied.successfully = Company Document Copied successfully.
invalid.expiration.date = Invalid Expiration Date
appointment.cannot.be.created = Appointment cannot be created because call doesn't have the template id.
appointment.not.created = Appointment not created please try again.
validation.failed.checklist=Validation failed for checklist.
error.invalid.limit=Limit should be between 1 and 3000.
insufficient.score.msg = Insufficient score to pass to the technical and economic-financial evaluation

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

@@ -386,3 +386,4 @@ appointment.not.created = Appuntamento non creato, riprova
validation.failed.checklist=Convalida fallita per la checklist.
error.invalid.limit=Il limite dovrebbe essere compreso tra 1 e 3000.
insufficient.score.msg = Punteggio non sufficiente per passaggio alla valutazione tecnica ed economico finanziaria