Resolved conflicts
This commit is contained in:
rajesh
@@ -1787,6 +1787,22 @@
|
||||
</dropColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="25-11-2024_1" author="Nisha Kashyap">
|
||||
<addColumn tableName="application_evaluation">
|
||||
<column name="initial_days" type="INTEGER"></column>
|
||||
<column name="remaining_days" type="INTEGER"></column>
|
||||
<column name="suspended_days" type="INTEGER"></column>
|
||||
<column name="start_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||
<column name="end_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||
<column name="stop_date_time" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="25-11-2024_2" author="Nisha kashyap">
|
||||
<addColumn tableName="application_amendment_request">
|
||||
<column name="end_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="20-11-2024_1" author="Piyush">
|
||||
<createTable tableName="user_action">
|
||||
<column autoIncrement="true" name="id" type="INTEGER">
|
||||
@@ -1858,6 +1874,76 @@
|
||||
<addColumn tableName="application_evaluation">
|
||||
<column name="MOTIVATION" type="TEXT"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="26-11-2024_1" author="Rajesh Khore">
|
||||
<addColumn tableName="APPLICATION">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_APPLICATION" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
<dropForeignKeyConstraint baseTableName="APPLICATION" constraintName="fk_COMPANY_APPLICATION"/>
|
||||
<addColumn tableName="faq">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_faq" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
<addColumn tableName="beneficiary_preferred_call">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_beneficiary_preferred_call" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
<addColumn tableName="user_company_delegation">
|
||||
<column name="USER_WITH_COMPANY_ID" type="INTEGER">
|
||||
<constraints foreignKeyName="fk_USER_WITH_COMPANY_user_company_delegation" references="user_with_company(id)"/>
|
||||
</column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="28-10-2024_1" author="Nisha Kashyap">
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="DELETED_CALL"/>
|
||||
<column name="path" value="call/{call_id}/deleted"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="updated_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="DELETED_APPLICATION"/>
|
||||
<column name="path" value="call/{call_id}/application/{application_id}/deleted"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="updated_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="DELETED_USER_DELEGATION"/>
|
||||
<column name="path" value="user_delegation/deleted"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="updated_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="AMENDMENT"/>
|
||||
<column name="path" value="call/{call_id}/application/{application_id}/amendment/{amendment_id}"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="updated_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="DELETED_AMENDMENT"/>
|
||||
<column name="path" value="call/{call_id}/application/{application_id}/amendment/{amendment_id}/deleted"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="updated_date" value="2024-10-25 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="22-11-2024_2" author="Piyush">
|
||||
@@ -1886,4 +1972,183 @@
|
||||
<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"/>
|
||||
</changeSet>
|
||||
|
||||
<changeSet id="04-12-2024_1" author="Nisha Kashyap">
|
||||
<sqlFile dbms="postgresql"
|
||||
path="db/dump/update_system_email_template_for_updating_amendment_mail_notification_mail_04_12_2024_1.sql"/>
|
||||
</changeSet>
|
||||
<!-- <changeSet id="19-12-2024_1" 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"/>
|
||||
<column name="appointment_auth_token_id" type="TEXT"/>
|
||||
<column name="area_code" type="TEXT"/>
|
||||
</addColumn>
|
||||
<addColumn tableName="company">
|
||||
<column name="ndg" type="TEXT"/>
|
||||
</addColumn>
|
||||
<addColumn tableName="application">
|
||||
<column name="ndg" type="TEXT"/>
|
||||
<column name="id_visura" type="TEXT"/>
|
||||
<column name="ndg_status" type="TEXT"/>
|
||||
<column name="appointment_id" type="TEXT"/>
|
||||
</addColumn>
|
||||
<addColumn tableName="document">
|
||||
<column name="document_attachment_id" type="TEXT"/>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="12-12-2024_2" author="Rajesh Khore">
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="EVALUATION"/>
|
||||
<column name="path" value="call/{call_id}/application/{application_id}/evaluation"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-12-10 03:00:00"/>
|
||||
<column name="updated_date" value="2024-12-10 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
|
||||
<insert tableName="s3_path_configuration">
|
||||
<column name="type" value="DELETED_EVALUATION"/>
|
||||
<column name="path" value="call/{call_id}/application/{application_id}/evaluation/deleted"/>
|
||||
<column name="bucket_name" value="mementoresources"/>
|
||||
<column name="created_date" value="2024-12-10 03:00:00"/>
|
||||
<column name="updated_date" value="2024-12-10 03:00:00"/>
|
||||
<column name="parent_folder" value="gepafin/local"/>
|
||||
</insert>
|
||||
|
||||
<addColumn tableName="application_evaluation">
|
||||
<column name="EVALUATION_DOCUMENT" type="TEXT"/>
|
||||
</addColumn>
|
||||
|
||||
<addColumn tableName="document">
|
||||
<column name="uploaded_by" type="INTEGER">
|
||||
<!-- <constraints nullable="false"/>-->
|
||||
</column>
|
||||
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
<changeSet id="12_12_2024_1" author="Nisha Kashyap">
|
||||
<addColumn tableName="protocol">
|
||||
<column name="type" type="VARCHAR(255)"></column>
|
||||
</addColumn>
|
||||
<addColumn tableName="application_amendment_request">
|
||||
<column name="amendment_document" type="TEXT"></column>
|
||||
</addColumn>
|
||||
</changeSet>
|
||||
|
||||
<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"/>
|
||||
<column name="role_type" value="ROLE_INSTRUCTOR_MANAGER"/>
|
||||
<column name="description"
|
||||
value="They will manage the instructor"/>
|
||||
<column name="created_date" value="2024-12-19 15:30:00"/>
|
||||
<column name="updated_date" value="2024-12-19 15:30:00"/>
|
||||
<column name="permissions" value="EVALUATE_APPLICATIONS,MANAGE_PRELIMINARY_RELIEF,ASSIGED_APPLICATION"/>
|
||||
<column name="region_id" valueComputed="1"/>
|
||||
</insert>
|
||||
|
||||
|
||||
</changeSet>
|
||||
<changeSet id="19-12-2024_2" author="Nisha kashyap">
|
||||
<insert tableName="gepafin_user">
|
||||
<column name="password" value="$2a$10$doUyOcEm8WPuFfpFT5y18.1DvZzF7exbqgy9X0P27cUBK7YWbfzzS"/>
|
||||
<column name="email" value="instructorManager@test.test"/>
|
||||
<column name="first_name" value="instructor"/>
|
||||
<column name="last_name" value="Manager"/>
|
||||
<column name="phone_number" value="98768526440"/>
|
||||
<column name="role_id" valueComputed="5"/>
|
||||
<column name="status" value="ACTIVE"/>
|
||||
<column name="last_login" value="2024-12-19 00:00:00"/>
|
||||
<column name="created_date" value="2024-12-19 00:00:00"/>
|
||||
<column name="updated_date" value="2024-12-19 00:00:00"/>
|
||||
<column name="organization" value="InstructorManagerOrg"/>
|
||||
<column name="address" value="789 Victory Road"/>
|
||||
<column name="city" value="Naples"/>
|
||||
<column name="country" value="Italy"/>
|
||||
<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="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>
|
||||
|
||||
</databaseChangeLog>
|
||||
|
||||
Reference in New Issue
Block a user