BFLOWS/bflows-bandi-be
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

resolved conflict

Browse Source
This commit is contained in:
nisha
2024-09-25 21:43:36 +05:30
parent 39b0ba994c c89adce850
commit f429ac118d
24 changed files with 412 additions and 150 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/resources/application.properties
View File

@@ -42,4 +42,5 @@ spring.main.allow-circular-references=true
isVatCheckGloballyDisabled = true
vatCheckNewToken: 66026bd891a51044e90e08c4
fe.base.url=http://gepafin-staging-fe.s3-website.eu-central-1.amazonaws.com

37
src/main/resources/db/changelog/db.changelog-1.0.0.xml
View File

@@ -712,27 +712,12 @@
</changeSet>
<changeSet id="23-09-2024_1" author="Rajesh Khore">
<createTable tableName="saml_response_log">
<column name="id" type="INTEGER" autoIncrement="true">
</column>
<column name="request" type="TEXT">
</column>
<column name="response" type="TEXT">
</column>
<column name="authentication_object" type="TEXT">
</column>
<column name="exception_object" type="TEXT">
</column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE">
</column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE">
</column>
<createTable tableName="saml_response">
<column name="id" type="INTEGER" autoIncrement="true"></column>
<column name="authentication_object" type="TEXT"> </column>
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
<column name="token" type="varchar(255)"></column>
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE"></column>
</createTable>
</changeSet>
@@ -742,4 +727,14 @@
<where>id = 13</where>
</update>
</changeSet>
<changeSet id="25-09-2024_1" author="Rajesh Khore">
<addColumn tableName="gepafin_user">
<column name="codice_fiscale" type="varchar(255)">
<constraints nullable="true" unique="true"/>
</column>
</addColumn>
<dropNotNullConstraint tableName="gepafin_user" columnName="password"/>
</changeSet>
</databaseChangeLog>

6
src/main/resources/message_en.properties
View File

@@ -8,6 +8,7 @@ delete_user_error_msg=An error occurred while deleting the user.
get_user_success_msg=User retrieved successfully.
get_user_error_msg=An error occurred while retrieving the user.
user.not.active=User is not active. Please contact support.
user.already.exist.msg=User already exist for this codice fiscale.
# Role-related messages
role.created.success=Role created successfully.
role.updated.success=Role updated successfully.
@@ -184,6 +185,9 @@ valid.vat.number=The VAT number is not valid for field {0}.
failed.retain.field=Failed to retain specific fields.
application.is.incomplete = The application is incomplete.
token.validate.success=Token validated successfully.
invalid.request=Invalid Request.
codice.fiscale.exists=This codice fiscale is already associated with another user.
total.steps.not.zero=Total steps cannot be zero.
completed.steps.not.valid=Completed steps should be between 0 and total steps.
field.id.not.found=Field ID {0} does not exist in the form structure.
field.id.not.found=Field ID {0} does not exist in the form structure.

6
src/main/resources/message_it.properties
View File

@@ -8,6 +8,7 @@ delete_user_error_msg=Si <20> verificato un errore durante l'eliminazione dell'ut
get_user_success_msg=Utente recuperato con successo.
get_user_error_msg=Si <20> verificato un errore durante il recupero dell'utente.
user.not.active=Utente non attivo. Si prega di contattare il supporto.
user.already.exist.msg=L'utente esiste gi<67> per questo codice fiscale.
# Role-related messages
role.created.success=Ruolo creato con successo.
role.updated.success=Ruolo aggiornato con successo.
@@ -176,7 +177,10 @@ validation.marca.da.bollo=Il campo {0} deve essere una Marca Da Bollo valida con
validation.piva=Il numero di partita IVA per {0} deve essere lungo fino a 11 cifre.
valid.vat.number=Il numero di partita IVA non <20> valido per il campo {0}.
failed.retain.field=Impossibile conservare campi specifici.
token.validate.success=Token convalidato con successo.
invalid.request=Richiesta non valida.
codice.fiscale.exists=Questo codice fiscale <20> gi<67> associato ad un altro utente.
total.steps.not.zero=Il totale dei passaggi non può essere zero.
total.steps.not.zero=Il totale dei passaggi non pu<EFBFBD> essere zero.
completed.steps.not.valid=I passaggi completati devono essere compresi tra 0 e il totale dei passaggi.
field.id.not.found=L'ID campo {0} non esiste nella struttura del modulo.