Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -40,14 +40,15 @@ dependencies {
implementation 'org.springframework.boot:spring-boot-starter-data-jpa'
implementation 'org.springframework.boot:spring-boot-starter-oauth2-resource-server'
implementation 'org.springframework.boot:spring-boot-starter-security'
implementation 'org.springframework.boot:spring-boot-starter-mail'
implementation 'org.springframework.boot:spring-boot-starter-validation'
implementation 'org.springframework.boot:spring-boot-starter-web'
implementation 'org.springframework.boot:spring-boot-starter-webflux'
implementation 'com.google.firebase:firebase-admin:9.4.3'
implementation 'org.flywaydb:flyway-core'
implementation 'org.flywaydb:flyway-database-postgresql'
implementation 'org.springframework.kafka:spring-kafka'
implementation 'ru.random.walk:event-exchange-contract:1.2.3'
implementation 'ru.random.walk:event-exchange-contract:1.2.5'
implementation 'org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0'

compileOnly 'org.projectlombok:lombok'
Expand Down
8 changes: 8 additions & 0 deletions deploy/twitter-service/values.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,14 @@ secrets:
secret_key: FIREBASE_CREDENTIALS
secret_name: twitter-secret

- name: MAIL_APP_PASSWORD
secret_key: MAIL_APP_PASSWORD
secret_name: twitter-secret

- name: MAIL_USERNAME
secret_key: MAIL_USERNAME
secret_name: twitter-secret

serviceAccount:
# Specifies whether a service account should be created
create: true
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,9 @@
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;
import ru.random.walk.dto.SendEmailEvent;
import ru.random.walk.dto.SendNotificationEvent;
import ru.randomwalk.twitterservice.service.EmailService;
import ru.randomwalk.twitterservice.service.NotificationSendingService;

@RestController
Expand All @@ -21,6 +23,7 @@
public class TestController {

private final NotificationSendingService notificationSendingService;
private final EmailService emailService;

@PostMapping("/send-notification")
@Operation(description = "Test endpoint for notification sending")
Expand All @@ -32,4 +35,10 @@ public void sendNotification(@RequestBody SendNotificationEvent event) {
throw new RuntimeException(e);
}
}

@PostMapping("/send-email")
@Operation(description = "Test endpoint for email sending")
public void sendEmail(@RequestBody SendEmailEvent event) {
emailService.sendEmail(event.recipient(), event.subject(), event.body(), event.isHtml());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
package ru.randomwalk.twitterservice.listener;

import com.fasterxml.jackson.databind.ObjectMapper;
import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.kafka.annotation.KafkaListener;
import org.springframework.stereotype.Service;
import ru.random.walk.dto.SendEmailEvent;
import ru.random.walk.topic.EventTopic;
import ru.randomwalk.twitterservice.service.EmailService;

@Slf4j
@Service
@RequiredArgsConstructor
public class SendEmailEventListener {

private final ObjectMapper objectMapper;
private final EmailService emailService;

@KafkaListener(topics = EventTopic.SEND_EMAIL)
public void handleSendEmailEvent(String message) {
try {
log.info("Processing send email event");
var event = objectMapper.readValue(message, SendEmailEvent.class);
emailService.sendEmail(event.recipient(), event.subject(), event.body(), event.isHtml());
} catch (Exception e) {
log.error("Error processing send email event {}", message, e);
}
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
package ru.randomwalk.twitterservice.service;

public interface EmailService {
void sendEmail(String email, String subject, String body, boolean isHtml);
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,39 @@
package ru.randomwalk.twitterservice.service.impl;

import lombok.RequiredArgsConstructor;
import lombok.extern.slf4j.Slf4j;
import org.springframework.beans.factory.annotation.Value;
import org.springframework.mail.javamail.JavaMailSender;
import org.springframework.mail.javamail.MimeMessageHelper;
import org.springframework.stereotype.Service;
import ru.randomwalk.twitterservice.service.EmailService;

@Service
@Slf4j
@RequiredArgsConstructor
public class EmailServiceImpl implements EmailService {

private final JavaMailSender mailSender;

@Value("${spring.mail.username}")
private String senderEmail;

@Override
public void sendEmail(String email, String subject, String body, boolean isHtml) {
try {
var message = mailSender.createMimeMessage();
var helper = new MimeMessageHelper(message, true, "UTF-8");
helper.setFrom(senderEmail);
helper.setTo(email);
helper.setSubject(subject);
helper.setText(body, isHtml);

log.info("Sending message with subject {} to {}", subject, email);
mailSender.send(message);
log.info("Message is sent");
} catch (Exception e) {
log.error("Error sending message with subject {}", subject, e);
throw new RuntimeException(e);
}
}
}
14 changes: 14 additions & 0 deletions src/main/resources/application.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,18 @@
spring:
mail:
host: smtp.gmail.com
port: 587
password: ${MAIL_APP_PASSWORD:changeme}
username: ${MAIL_USERNAME:user@example.com}
properties:
mail:
smtp:
auth: true
starttls:
enable: true
connectiontimeout: 15000
timeout: 10000
writetimeout: 15000
security:
oauth2:
resourceserver:
Expand Down
Loading