Updated code for reminder endpoint
This commit is contained in:
@@ -508,8 +508,10 @@ public class ApplicationAmendmentRequestDao {
|
|||||||
String subject = prepareSubject(emailTemplate, amendment, beneficiaryUser);
|
String subject = prepareSubject(emailTemplate, amendment, beneficiaryUser);
|
||||||
String body = prepareBody(emailTemplate, amendment, beneficiaryUser);
|
String body = prepareBody(emailTemplate, amendment, beneficiaryUser);
|
||||||
String email = beneficiaryUser.getEmail();
|
String email = beneficiaryUser.getEmail();
|
||||||
if (Boolean.TRUE.equals(amendment.getIsEmail())&&email != null && !email.isEmpty()) {
|
String companyEmail = applicationEntity.getCompany().getEmail();
|
||||||
|
if (Boolean.TRUE.equals(amendment.getIsEmail())&&email != null && !email.isEmpty() && companyEmail != null && !companyEmail.isEmpty()) {
|
||||||
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email));
|
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(email));
|
||||||
|
emailNotificationDao.sendMail(hub.getId(), subject, body, List.of(companyEmail));
|
||||||
// mailUtil.sendByMailGun(subject,body,List.of(email),null);
|
// mailUtil.sendByMailGun(subject,body,List.of(email),null);
|
||||||
} else {
|
} else {
|
||||||
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.BENEFICIARY_EMAIL_NOT_FOUND_MSG));
|
throw new CustomValidationException(Status.BAD_REQUEST, Translator.toLocale(GepafinConstant.BENEFICIARY_EMAIL_NOT_FOUND_MSG));
|
||||||
|
|||||||
@@ -181,7 +181,7 @@ public interface ApplicationAmendmentRequestApi {
|
|||||||
@ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
|
@ApiResponse(responseCode = "401", description = "Unauthorized", content = @Content(mediaType = MediaType.APPLICATION_JSON_VALUE, examples = {
|
||||||
@ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) }))
|
@ExampleObject(value = ErrorConstants.UNAUTHORIZED_ERROR_EXAMPLE) }))
|
||||||
})
|
})
|
||||||
@PostMapping(value = "sendReminderEmail/{amendmentId}", produces = MediaType.APPLICATION_JSON_VALUE)
|
@PostMapping(value = "/{amendmentId}/reminder", produces = MediaType.APPLICATION_JSON_VALUE)
|
||||||
ResponseEntity<Response<Void>> sendReminderEmail(HttpServletRequest request,
|
ResponseEntity<Response<Void>> sendReminderEmail(HttpServletRequest request,
|
||||||
@Parameter( required = true)
|
@Parameter( required = true)
|
||||||
@PathVariable(value = "amendmentId") Long amendmentId);
|
@PathVariable(value = "amendmentId") Long amendmentId);
|
||||||
|
|||||||
Reference in New Issue
Block a user