Merge pull request #63 from TP-RENTPLACE/feature/add-postmark-api

Feature/add postmark api

Author: Kattsyn

rentplace/build.gradle

@@ -42,6 +42,7 @@ dependencies {
 	runtimeOnly("io.jsonwebtoken:jjwt-jackson:0.12.6")
 	runtimeOnly("io.jsonwebtoken:jjwt-impl:0.12.6")
 	implementation("io.jsonwebtoken:jjwt-api:0.12.6")
+	implementation("com.postmarkapp:postmark:1.11.1")
 
 	compileOnly 'org.projectlombok:lombok'
 	runtimeOnly 'org.postgresql:postgresql'

rentplace/src/main/java/kattsyn/dev/rentplace/configs/EmailRetryProperties.java

@@ -0,0 +1,11 @@
+package kattsyn.dev.rentplace.configs;
+
+import jakarta.validation.constraints.NotBlank;
+import org.springframework.boot.context.properties.ConfigurationProperties;
+
+@ConfigurationProperties(prefix = "email.retry")
+public record EmailRetryProperties(
+        @NotBlank Integer maxAttempts,
+        @NotBlank Integer delayMs
+) {
+}

rentplace/src/main/java/kattsyn/dev/rentplace/exceptions/EmailException.java

@@ -0,0 +1,7 @@
+package kattsyn.dev.rentplace.exceptions;
+
+public class EmailException extends RuntimeException {
+    public EmailException(String message) {
+        super(message);
+    }
+}

rentplace/src/main/java/kattsyn/dev/rentplace/exceptions/EmailServiceUnavailableException.java

@@ -0,0 +1,7 @@
+package kattsyn.dev.rentplace.exceptions;
+
+public class EmailServiceUnavailableException extends RuntimeException {
+    public EmailServiceUnavailableException(String message) {
+        super(message);
+    }
+}

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/CompositeEmailService.java

@@ -0,0 +1,38 @@
+package kattsyn.dev.rentplace.services.impl;
+
+import kattsyn.dev.rentplace.configs.EmailRetryProperties;
+import kattsyn.dev.rentplace.exceptions.EmailException;
+import kattsyn.dev.rentplace.exceptions.EmailServiceUnavailableException;
+import kattsyn.dev.rentplace.services.EmailService;
+import lombok.RequiredArgsConstructor;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.boot.context.properties.EnableConfigurationProperties;
+import org.springframework.context.annotation.Primary;
+import org.springframework.stereotype.Service;
+
+@Service
+@RequiredArgsConstructor
+@Slf4j
+@Primary
+@EnableConfigurationProperties(EmailRetryProperties.class)
+public class CompositeEmailService implements EmailService {
+
+    private final PostmarkEmailServiceImpl postmarkEmailServiceImpl;
+    private final EmailServiceImpl emailServiceImpl;
+    private final EmailRetryProperties retryProperties;
+
+    @Override
+    public void sendVerificationCode(String email, String code) {
+        try {
+            postmarkEmailServiceImpl.sendVerificationCode(email, code);
+        } catch (EmailException postmarkException) {
+            log.warn("Postmark failed, trying JavaMail. Reason: {}", postmarkException.getMessage());
+            try {
+                emailServiceImpl.sendVerificationCode(email, code);
+            } catch (EmailException javaMailEx) {
+                log.error("All email services failed: {}", javaMailEx.getMessage());
+                throw new EmailServiceUnavailableException("All email providers failed");
+            }
+        }
+    }
+}

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/EmailServiceImpl.java

@@ -1,5 +1,6 @@
 package kattsyn.dev.rentplace.services.impl;
 
+import kattsyn.dev.rentplace.exceptions.EmailException;
 import kattsyn.dev.rentplace.services.EmailService;
 import lombok.RequiredArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
@@ -16,17 +17,21 @@ public class EmailServiceImpl implements EmailService {
 
     @Override
     public void sendVerificationCode(String email, String code) {
-        log.info("Sending verification code to " + email);
-        SimpleMailMessage message = new SimpleMailMessage();
+        try {
+            log.info("Sending verification code to {}", email);
+            SimpleMailMessage message = new SimpleMailMessage();
 
-        message.setTo(email);
-        message.setSubject("Код подтверждения");
-        String text = String.format(
-                "Здравствуйте!\n\nВаш код подтверждения для регистрации: %s\n\nС уважением,\nКоманда rentplace",
-                code
-        );
-        message.setText(text);
-        mailSender.send(message);
-        log.info("Verification code should be sent");
+            message.setTo(email);
+            message.setSubject("Код подтверждения");
+            String text = String.format(
+                    "Здравствуйте!\n\nВаш код подтверждения для регистрации: %s\n\nС уважением,\nКоманда rentplace",
+                    code
+            );
+            message.setText(text);
+            mailSender.send(message);
+            log.info("Verification code should be sent");
+        } catch (Exception e) {
+            throw new EmailException("JavaMail error: " + e.getMessage());
+        }
     }
 }

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/PostmarkEmailServiceImpl.java

@@ -0,0 +1,41 @@
+package kattsyn.dev.rentplace.services.impl;
+
+import com.postmarkapp.postmark.Postmark;
+import com.postmarkapp.postmark.client.ApiClient;
+import com.postmarkapp.postmark.client.exception.PostmarkException;
+import kattsyn.dev.rentplace.exceptions.EmailException;
+import kattsyn.dev.rentplace.services.EmailService;
+import lombok.extern.slf4j.Slf4j;
+import org.springframework.stereotype.Service;
+
+import java.io.IOException;
+
+import com.postmarkapp.postmark.client.data.model.message.Message;
+
+@Service
+@Slf4j
+public class PostmarkEmailServiceImpl implements EmailService {
+
+    private final ApiClient postmarkClient;
+
+    public PostmarkEmailServiceImpl() {
+        String serverToken = "f68fd941-1f63-4e1e-a348-c8232ea2ded6";
+        this.postmarkClient = Postmark.getApiClient(serverToken);
+    }
+
+    @Override
+    public void sendVerificationCode(String email, String code) {
+        log.info("Sending verification code to {}", email);
+        try {
+            Message message = new Message("support@rentplace.online", email, "Код подтверждения", String.format(
+                    "Здравствуйте!\n\nВаш код подтверждения для регистрации: %s\n\nС уважением,\nКоманда rentplace",
+                    code));
+            postmarkClient.deliverMessage(message);
+            log.info("Verification code sent successfully");
+
+        } catch (PostmarkException | IOException e) {
+            throw new EmailException("Postmark error: " + e.getMessage());
+        }
+    }
+}
+

rentplace/src/main/java/kattsyn/dev/rentplace/services/impl/UserServiceImpl.java

@@ -81,6 +81,7 @@ public UserDTO findById(Long id) {
     @Override
     public UserDTO createWithImage(UserCreateEditDTO userCreateEditDTO) {
         User user = userMapper.fromUserCreateEditDTO(userCreateEditDTO);
+        user.setUserStatus(UserStatus.STATUS_ACTIVE);
         user = userRepository.save(user);
         if (userCreateEditDTO.getFile() != null && !userCreateEditDTO.getFile().isEmpty()) {
             return uploadImage(userCreateEditDTO.getFile(), user);

rentplace/src/main/resources/application.yml

@@ -61,7 +61,10 @@ openrouter:
     key: ${OPENROUTER_API_KEY}
     model: ${OPENROUTER_API_MODEL}
     default-system-prompt: ${OPENROUTER_API_SYSTEM_PROMPT}
-
+email:
+  retry:
+    delay-ms: 1000
+    max-attempts: 2
 api:
   path: api/v1
 upload: