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

Resolve Conflicts

Browse Source
This commit is contained in:
nisha
2024-12-20 16:49:22 +05:30
parent 5c7f96574b ec9a1c8bf3
commit 832666a4d4
82 changed files with 2778 additions and 219 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/application-dev.properties
View File

@@ -15,3 +15,11 @@ gepafin_email=rinaldo.bonazzo@bflows.net
rinaldo_email=rinaldo.bonazzo@bflows.net
carlo_email=test@test.test
default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
#Login to Odessa, Appointment Creation, Upload document Configuration
appointment.base.url=https://demo.galileonetwork.it/gateway/rest
appointment.portal.user=UtenzaAPIPortal@621
appointment.portal.password=u13nzaAP1P0rtal
appointment.portal.source=GEPAFINPORTAL
appointment.portal.context=GEPAFINPORTAL
flagDaFirmare=false

9
src/main/resources/application-local.properties
View File

@@ -13,4 +13,11 @@ 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
default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
appointment.base.url=https://demo.galileonetwork.it/gateway/rest
appointment.portal.user=UtenzaAPIPortal@621
appointment.portal.password=u13nzaAP1P0rtal
appointment.portal.source=GEPAFINPORTAL
appointment.portal.context=GEPAFINPORTAL
flagDaFirmare=false

8
src/main/resources/application-production.properties
View File

@@ -22,3 +22,11 @@ rinaldo_email=rinaldo.bonazzo@bflows.net
carlo_email=carlo.mancosu@bflows.net
default.hub.uuid=p4lk3bcx1RStqTaIVVbXs
# TEST DEPLOY Configuration
#Login to Odessa, Appointment Creation, Upload document Configuration
appointment.base.url=https://demo.galileonetwork.it/gateway/rest
appointment.portal.user=UtenzaAPIPortal@621
appointment.portal.password=u13nzaAP1P0rtal
appointment.portal.source=GEPAFINPORTAL
appointment.portal.context=GEPAFINPORTAL
flagDaFirmare=false

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

@@ -65,3 +65,6 @@ default.email.signature=Gepafin S.p.a
default.hub.pdf.banner=https://mementoresources.s3.amazonaws.com/gepafin/staging/template/gepafin-logo.jpg
#feign client config
spring.cloud.openfeign.client.config.default.connectTimeout=300000
spring.cloud.openfeign.client.config.default.readTimeout=300000

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

@@ -1983,4 +1983,98 @@
<dropColumn tableName="COMPANY" columnName="PEC"/>
<dropColumn tableName="COMPANY" columnName="EMAIL"/>
</changeSet>
<changeSet id="04-12-2024_3" author="Piyush">
<addColumn tableName="hub">
<column name="auth_token" type="TEXT"/>
<column name="appointment_auth_token_id" type="TEXT"/>
<column name="area_code" type="TEXT"/>
</addColumn>
<addColumn tableName="company">
<column name="ndg" type="TEXT"/>
</addColumn>
<addColumn tableName="application">
<column name="ndg" type="TEXT"/>
<column name="id_visura" type="TEXT"/>
<column name="ndg_status" type="TEXT"/>
<column name="appointment_id" type="TEXT"/>
</addColumn>
<addColumn tableName="document">
<column name="document_attachment_id" type="TEXT"/>
</addColumn>
</changeSet>
<changeSet id="12-12-2024_2" author="Rajesh Khore">
<insert tableName="s3_path_configuration">
<column name="type" value="EVALUATION"/>
<column name="path" value="call/{call_id}/application/{application_id}/evaluation"/>
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-12-10 03:00:00"/>
<column name="updated_date" value="2024-12-10 03:00:00"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
<insert tableName="s3_path_configuration">
<column name="type" value="DELETED_EVALUATION"/>
<column name="path" value="call/{call_id}/application/{application_id}/evaluation/deleted"/>
<column name="bucket_name" value="mementoresources"/>
<column name="created_date" value="2024-12-10 03:00:00"/>
<column name="updated_date" value="2024-12-10 03:00:00"/>
<column name="parent_folder" value="gepafin/local"/>
</insert>
<addColumn tableName="application_evaluation">
<column name="EVALUATION_DOCUMENT" type="TEXT"/>
</addColumn>
<addColumn tableName="document">
<column name="uploaded_by" type="INTEGER">
<!-- <constraints nullable="false"/>-->
</column>
</addColumn>
</changeSet>
<changeSet id="12_12_2024_1" author="Nisha Kashyap">
<addColumn tableName="protocol">
<column name="type" type="VARCHAR(255)"></column>
</addColumn>
<addColumn tableName="application_amendment_request">
<column name="amendment_document" type="TEXT"></column>
</addColumn>
</changeSet>
<changeSet id="19-12-2024_1" author="Nisha kashyap">
<!-- Insert data for Intructor manager role -->
<insert tableName="role">
<column name="role_name" value="instructor manager"/>
<column name="role_type" value="ROLE_INSTRUCTOR_MANAGER"/>
<column name="description"
value="They will manage the instructor"/>
<column name="created_date" value="2024-12-19 15:30:00"/>
<column name="updated_date" value="2024-12-19 15:30:00"/>
<column name="permissions" value="EVALUATE_APPLICATIONS,MANAGE_PRELIMINARY_RELIEF,ASSIGED_APPLICATION"/>
<column name="region_id" valueComputed="1"/>
</insert>
</changeSet>
<changeSet id="19-12-2024_2" author="Nisha kashyap">
<insert tableName="gepafin_user">
<column name="password" value="$2a$10$doUyOcEm8WPuFfpFT5y18.1DvZzF7exbqgy9X0P27cUBK7YWbfzzS"/>
<column name="email" value="instructorManager@test.test"/>
<column name="first_name" value="instructor"/>
<column name="last_name" value="Manager"/>
<column name="phone_number" value="98768526440"/>
<column name="role_id" valueComputed="5"/>
<column name="status" value="ACTIVE"/>
<column name="last_login" value="2024-12-19 00:00:00"/>
<column name="created_date" value="2024-12-19 00:00:00"/>
<column name="updated_date" value="2024-12-19 00:00:00"/>
<column name="organization" value="InstructorManagerOrg"/>
<column name="address" value="789 Victory Road"/>
<column name="city" value="Naples"/>
<column name="country" value="Italy"/>
<column name="hub_id" value="1"/>
</insert>
</changeSet>
</databaseChangeLog>

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

@@ -314,3 +314,26 @@ company.id.required.for.preferred.call=Company ID is required when requesting on
response.days.not.null=Response days should not be null and greater than zero.
application.cannot.approved.or.rejected=Application cannot be approved and rejected because amendment is active.
valid.vatnumber.message=The VAT number is valid.
atleast.one.id.required=At least one of companyId or applicationId must be provided
#Appointment flow messages
ndg.generated = NDG Generated.
ndg.available = NDG Available.
ndg.generation.in.progress = NDG generation is in progress.
ndg.fetch.successfully = NDG fetched successfully.
appointment.already.created = Appointment Already Created.
ndg.not.found.for.this.application.or.invalid = Ndg not found for this application or invalid.
provide.valid.application.document.id = Provide valid application document id.
document.uploaded.successfully.to.external.system = Document uploaded successfully to external system.
error.in.uploading.document.check.input = Error in uploading document check input data or try again.
document.already.uploaded = Document already uploaded.
document.not.uploaded.to.external.system.please.try.again = Document not uploaded to external system, please try again.
ndg.not.found.or.not.matched = The provided NDG does not match the application NDG, or the NDG has not been generated.
ndg.generation.is.only.for.gepafin = NDG generation is only available for GEPAFIN Hub.
appointment.creation.is.only.for.gepafin = Appointment creation is only allowed for GEPAFIN Hub.
upload.document.is.only.for.gepafin = Document cant be uploaded, this is only available for GEPAFIN Hub.
appointment.created.successfully = Appointment created successfully.
error.try.again = Service call error while performing the operation. Please try again.
document.uploading.is.in.progress = Document uploading is in progress.
all.document.checked.and.one.checklist.checked=All document should be checked and at least one checklist should be checked.

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

@@ -197,8 +197,6 @@ 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 � obbligatorio.
user.already.connected.to.company=L'utente � gi� 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.
@@ -306,5 +304,27 @@ beneficiary.call.duplicate = Una chiamata preferita con questo ID di chiamata e
user.must.be.associated.with.company.to.create.application=Devi essere associato a un'azienda per poter presentare domanda per questa applicazione.
company.id.required.for.preferred.call=ID azienda obbligatorio quando si richiedono solo chiamate preferite.
response.days.not.null=I giorni di risposta non devono essere nulli e maggiori di zero.
application.cannot.approved.or.rejected=La domanda non può essere approvata o rifiutata perché l'emendamento è attivo.
valid.vatnumber.message=Il numero di partita IVA è valido.
application.cannot.approved.or.rejected=La domanda non pu<EFBFBD> essere approvata o rifiutata perch<EFBFBD> l'emendamento <EFBFBD> attivo.
valid.vatnumber.message=Il numero di partita IVA <EFBFBD> valido.
atleast.one.id.required=Almeno uno tra companyId o applicationId deve essere fornito.
#Appointment flow messages
ndg.available = NDG disponibile.
ndg.generation.in.progress = La generazione NDG ? in corso.
ndg.fetch.successfully = NDG recuperato con successo.
appointment.already.created = Appuntamento gi? creato.
ndg.not.found.for.this.application.or.invalid = NDG non trovato per questa applicazione o non valido.
provide.valid.application.document.id = Fornisci un ID documento applicativo valido.
document.uploaded.successfully.to.external.system = Documento caricato con successo nel sistema esterno.
error.in.uploading.document.check.input = Errore nel caricamento del documento. Controlla i dati inseriti o riprova.
document.already.uploaded = Documento gi? caricato.
document.not.uploaded.to.external.system.please.try.again = Documento non caricato nel sistema esterno, riprova.
ndg.not.found.or.not.matched = L'NDG fornito non corrisponde all'NDG dell'applicazione o non ? stato generato.
ndg.generation.is.only.for.gepafin = La generazione dell'NDG ? disponibile solo per GEPAFIN.
appointment.creation.is.only.for.gepafin = La creazione degli appuntamenti ? consentita solo per GEPAFIN.
upload.document.is.only.for.gepafin = Il documento non pu? essere caricato, questa operazione ? disponibile solo per il Hub GEPAFIN.
appointment.created.successfully = Appuntamento creato con successo.
error.try.again = Errore di chiamata di servizio durante l'esecuzione dell'operazione. Riprovare.
document.uploading.is.in.progress = Il documento <20> in fase di caricamento.
all.document.checked.and.one.checklist.checked=Tutti i documenti devono essere controllati e almeno una checklist deve essere controllata.