Resolved conflicts

This commit is contained in:
harish
2024-10-12 21:33:14 +05:30
40 changed files with 1409 additions and 60 deletions

View File

@@ -6,12 +6,12 @@ spring.datasource.driver-class-name=org.postgresql.Driver
# JPA Configuration
spring.h2.console.enabled=true
base-url=http://bandi-api.gepafin.it
base-url=https://bandi-api.gepafin.it
isVatCheckGloballyDisabled = false
#fe.base.url=http://gepafin-production-fe.s3-website.eu-central-1.amazonaws.com
fe.base.url=http://bandi.gepafin.it
fe.base.url=https://bandi.gepafin.it
#SPID configuration
spid.ipd.base.url=https://login.regione.umbria.it
active.profile.folder=production
isMailSendingEnabled = true
isMailSendingEnabled = true

View File

@@ -32,6 +32,7 @@ aws.s3.bucket.name=mementoresources
aws.s3.url = https://mementoresources.s3.eu-west-1.amazonaws.com/
aws.s3.url.folder=gepafin
aws.s3.url.folder.delegation=gepafin/delegation
aws.s3.url.folder.signed.document=gepafin/signed-document
# JWT configuration
# Ensure these values match your expectations
security.authentication.jwt.secret=my-secret-token-to-change-in-prod-environment-your-super-secure-randomly-generated-key

View File

@@ -997,5 +997,29 @@
<sqlFile dbms="postgresql"
path="db/dump/insert_system_email_template_for_application_submission.sql" />
</changeSet>
<changeSet id="12-10-2024_1" author="Rajesh Khore">
<createTable tableName="application_signed_document">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints primaryKey="true" primaryKeyName="application_signed_document_pkey" nullable="false"/>
</column>
<column name="APPLICATION_ID" type="INTEGER">
<constraints nullable="false"/>
</column>
<column name="FILE_NAME" type="VARCHAR(255)"/>
<column name="FILE_PATH" type="VARCHAR(255)"/>
<column name="STATUS" type="VARCHAR(64)"/>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"/>
</createTable>
<addForeignKeyConstraint baseTableName="application_signed_document"
baseColumnNames="APPLICATION_ID"
referencedTableName="application"
referencedColumnNames="ID"
constraintName="fk_application_signed_document_application"/>
</changeSet>
</databaseChangeLog>

View File

@@ -226,5 +226,13 @@ user.company.relation.not.found=User with the specified company relation not fou
delegation.delete.success=Delegation deleted successfully.
user.not.authorized.create.application=User must be a legal representative or have delegation.
application.submitted.cannot.change=The submitted application cannot be changed.
# Call Document Messages
call.documents.fetch.success=Documents fetched successfully.
call.documents.not.found=No documents found for the specified call.
permission.denied=You are not authorized to access this data.
signed.document.file.upload.success=Signed document file uploaded successfully.
get.signed.document.file.success=Signed document file retrieved successfully.
application.signed.document.not.found=Signed document for the application not found.
delete.signed.document.file.success=Signed document deleted successfully.

View File

@@ -222,5 +222,13 @@ delegation.delete.success=Delega eliminata con successo.
user.not.authorized.create.application=L'utente deve essere un rappresentante legale o avere una delega.
application.submitted.cannot.change=La domanda inviata non può essere modificata.
# Call Document Messages
call.documents.fetch.success=Documenti recuperati con successo.
call.documents.not.found=Nessun documento trovato per la chiamata specificata.
permission.denied=Non sei autorizzato ad accedere a questi dati.
signed.document.file.upload.success=File del documento firmato caricato con successo.
get.signed.document.file.success=File del documento firmato recuperato con successo.
application.signed.document.not.found=Documento firmato per l'applicazione non trovato.
delete.signed.document.file.success=Documento firmato eliminato con successo.