Resolve Conflict

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

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

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

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

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
 

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()',

src/main/resources/message_en.properties

@@ -253,7 +253,15 @@ get_login_attempt_se_msg=Login attempts fetched successfully.
 application.in.submit.status.cannot.delete.company=The company cannot be deleted because there are active applications in the SUBMITTED status.
 get.users.success.msg = Successfully fetched users.
 cannot.create.beneficiary.user = Creation of a Beneficiary user is not allowed. Please assign the appropriate role.
+application.evaluation.not.found=Application Evaluation not found with ID: {0}
+evaluation.created.successfully = Application evaluation created successfully.
+evaluation.updated.successfully = Application evaluation updated successfully.
+evaluation.fetched.successfully = Application evaluation fetched successfully.
+evaluation.deleted.successfully = Application evaluation deleted successfully.
+evaluations.fetched.successfully = All application evaluations fetched successfully.
+application.evaluation.status.updated.successfully=Application evaluation status updated successfully.
 evaluationCriteria.invalid=This evaluation criterion does not belong to the current call.
+assigned.application.not.found.with.id=Assigned application with this application ID not found
 
 
 # Hub Messages

src/main/resources/message_it.properties

@@ -252,6 +252,14 @@ get.users.success.msg = Utenti recuperati con successo
 cannot.create.beneficiary.user = La creazione di un utente beneficiario non <20> consentita. Si prega di assegnare il ruolo appropriato.
 evaluationCriteria.invalid=Questo criterio di valutazione non appartiene alla chiamata corrente.
 
+application.evaluation.not.found=Valutazione dell'applicazione non trovata con ID: {0}
+evaluation.created.successfully = Valutazione dell'applicazione creata con successo.
+evaluation.updated.successfully = Valutazione dell'applicazione aggiornata con successo.
+evaluation.fetched.successfully = Valutazione dell'applicazione recuperata con successo.
+evaluation.deleted.successfully = Valutazione dell'applicazione eliminata con successo.
+evaluations.fetched.successfully = Tutte le valutazioni delle applicazioni recuperate con successo.
+application.evaluation.status.updated.successfully=Stato della valutazione dell'applicazione aggiornato con successo.
+assigned.application.not.found.with.id=Applicazione assegnata con questo ID dell'applicazione non trovata
 
 application.assigned.success.msg =Domanda assegnata con successo
 application.already.assigned.msg =La domanda <20> gi<67> assegnata