Resolved conflicts

This commit is contained in:
rajesh
2025-01-02 15:45:37 +05:30
158 changed files with 5895 additions and 1053 deletions

View File

@@ -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>

View File

@@ -0,0 +1,10 @@
INSERT INTO notification_type (notification_name,title, json_template,created_date,updated_date,is_deleted) VALUES
('CALL_CREATED', 'Un Nuovo Bando È Stato Pubblicato','Un nuovo bando intitolato {{call_name}} è stato pubblicato. Controllalo e invia le candidature prima della scadenza.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('APPLICATION_SUBMISSION','Candidatura Inviata con Successo per la Valutazione', 'La richiesta per {{call_name}} ai sensi del protocollo n. {{protocol_number}} è stata presentata con successo. È ora in fase di valutazione.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('AMENDMENT_CREATION','È Stato Creato un Emendamento per la Richiesta', 'È stato creato un emendamento per la richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}}. Esamina le modifiche e procedi di conseguenza.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('EVALUATION_RESULT','Il Risultato della Valutazione per la Richiesta È Disponibile','Il risultato della valutazione per la richiesta ai sensi del protocollo n. {{protocol_number}} è ora disponibile.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('AMENDMENT_EXPIRED','L Emendamento per la Richiesta È Scaduto', 'Lemendamento per la richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}} è scaduto.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('AMENDMENT_CLOSED','L Emendamento È Stato Chiuso ed È Ora Inattivo','Lemendamento per {{call_name}} ai sensi del protocollo n. {{protocol_number}} è stato chiuso ed è ora inattivo.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('NDG_GENERATION','È Stato Generato un Nuovo NDG per la Richiesta','È stato generato un nuovo NDG per {{call_name}} ai sensi del protocollo n. {{protocol_number}}.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('EVALUATION_CREATION','La Richiesta È Stata Assegnata per la Valutazione','La richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}} è stata assegnata alla fase di valutazione.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false'),
('EVALUATION_EXPIRED','La Valutazione per la Richiesta È Scaduta','La valutazione per la richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}} è scaduta.','2024-12-19T10:16:26.472Z','2024-12-19T10:16:26.472Z','false');

View File

@@ -0,0 +1,62 @@
UPDATE notification_type
SET
title = 'Un Nuovo Bando È Stato Pubblicato',
json_template = 'Un nuovo bando intitolato {{call_name}} è stato pubblicato. Controllalo e invia le candidature prima della scadenza.'
WHERE
notification_name = 'CALL_CREATED';
UPDATE notification_type
SET
title = 'Richiesta Finanziamento Inviata con Successo per la Valutazione',
json_template = 'La richiesta per {{call_name}} ai sensi del protocollo n. {{protocol_number}} è stata presentata con successo. È ora in fase di valutazione.'
WHERE
notification_name = 'APPLICATION_SUBMISSION';
UPDATE notification_type
SET
title = 'È Stato Creato un Soccorso Istruttorio per la Richiesta',
json_template = 'È stato creato un soccorso istruttorio per la richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}}. Esamina le richieste e procedi di conseguenza.'
WHERE
notification_name = 'AMENDMENT_CREATION';
UPDATE notification_type
SET
title = 'Il Risultato della Valutazione per la Richiesta È Disponibile',
json_template = 'Il risultato della valutazione per la richiesta ai sensi del protocollo n. {{protocol_number}} è ora disponibile.'
WHERE
notification_name = 'EVALUATION_RESULT';
UPDATE notification_type
SET
title = 'Soccorso Scaduto',
json_template = 'Il soccorso istruttorio per la richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}} è scaduto.'
WHERE
notification_name = 'AMENDMENT_EXPIRED';
UPDATE notification_type
SET
title = 'Scorso Chiuso ed È Ora Inattivo',
json_template = 'Il soccorso istruttorio per {{call_name}} ai sensi del protocollo n. {{protocol_number}} è stato chiuso ed è ora inattivo.'
WHERE
notification_name = 'AMENDMENT_CLOSED';
UPDATE notification_type
SET
title = 'NDG creato per la Richiesta',
json_template = 'È stato generato un nuovo NDG per {{call_name}} ai sensi del protocollo n. {{protocol_number}}.'
WHERE
notification_name = 'NDG_GENERATION';
UPDATE notification_type
SET
title = 'La domanda è stata assegnata per la Valutazione',
json_template = 'La richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}} è stata assegnata alla fase di valutazione.'
WHERE
notification_name = 'EVALUATION_CREATION';
UPDATE notification_type
SET
title = 'La Valutazione per la Richiesta È Scaduta',
json_template = 'La valutazione per la richiesta in {{call_name}} ai sensi del protocollo n. {{protocol_number}} è scaduta.'
WHERE
notification_name = 'EVALUATION_EXPIRED';

View File

@@ -0,0 +1,26 @@
UPDATE gepafin_schema.system_email_template
SET html_content = '<html>
<body style="font-family: Arial, sans-serif; color: #000; line-height: 1.6;">
<div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
<p><strong>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>
<p>Buongiorno,</p>
<p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Fondo prestiti
<strong>{{call_name}}</strong> di cui al <strong>Protocollo n. {{protocol_number}} del
{{protocol_date}} e {{protocol_time}}</strong>, alla luce dell''attività istruttoria svolta,
segnaliamo quanto segue:</p>
<ul>
<li>{{form_dataInput}}</li>
</ul>
<p>{{note}}</p>
<p>Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione sia caricandola all''interno dello sportello
online <a href="{{platform_link}}">{{platform_link}}</a> che inviandola a mezzo PEC all''indirizzo
{{legal_mail}} entro e <strong>non oltre 10 giorni</strong> dal ricevimento della presente comunicazione,
precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.</p>
<p>Vi informiamo che per la ricezione della PEC farà fede la ricevuta di avvenuta consegna che attesterà il buon esito
dell''invio. La documentazione trasmessa e le informazioni fornite saranno processate dall''istruttore assegnatario della pratica.</p>
<p>Distinti Saluti,</p>
<p><strong>{{email_signature}}</strong></p>
</div>
</body>
</html>'
WHERE "type" = 'DOCUMENTATION_INTEGRATION_REQUEST' AND "system" = true;

View File

@@ -0,0 +1,26 @@
UPDATE gepafin_schema.system_email_template
SET html_content = '<html>
<body style="font-family: Arial, sans-serif; color: #000; line-height: 1.6;">
<div style="padding: 20px; border: 1px solid #ddd; border-radius: 8px; max-width: 600px; margin: auto;">
<p><strong>RICHIESTA INTEGRAZIONE DOCUMENTALE</strong></p>
<p>Buongiorno,</p>
<p>In riferimento alla domanda di concessione di Finanziamento agevolato a valere sul Fondo prestiti
<strong>{{call_name}}</strong> di cui al <strong>Protocollo n. {{protocol_number}} del
{{protocol_date}} e {{protocol_time}}</strong>, alla luce dell''attività istruttoria svolta,
segnaliamo quanto segue:</p>
<ul>
<li>{{form_dataInput}}</li>
</ul>
<p>{{note}}</p>
<p>Vi invitiamo a fornire quanto sopra richiesto integrando la documentazione sia caricandola all''interno dello sportello
online <a href="{{platform_link}}">{{platform_link}}</a> che inviandola a mezzo PEC all''indirizzo
bandi.gepafin@legalmail.it entro e <strong>non oltre {{response_days}} giorni</strong> dal ricevimento della presente comunicazione,
precisando che, in caso di mancata ricezione nei termini indicati, saremo costretti a non prendere in considerazione la Vostra richiesta di finanziamento.</p>
<p>Vi informiamo che per la ricezione della PEC farà fede la ricevuta di avvenuta consegna che attesterà il buon esito
dell''invio. La documentazione trasmessa e le informazioni fornite saranno processate dall''istruttore assegnatario della pratica.</p>
<p>Distinti Saluti,</p>
<p><strong>{{email_signature}}</strong></p>
</div>
</body>
</html>'
WHERE "type" = 'DOCUMENTATION_INTEGRATION_REQUEST' AND "system" = true;