Resolved Conflicts.

2024-10-25 15:49:28 +05:30
parent d20b9abc07 03e487500a
commit d541492e81
63 changed files with 818 additions and 544 deletions
--- a/src/main/resources/application-dev.properties
+++ b/src/main/resources/application-dev.properties
@@ -8,7 +8,10 @@ spring.datasource.driver-class-name=org.postgresql.Driver
 spring.h2.console.enabled=true

 isVatCheckGloballyDisabled = false
+
 isMailSendingEnabled = true
 default_System_Receiver_Email=antonio.manca@bflows.net
 gepafin_email=rinaldo.bonazzo@bflows.net
-rinaldo_email=rinaldo.bonazzo@bflows.net
+rinaldo_email=rinaldo.bonazzo@bflows.net
+carlo_email=test@test.test
+default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
--- a/src/main/resources/application-local.properties
+++ b/src/main/resources/application-local.properties
@@ -6,4 +6,11 @@ spring.datasource.driver-class-name=org.postgresql.Driver

 # JPA Configuration
 spring.jpa.show-sql=true
-base-url=http://localhost:8080
+base-url=http://localhost:8080
+
+isMailSendingEnabled = false
+default_System_Receiver_Email=test@test.test
+gepafin_email=test@test.test
+rinaldo_email=test@test.test
+carlo_email=test@test.test
+default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
--- a/src/main/resources/application-production.properties
+++ b/src/main/resources/application-production.properties
@@ -14,8 +14,10 @@ fe.base.url=https://bandi.gepafin.it
 #SPID configuration
 spid.ipd.base.url=https://login.regione.umbria.it
 active.profile.folder=production
+
 isMailSendingEnabled = true
 default_System_Receiver_Email=antonio.manca@bflows.net
 gepafin_email=bandi@pec.gepafin.it
 rinaldo_email=rinaldo.bonazzo@bflows.net
 carlo_email=carlo.mancosu@bflows.net
+default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
--- a/src/main/resources/application-testing.properties
+++ b/src/main/resources/application-testing.properties
@@ -5,4 +5,10 @@ spring.datasource.password=sa

 # JPA Configuration
 spring.h2.console.enabled=true
-base-url=http://localhost:8080
+base-url=http://localhost:8080
+isMailSendingEnabled = false
+default_System_Receiver_Email=test@test.test
+gepafin_email=test@test.test
+rinaldo_email=test@test.test
+carlo_email=test@test.test
+default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
--- a/src/main/resources/application.properties
+++ b/src/main/resources/application.properties
@@ -1,8 +1,8 @@
 spring.application.name=tendermanagement

 # Multipart Configuration
-spring.servlet.multipart.max-file-size=15MB
-spring.servlet.multipart.max-request-size=15MB
+spring.servlet.multipart.max-file-size=300MB
+spring.servlet.multipart.max-request-size=300MB

 spring.profiles.active=testing

@@ -59,10 +59,4 @@ mailGun_base_url=https://api.eu.mailgun.net/
 # SendinBlue API key
 apiKey=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
 #senderEmail=mailer@bflows.net
-isMailSendingEnabled = false
-default_System_Receiver_Email=antonio.manca@bflows.net
-gepafin_email=rinaldo.bonazzo@bflows.net
-rinaldo_email=rinaldo.bonazzo@bflows.net
-carlo_email=rinaldo.bonazzo@bflows.net
-default.hub.uuid=p4lk3bcx1RStqTaIVVbXs

--- a/src/main/resources/db/changelog/db.changelog-1.0.0.xml
+++ b/src/main/resources/db/changelog/db.changelog-1.0.0.xml
@@ -1336,13 +1336,78 @@
    </changeSet>

    <changeSet id="19-10-2024_2" author="Harish Bagora">
-        <modifyDataType tableName="protocol" columnName="HUB_ID" newDataType="INTEGER"/>
+	    <modifyDataType tableName="protocol" columnName="HUB_ID" newDataType="INTEGER"/>
+	
+	    <addForeignKeyConstraint baseTableName="protocol"
+                             baseColumnNames="HUB_ID"
+                             constraintName="fk_protocol_hub"
+                             referencedTableName="hub"
+                             referencedColumnNames="id"/>
+	</changeSet>
+    
+    
+    <changeSet id="24-10-2024_1" author="Rajesh Khore">
+        <dropUniqueConstraint 
+            constraintName="company_vat_number_key"
+            tableName="company"/>

-        <addForeignKeyConstraint baseTableName="protocol"
-                                 baseColumnNames="HUB_ID"
-                                 constraintName="fk_protocol_hub"
-                                 referencedTableName="hub"
-                                 referencedColumnNames="id"/>
+        <addColumn tableName="company">
+            <column name="hub_id" type="INTEGER" defaultValue="1">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addUniqueConstraint 
+            columnNames="VAT_NUMBER, hub_id" 
+            tableName="company" 
+            constraintName="uk_vat_hub" />
+        
+        <addForeignKeyConstraint 
+            baseTableName="company" 
+            baseColumnNames="hub_id"
+            referencedTableName="hub" 
+            referencedColumnNames="id" 
+            constraintName="fk_company_hub" />
+            
+    </changeSet>
+
+    <changeSet id="24-10-2024_2" author="Rajesh Khore">
+        <dropUniqueConstraint 
+            constraintName="beneficiary_codice_fiscale_key" 
+            tableName="beneficiary"/>
+
+        <addColumn tableName="beneficiary">
+            <column name="hub_id" type="INTEGER" defaultValue="1">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addUniqueConstraint 
+            columnNames="CODICE_FISCALE, hub_id" 
+            tableName="beneficiary" 
+            constraintName="uk_codice_hub" />
+            
+        <addForeignKeyConstraint 
+            baseTableName="beneficiary" 
+            baseColumnNames="hub_id"
+            referencedTableName="hub" 
+            referencedColumnNames="id" 
+            constraintName="fk_beneficiary_hub" />    
+    </changeSet>
+
+    <changeSet id="24-10-2024_3" author="Rajesh Khore">
+        <addColumn tableName="application">
+            <column name="hub_id" type="INTEGER" defaultValue="1">
+                <constraints nullable="false"/>
+            </column>
+        </addColumn>
+
+        <addForeignKeyConstraint 
+            baseTableName="application" 
+            baseColumnNames="hub_id"
+            referencedTableName="hub" 
+            referencedColumnNames="id" 
+            constraintName="fk_application_hub" />
    </changeSet>

    <changeSet id="25-10-2024_1" author="Piyush">
@@ -1418,4 +1483,6 @@
        </insert>
    </changeSet>

+    
+    
 </databaseChangeLog>
--- a/src/main/resources/db/changelog/dynamic-triggers.xml
+++ b/src/main/resources/db/changelog/dynamic-triggers.xml
@@ -20,7 +20,7 @@
            )
            LOOP
            EXECUTE format(
-            'CREATE OR REPLACE TRIGGER tg_gepafin_schema_updated_at_%I
+            'CREATE OR REPLACE TRIGGER tg_gepafin_schema_updated_date_%I
            BEFORE UPDATE ON gepafin_schema.%I
            FOR EACH ROW
            EXECUTE FUNCTION gepafin_schema.clock_timestamp_updated_date_column()',
@@ -37,7 +37,7 @@
            )
            LOOP
            EXECUTE format(
-            'CREATE OR REPLACE TRIGGER tg_gepafin_schema_created_at_%I
+            'CREATE OR REPLACE TRIGGER tg_gepafin_schema_created_date_%I
            BEFORE INSERT ON gepafin_schema.%I
            FOR EACH ROW
            EXECUTE FUNCTION gepafin_schema.clock_timestamp_created_date_column()',
--- a/src/main/resources/message_en.properties
+++ b/src/main/resources/message_en.properties
@@ -264,6 +264,8 @@ hub_get_all_success=Hubs retrieved successfully
 hub_delete_success=Hub deleted successfully
 hub_not_found=Hub not found

+application.not.in.draft.status=Application is not in DRAFT status.
+


 application.assigned.success.msg = Application assigned successfully.
@@ -273,4 +275,4 @@ assigned.application.deleted.success=Assigned Application successfully deleted.
 assigned.application.get.success=Assigned Application details fetched successfully.
 assigned.application.update.successfully=Assigned Application updated successfully.
 get.error.s3=Failed to fetch the file from S3.
-
+invalid.application.status = Invalid Application status.
--- a/src/main/resources/message_it.properties
+++ b/src/main/resources/message_it.properties
@@ -259,6 +259,7 @@ aasigned.application.not.found = Applicazione assegnata non trovata con l'ID spe
 assigned.application.deleted.success =Applicazione assegnata eliminata con successo.
 assigned.application.get.success =Dettagli dell'applicazione assegnata recuperati correttamente.
 assigned.application.update.successfully = Applicazione assegnata aggiornata correttamente.
+invalid.application.status = Stato della domanda non valido.

 # Hub Messages
 hub_create_success=Hub creato con successo
@@ -267,4 +268,6 @@ hub_get_success=Hub recuperato con successo
 hub_get_all_success=Hub recuperati con successo
 hub_delete_success=Hub eliminato con successo
 hub_not_found=Hub non trovato
+
+application.not.in.draft.status=La domanda non <20> in stato DRAFT.
 get.error.s3=Impossibile recuperare il file da S3.