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-10-09 13:27:14 +05:30
parent ec987d93dd 7c324eeed0
commit 5000b8a7b2
37 changed files with 832 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,8 +1,8 @@
spring.application.name=tendermanagement
# Multipart Configuration
spring.servlet.multipart.max-file-size=50MB
spring.servlet.multipart.max-request-size=50MB
spring.servlet.multipart.max-file-size=15MB
spring.servlet.multipart.max-request-size=15MB
spring.profiles.active=testing
@@ -31,6 +31,7 @@ aws.s3.region=eu-west-1
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
# 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

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

@@ -870,6 +870,46 @@
<sqlFile dbms="postgresql"
path="classpath:db/dump/updated_form_field_data_03-10-2024.sql" />
</changeSet>
<changeSet id="08-10-2024_1" author="Rajesh Khore">
<createTable tableName="user_company_delegation">
<column name="id" type="INTEGER" autoIncrement="true">
<constraints nullable="false" primaryKey="true"
primaryKeyName="user_company_delegation_pkey" />
</column>
<column name="USER_ID" type="INTEGER" />
<column name="COMPANY_ID" type="INTEGER" />
<column name="BENEFICIARY_ID" type="INTEGER" />
<column name="FILE_NAME" type="VARCHAR(255)" />
<column name="FILE_PATH" type="VARCHAR(255)" />
<column name="STATUS" type="VARCHAR(50)" />
<column name="created_date" type="TIMESTAMP WITHOUT TIME ZONE" />
<column name="updated_date" type="TIMESTAMP WITHOUT TIME ZONE" />
</createTable>
<!-- Optional: If you have any indexes, constraints, or foreign keys -->
<addForeignKeyConstraint
baseTableName="user_company_delegation" baseColumnNames="USER_ID"
referencedTableName="gepafin_user" referencedColumnNames="ID"
constraintName="fk_user_company_delegation_gepafin_user" />
<addForeignKeyConstraint
baseTableName="user_company_delegation" baseColumnNames="COMPANY_ID"
referencedTableName="company" referencedColumnNames="ID"
constraintName="fk_user_company_delegation_company" />
<addForeignKeyConstraint
baseTableName="user_company_delegation"
baseColumnNames="BENEFICIARY_ID" referencedTableName="beneficiary"
referencedColumnNames="ID"
constraintName="fk_user_company_delegation_beneficiary" />
</changeSet>
<changeSet id="08-10-2024_2" author="Rajesh Khore">
<addColumn tableName="user_with_company">
<column name="IS_LEGAL_REPRESENTANT" type="BOOLEAN" />
</addColumn>
</changeSet>
<changeSet id="03-10-2024_2" author="Nisha Kashyap">
<sql>
@@ -879,6 +919,23 @@
<sqlFile dbms="postgresql"
path="classpath:db/dump/updated_form_field_data_03-10-2024_1.sql" />
</changeSet>
<changeSet id="07-10-2024_1" author="Harish Bagora">
<addColumn tableName="beneficiary">
<column name="PRIVACY" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="TERMS" type="BOOLEAN" defaultValueBoolean="false"/>
<column name="MARKETING" type="BOOLEAN"/>
<column name="OFFERS" type="BOOLEAN"/>
<column name="THIRD_PARTY" type="BOOLEAN"/>
<column name="email_pec" type="VARCHAR(255)"/>
</addColumn>
<addNotNullConstraint tableName="beneficiary" columnName="PRIVACY" />
<addNotNullConstraint tableName="beneficiary" columnName="TERMS" />
<addColumn tableName="COMPANY">
<column name="contact_name" type="VARCHAR(255)"/>
<column name="contact_email" type="VARCHAR(255)"/>
</addColumn>
</changeSet>
<changeSet id="07-10-2024_2" author="Nisha Kashyap">
<modifyDataType
tableName="application_form_field"

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

@@ -206,9 +206,23 @@ vatnumber.already.exists=VatNumber already exists.
invalid.email=Invalid email.
company.id.mandatory=Company id is mandatory.
user.already.connected.to.company=The user is already connected to this company.
validation.error.missing.firstName=First name is required.
validation.error.missing.lastName=Last name is required.
validation.error.missing.codiceFiscale=Codice Fiscale is required.
delegation.file.upload.success=Delegation file uploaded successfully.
delegation.fetch.success=Delegation fetched successfully.
delegation.template.generation.error=Something went wrong while generating the delegation template.
validation.error.file.empty=The uploaded file is empty.
validation.error.file.invalidType=Only .p7m files are accepted.
upload.error.s3=Failed to upload the file to S3.
call.not.started.yet = The call has not started yet. Please wait until the specified start date and time.
call.already.ended = The call has already ended. You cannot submit the application after the deadline.
status.updated.successfully=Status updated successfully.
application.status.updated.successfully = Application status updated successfully.
application.already.in.provided.status=Application is already in provided status.
delegation.not.found=Delegation not found.
user.company.relation.not.found=User with the specified company relation not found.
delegation.delete.success=Delegation deleted successfully.

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

@@ -197,10 +197,27 @@ invalid.vatnumber=Numero di partita IVA non valido.
vatnumber.mandatory=Il numero di partita IVA <20> obbligatorio.
vatnumber.already.exists=Il numero di partita IVA esiste gi<67>.
invalid.email=Email non valida.
company.id.mandatory=L'ID dell'azienda <20> obbligatorio.
user.already.connected.to.company=L'utente <20> gi<67> collegato a questa azienda.
validation.error.missing.firstName=Il nome <20> obbligatorio.
validation.error.missing.lastName=Il cognome <20> obbligatorio.
validation.error.missing.codiceFiscale=Il Codice Fiscale <20> obbligatorio.
delegation.file.upload.success=File di delega caricato con successo.
delegation.fetch.success=Delega recuperata con successo.
delegation.template.generation.error=Si <20> verificato un errore durante la generazione del modello di delega.
validation.error.file.empty=Il file caricato <20> vuoto.
validation.error.file.invalidType=Sono accettati solo file .p7m.
upload.error.s3=Impossibile caricare il file su S3.
company.id.mandatory=L'ID dell'azienda <20> obbligatorio.
user.already.connected.to.company=L'utente <20> gi<67> collegato a questa azienda.
call.not.started.yet = La chiamata non <20> ancora iniziata. Attendere fino alla data e all'ora di inizio specificate.
call.already.ended = La chiamata <20> gi<67> terminata. Non <20> possibile inviare l'applicazione dopo la scadenza.
status.updated.successfully=Stato aggiornato con successo.
application.status.updated.successfully = Stato dell'applicazione aggiornato con successo.
application.already.in.provided.status=L'applicazione è già nello stato fornito.
application.already.in.provided.status=L'applicazione <EFBFBD> gi<EFBFBD> nello stato fornito.
delegation.not.found=Delega non trovata.
user.company.relation.not.found=Relazione utente con l'azienda specificata non trovata.
delegation.delete.success=Delega eliminata con successo.