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:
nisha
2025-01-09 15:29:14 +05:30
parent f9c228f0c9 3cf0e1dfef
commit 3b8246987e
93 changed files with 2958 additions and 510 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1961,7 +1961,17 @@
</column>
</addColumn>
</changeSet>
<changeSet id="02-12-2024_1" author="Rajesh Khore">
<sql dbms="postgresql">select
setval('gepafin_schema.system_email_template_id_seq', (select
max(id)+1
from gepafin_schema.system_email_template), false)
</sql>
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_for_user_28_11_2024.sql"/>
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_for_reset_password_28_11_2024.sql"/>
</changeSet>
<changeSet id="03-12-2024_1" author="Piyush">
<sqlFile dbms="postgresql"
path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_03_12_2024_1.sql"/>
@@ -1972,6 +1982,20 @@
path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
</changeSet>
<changeSet id="19-12-2024_4" author="Nisha Kashyap">
<addColumn tableName="USER_WITH_COMPANY">
<column name="contact_name" type="VARCHAR(255)"/>
<column name="contact_email" type="VARCHAR(255)"/>
<column name="PEC" type="VARCHAR(255)"/>
<column name="EMAIL" type="VARCHAR(255)"/>
<column name="JSON" type="TEXT"/>
</addColumn>
<dropColumn tableName="COMPANY" columnName="contact_name"/>
<dropColumn tableName="COMPANY" columnName="contact_email"/>
<dropColumn tableName="COMPANY" columnName="PEC"/>
<dropColumn tableName="COMPANY" columnName="EMAIL"/>
</changeSet>
<changeSet id="04-12-2024_3" author="Piyush">
<addColumn tableName="hub">
<column name="auth_token" type="TEXT"/>
@@ -2030,7 +2054,7 @@
</addColumn>
</changeSet>
<changeSet id="19-12-2024_1" author="Nisha kashyap">
<changeSet id="19-12-2024_1" author="Nisha Kashyap">
<!-- Insert data for Intructor manager role -->
<insert tableName="role">
<column name="role_name" value="instructor manager"/>
@@ -2064,6 +2088,106 @@
<column name="hub_id" value="1"/>
</insert>
</changeSet>
<changeSet id="24-12-2024_1" author="Nisha kashyap">
<addColumn tableName="application_evaluation">
<column name="closing_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
</addColumn>
</changeSet>
<changeSet id="03-01-2025_RK_191100" author="Rajesh Khore">
<addColumn tableName="application_evaluation">
<column name="ACTIVE_DAYS" type="INTEGER"></column>
</addColumn>
</changeSet>
<changeSet id="13-12-2024_1" author="Piyush Kag">
<createTable tableName="notification">
<column autoIncrement="true" name="id" type="INTEGER">
<constraints nullable="false" primaryKey="true"
primaryKeyName="pk_notification"/>
</column>
<column name="message" type="TEXT"/>
<column name="status" type="TEXT"/>
<column name="notification_type" type="TEXT"/>
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="user_id" type="INTEGER"/>
<column name="redirect_link" type="TEXT"/>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
</changeSet>
<changeSet id="13-12-2024_2" author="Piyush Kag">
<createTable tableName="notification_type">
<column autoIncrement="true" name="id" type="INTEGER">
<constraints nullable="false" primaryKey="true"
primaryKeyName="pk_notification_type"/>
</column>
<column name="notification_name" type="TEXT"/>
<column name="title" type="TEXT"/>
<column name="json_template" type="TEXT"/>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
</createTable>
</changeSet>
<changeSet id="13-12-2024_4" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/insert_json_template_for_notification_13_12_2024.sql"/>
</changeSet>
<changeSet id="23-12-2024_1" author="Piyush Kag">
<addColumn tableName="notification">
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
<constraints nullable="true" foreignKeyName="fk_USER_WITH_COMPANY_NOTIFICATION" references="user_with_company(id)"/>
</column>
</addColumn>
</changeSet>
<changeSet id="23-12-2024_2" author="Piyush Kag">
<addColumn tableName="notification">
<column name="title" type="TEXT"/>
</addColumn>
</changeSet>
<changeSet id="31-12-2024" author="Piyush Kag">
<sqlFile dbms="postgresql"
path="db/dump/update_json_template_for_notification_31_12_2024.sql"/>
</changeSet>
<changeSet id="03-01-2024_NK_125210" author="Nisha Kashyap">
<sql>
TRUNCATE TABLE FORM_FIELD RESTART IDENTITY;
</sql>
<sqlFile dbms="postgresql"
path="db/dump/update_form_field_data_03_01_2025.sql"/>
</changeSet>
<changeSet id="07-01-2025_NK_063910" author="Nisha Kashyap">
<createTable tableName="expiration_config">
<column autoIncrement="true" name="id" type="BIGINT">
<constraints nullable="false" primaryKey="true" primaryKeyName="expiration_config_pkey"/>
</column>
<column name="INTERVAL_DAYS" type="INTEGER"></column>
<column name="TYPE" type="VARCHAR(255)"></column>
<column name="is_deleted" type="BOOLEAN" defaultValueBoolean="false">
<constraints nullable="false"/>
</column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
</createTable>
</changeSet>
<changeSet id="07-01-2025_NK_064515" author="Nisha kashyap">
<sqlFile dbms="postgresql"
path="db/dump/update_json_template_for_notification_03_01_2025.sql"/>
</changeSet>
<changeSet id="07-01-2025_NK_064516" author="Nisha kashyap">
<sqlFile dbms="postgresql"
path="db/dump/insert_expiration_scheduler_data_07_01_2025.sql"/>
</changeSet>
<changeSet id="08-01-2025_NK_075410" author="Nisha kashyap">
<addColumn tableName="application">