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

Merge pull request #223 from Kitzanos/pec-service-enabled-only-production

Browse Source 
PEC service is enabled only in the production environment
This commit is contained in:
Rinaldo
2025-02-24 12:09:06 +01:00
committed by GitHub
parent 194cf6a97f ad505f507d
commit c829d8b46c
6 changed files with 26 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/main/java/net/gepafin/tendermanagement/dao/ApplicationDao.java
View File

@@ -117,8 +117,8 @@ public class ApplicationDao {
@Autowired @Autowired
private AssignedApplicationsRepository assignedApplicationsRepository; private AssignedApplicationsRepository assignedApplicationsRepository;
@Value("${default_System_Receiver_Email}") // @Value("${default_System_Receiver_Email}")
private String defaultSystemReceiverEmail; // private String defaultSystemReceiverEmail;
@Value("${rinaldo_email}") @Value("${rinaldo_email}")
private String rinaldoEmail; private String rinaldoEmail;

25
src/main/java/net/gepafin/tendermanagement/service/impl/PecEmailService.java
View File

@@ -26,6 +26,9 @@ public class PecEmailService implements EmailService {
@Value("${isMailSendingEnabled}") @Value("${isMailSendingEnabled}")
private String isEmailSendingEnabled; private String isEmailSendingEnabled;
@Value("${isPecServiceEnabled}")
private String isPecServiceEnabled;
@Autowired @Autowired
private Validator validator; private Validator validator;
@@ -55,23 +58,27 @@ public class PecEmailService implements EmailService {
emailLogRequest.setSendStatus(StatusTypeEnum.SUCCESS.getValue()); emailLogRequest.setSendStatus(StatusTypeEnum.SUCCESS.getValue());
emailLogRequest.setRecipientEmails(Utils.listToCommaSeparatedString(emailRequest.getRecipient())); emailLogRequest.setRecipientEmails(Utils.listToCommaSeparatedString(emailRequest.getRecipient()));
try { try {
Unirest.setTimeouts(0, 0); if (Boolean.TRUE.equals(Boolean.parseBoolean(isPecServiceEnabled))) {
response2 = Unirest.post(url) Unirest.setTimeouts(0, 0);
.header("Authorization", "Bearer " + authToken) response2 = Unirest.post(url)
.header("Content-Type", "application/json") .header("Authorization", "Bearer " + authToken)
.body(Utils.convertObjectToJson(emailRequest)) // Serialize the emailRequest object to JSON .header("Content-Type", "application/json")
.asString(); .body(Utils.convertObjectToJson(emailRequest)) // Serialize the emailRequest object to JSON
.asString();
}
}catch(Exception e) { }catch(Exception e) {
emailLogRequest.setSendStatus(StatusTypeEnum.FAILED.getValue()); emailLogRequest.setSendStatus(StatusTypeEnum.FAILED.getValue());
emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE); emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE);
emailLogRequest.setErrorMessage(e.getMessage()); emailLogRequest.setErrorMessage(e.getMessage());
EmailLogEntity emailLogEntity= emailLogDao.createEmailLog(emailLogRequest); emailLogDao.createEmailLog(emailLogRequest);
throw new RuntimeException("Failed to send email via PEC: " + response2.getStatus()); throw new RuntimeException("Failed to send email via PEC: " + response2.getStatus());
} }
emailLogRequest.setEmailServiceResponse(response2.getBody()); if(response2 != null) {
emailLogRequest.setEmailServiceResponse(response2.getBody());
}
} }
emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE); emailLogRequest.setEmailServiceType(EmailServiceTypeEnum.PEC_SERVICE);
EmailLogEntity emailLogEntity= emailLogDao.createEmailLog(emailLogRequest); emailLogDao.createEmailLog(emailLogRequest);
} }
} }

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

@@ -10,7 +10,8 @@ spring.h2.console.enabled=true
isVatCheckGloballyDisabled = false isVatCheckGloballyDisabled = false
isMailSendingEnabled = true isMailSendingEnabled = true
default_System_Receiver_Email=antonio.manca@bflows.net isPecServiceEnabled = false
#default_System_Receiver_Email=antonio.manca@bflows.net
gepafin_email=rinaldo.bonazzo@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 carlo_email=test@test.test

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

@@ -9,7 +9,8 @@ spring.jpa.show-sql=true
base-url=http://localhost:8080 base-url=http://localhost:8080
isMailSendingEnabled = false isMailSendingEnabled = false
default_System_Receiver_Email=test@test.test isPecServiceEnabled = false
#default_System_Receiver_Email=test@test.test
gepafin_email=test@test.test gepafin_email=test@test.test
rinaldo_email=test@test.test rinaldo_email=test@test.test
carlo_email=test@test.test carlo_email=test@test.test

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

@@ -16,7 +16,8 @@ spid.ipd.base.url=https://login.regione.umbria.it
active.profile.folder=production active.profile.folder=production
isMailSendingEnabled = true isMailSendingEnabled = true
default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it isPecServiceEnabled = true
#default_System_Receiver_Email=m.gaudino@gepafin.it,f.marinelli@gepafin.it
gepafin_email=bandi@pec.gepafin.it gepafin_email=bandi@pec.gepafin.it
rinaldo_email=rinaldo.bonazzo@bflows.net rinaldo_email=rinaldo.bonazzo@bflows.net
carlo_email=carlo.mancosu@bflows.net carlo_email=carlo.mancosu@bflows.net

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

@@ -7,7 +7,8 @@ spring.datasource.password=sa
spring.h2.console.enabled=true spring.h2.console.enabled=true
base-url=http://localhost:8080 base-url=http://localhost:8080
isMailSendingEnabled = false isMailSendingEnabled = false
default_System_Receiver_Email=test@test.test isPecServiceEnabled = false
#default_System_Receiver_Email=test@test.test
gepafin_email=test@test.test gepafin_email=test@test.test
rinaldo_email=test@test.test rinaldo_email=test@test.test
carlo_email=test@test.test carlo_email=test@test.test