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

resolved conflict

Browse Source
This commit is contained in:
nisha
2024-10-09 13:27:14 +05:30
parent ec987d93dd 7c324eeed0
commit 5000b8a7b2
37 changed files with 832 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -870,6 +870,46 @@
<sqlFile dbms="postgresql"
path="classpath:db/dump/updated_form_field_data_03-10-2024.sql" />
</changeSet>
<changeSet id="08-10-2024_1" author="Rajesh Khore">
<createTable tableName="user_company_delegation">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true"
primaryKeyName="user_company_delegation_pkey" />
</column>
<column name="USER_ID" type="INTEGER" />
<column name="COMPANY_ID" type="INTEGER" />
<column name="BENEFICIARY_ID" type="INTEGER" />
<column name="FILE_NAME" type="VARCHAR(255)" />
<column name="FILE_PATH" type="VARCHAR(255)" />
<column name="STATUS" type="VARCHAR(50)" />
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE" />
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE" />
</createTable>
<!-- Optional: If you have any indexes, constraints, or foreign keys -->
<addForeignKeyConstraint
baseTableName="user_company_delegation" baseColumnNames="USER_ID"
referencedTableName="gepafin_user" referencedColumnNames="ID"
constraintName="fk_user_company_delegation_gepafin_user" />
<addForeignKeyConstraint
baseTableName="user_company_delegation" baseColumnNames="COMPANY_ID"
referencedTableName="company" referencedColumnNames="ID"
constraintName="fk_user_company_delegation_company" />
<addForeignKeyConstraint
baseTableName="user_company_delegation"
baseColumnNames="BENEFICIARY_ID" referencedTableName="beneficiary"
referencedColumnNames="ID"
constraintName="fk_user_company_delegation_beneficiary" />
</changeSet>
<changeSet id="08-10-2024_2" author="Rajesh Khore">
<addColumn tableName="user_with_company">
<column name="IS_LEGAL_REPRESENTANT" type="BOOLEAN" />
</addColumn>
</changeSet>
<changeSet id="03-10-2024_2" author="Nisha Kashyap">
<sql>
@@ -879,6 +919,23 @@
<sqlFile dbms="postgresql"
path="classpath:db/dump/updated_form_field_data_03-10-2024_1.sql" />
</changeSet>
<changeSet id="07-10-2024_1" author="Harish Bagora">
<addColumn tableName="beneficiary">
<column name="PRIVACY" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="TERMS" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="MARKETING" type="BOOLEAN"/>
<column name="OFFERS" type="BOOLEAN"/>
<column name="THIRD_PARTY" type="BOOLEAN"/>
<column name="email_pec" type="VARCHAR(255)"/>
</addColumn>
<addNotNullConstraint tableName="beneficiary" columnName="PRIVACY" />
<addNotNullConstraint tableName="beneficiary" columnName="TERMS" />
<addColumn tableName="COMPANY">
<column name="contact_name" type="VARCHAR(255)"/>
<column name="contact_email" type="VARCHAR(255)"/>
</addColumn>
</changeSet>
<changeSet id="07-10-2024_2" author="Nisha Kashyap">
<modifyDataType
tableName="application_form_field"