Resolved Conflicts

This commit is contained in:
rajesh
2025-06-03 19:23:46 +05:30
125 changed files with 4072 additions and 541 deletions

View File

@@ -2653,6 +2653,8 @@
<column name="file_path" value="https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/local/template/PROCURA_BANDI_TEMPLATE_CONFIDI.docx"></column>
<column name="type" value="DOCUMENT"></column>
<column name="source" value="DELEGATION_TEMPLATE_CONFIDI"></column>
<column name="created_date" value="2025-05-21 03:00:00"/>
<column name="updated_date" value="2025-05-21 03:00:00"/>
</insert>
</changeSet>
@@ -2666,14 +2668,27 @@
<column name="file_path" value="https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/local/template/true.png"></column>
<column name="type" value="IMAGE"></column>
<column name="source" value="PDF_TRUE"></column>
<column name="created_date" value="2025-05-21 03:00:00"/>
<column name="updated_date" value="2025-05-21 03:00:00"/>
</insert>
<insert tableName="document">
<column name="file_name" value="GEPAFIN_PDF_FALSE.PNG"></column>
<column name="file_path" value="https://mementoresources.s3.eu-west-1.amazonaws.com/gepafin/local/template/false.png"></column>
<column name="type" value="IMAGE"></column>
<column name="source" value="PDF_FALSE"></column>
<column name="created_date" value="2025-05-21 03:00:00"/>
<column name="updated_date" value="2025-05-21 03:00:00"/>
</insert>
</changeSet>
<changeSet id="14-04-2025_RK_161000" author="Rajesh Khore">
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_14_04_2025.sql"/>
</changeSet>
<changeSet id="09-04-2025_NK_172550" author="Nisha Kashyap">
<sqlFile
dbms="postgresql"
path="db/dump/create_application_form_view.sql"/>
</changeSet>
<changeSet id="25-03-2025_NK_160730" author="Nisha Kashyap">
<sqlFile dbms="postgresql"
@@ -2849,12 +2864,95 @@
</addColumn>
</changeSet>
<changeSet id="05-05-2025_PK_191415" author="Piyush Kag">
<changeSet id="08-04-2025_PK_160730" author="Piyush kag">
<sqlFile dbms="postgresql"
path="db/dump/create_assigned_application_view.sql"/>
</changeSet>
<changeSet id="28-04-2025_PK_154315" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_json_template_for_notification_28_04_2025.sql"/>
</changeSet>
<changeSet id="28-04-2025_PK_163615" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_system_email_template_28_04_2025.sql"/>
</changeSet>
<changeSet id="22-04-2025_PK_192400" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_json_template_for_notification_22_04_2025.sql"/>
</changeSet>
<changeSet id="24-04-2025_PK_121820" author="Piyush Kag">
<addColumn tableName="email_log">
<column name="user_action_id" type="INTEGER">
<constraints foreignKeyName="fk_email_log_user_action" references="user_action(id)"/>
</column>
</addColumn>
</changeSet>
<changeSet id="30-04-2025_PK_125515" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_for_application_submission_failure_30_04_2025.sql"/>
</changeSet>
<changeSet id="06-05-2025_PK_193412" author="Piyush Kag">
<addColumn tableName="application_amendment_request">
<column name="email_send_response" type="TEXT">
<constraints nullable="true"/>
</column>
</addColumn>
<addColumn tableName="application_evaluation">
<column name="email_send_response" type="TEXT">
<constraints nullable="true"/>
</column>
</addColumn>
<addColumn tableName="gepafin_user">
<column name="email_send_response" type="TEXT">
<constraints nullable="true"/>
</column>
</addColumn>
</changeSet>
<changeSet id="07-05-2025_PK_195815" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_application_amendment_request_view.sql"/>
</changeSet>
<changeSet id="07-05-2025_PK_201518" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_assigned_application_view.sql"/>
</changeSet>
<changeSet id="08-05-2025_PK_203515" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_system_email_template_for_application_submission_failure_08_05_2025.sql"/>
</changeSet>
<changeSet id="14-05-2025_NK_163815" author="Nisha Kashyap">
<sqlFile dbms="postgresql"
path="db/dump/update_assigned_application_view_14_5_2025.sql"/>
</changeSet>
<changeSet id="26-05-2025_RK_184320" author="Rajesh Khore">
<addColumn tableName="application_signed_document">
<column name="file_hash" type="VARCHAR(255)"></column>
</addColumn>
<addColumn tableName="protocol">
<column name="external_protocol_number" type="VARCHAR(255)"/>
<column name="external_protocol_year" type="INTEGER"/>
<column name="external_protocol_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
</addColumn>
<addColumn tableName="company">
<column name="pec" type="VARCHAR(255)"></column>
</addColumn>
</changeSet>
</databaseChangeLog>