Added send email successfuly

Author: CP373931

.gitignore

@@ -1,4 +1,4 @@
-.env
+*.env
 HELP.md
 target/
 !.mvn/wrapper/maven-wrapper.jar

About Us.html

@@ -11,37 +11,32 @@
     <packaging>jar</packaging>
 
     <name>email-service</name>
-    <url>http://maven.apache.org</url>
+    <url>https://maven.apache.org</url>
 
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
     </properties>
 
     <dependencies>
+        <dependency>
+            <groupId>org.springframework.boot</groupId>
+            <artifactId>spring-boot-starter-web</artifactId>
+        </dependency>
         <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.1</version>
             <scope>test</scope>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-starter-web</artifactId>
-        </dependency>
         <dependency>
             <groupId>jakarta.persistence</groupId>
             <artifactId>jakarta.persistence-api</artifactId>
             <version>3.1.0</version>
         </dependency>
-        <dependency>
-            <groupId>org.springframework.boot</groupId>
-            <artifactId>spring-boot-autoconfigure</artifactId>
-            <version>3.1.0</version>
-        </dependency>
         <dependency>
             <groupId>com.sun.mail</groupId>
-            <artifactId>javax.mail</artifactId>
-            <version>1.6.2</version>
+            <artifactId>jakarta.mail</artifactId>
+            <version>2.0.0</version>
         </dependency>
         <dependency>
             <groupId>org.springframework.boot</groupId>
@@ -53,6 +48,10 @@
             <artifactId>commons-io</artifactId>
             <version>2.13.0</version>
         </dependency>
+        <dependency>
+            <groupId>commons-codec</groupId>
+            <artifactId>commons-codec</artifactId>
+        </dependency>
 
 
     </dependencies>

Name-edited.pdf

@@ -1,12 +1,14 @@
 package com.emailservice.email;
 
+import lombok.extern.slf4j.Slf4j;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.context.annotation.PropertySource;
 import org.springframework.mail.javamail.JavaMailSender;
 import org.springframework.mail.javamail.JavaMailSenderImpl;
 import java.util.Properties;
-
+@Slf4j
 @Configuration
 public class EmailConfig {
     @Value("${mail.host}")
@@ -22,16 +24,19 @@ public class EmailConfig {
     @Bean
     public JavaMailSender JavaMailSender() {
         JavaMailSenderImpl mailSender = new JavaMailSenderImpl();
-        mailSender.setHost(HOST_MAIL);
-        mailSender.setPort(PORT);
-        mailSender.setUsername(EMAIL);
-        mailSender.setPassword(PASSWORD);
-        Properties props = mailSender.getJavaMailProperties();
-        props.put("mail.transport.protocol", PROTOCOL);
-        props.put("mail.smtp.auth", "true");
-        props.put("mail.smtp.starttls.enable", "true");
-        props.put("mail.debug", "true");
-
+        try {
+            mailSender.setHost(HOST_MAIL);
+            mailSender.setPort(PORT);
+            mailSender.setUsername(EMAIL);
+            mailSender.setPassword(PASSWORD);
+            Properties props = mailSender.getJavaMailProperties();
+            props.put("mail.transport.protocol", PROTOCOL);
+            props.put("mail.smtp.auth", "true");
+            props.put("mail.smtp.starttls.enable", "true");
+            props.put("mail.debug", "true");
+        }catch (Exception ex){
+            log.info("\nError:-----------------> message: {}, cause: {}",ex.getMessage(),ex.getCause().toString());
+        }
         return mailSender;
     }
 

email-service/pom.xml

@@ -5,6 +5,7 @@
 import jakarta.servlet.http.HttpServletRequest;
 import jakarta.servlet.http.Part;
 import lombok.AllArgsConstructor;
+import org.springframework.http.MediaType;
 import org.springframework.http.ResponseEntity;
 import org.springframework.validation.annotation.Validated;
 import org.springframework.web.bind.annotation.PostMapping;
@@ -22,7 +23,7 @@
 @Validated
 public class EmailController {
     private final  EmailService emailService;
-    @PostMapping("/send")
+    @PostMapping(value = "/send",consumes = MediaType.MULTIPART_FORM_DATA_VALUE)
     public ResponseEntity<?>  sendEmail(HttpServletRequest request) throws ServletException, IOException {
 
         Part sendEmailRequest = request.getPart("email");

email-service/src/main/java/com/emailservice/email/EmailConfig.java

@@ -8,6 +8,7 @@
 import jakarta.validation.constraints.Email;
 import lombok.AllArgsConstructor;
 import lombok.extern.slf4j.Slf4j;
+import org.apache.commons.codec.CharEncoding;
 import org.apache.commons.io.FileUtils;
 import org.springframework.core.env.Environment;
 import org.springframework.core.io.DefaultResourceLoader;
@@ -50,21 +51,19 @@ public boolean sendEmail(@Email String recipient, Part filePart  ) {
         };
 
         MimeMessage message = mailSender.createMimeMessage();
-        Properties properties = System.getProperties();
-        properties.setProperty("mail.smtp.host", Objects.requireNonNull(environment.getProperty("mail.protocol")));
-
         var sent =false;
         try {
 
-            message.setFrom(new InternetAddress(Objects.requireNonNull(environment.getProperty("mail.host"))));
+            message.setFrom(new InternetAddress(Objects.requireNonNull(environment.getProperty("mail.username"))));
             message.addRecipient(Message.RecipientType.TO, new InternetAddress(recipient));
             message.setSubject("EDITED PDF FILE");
-            String emailTemplate = readFile.apply("emailTemplate.html");
+            String emailTemplate = readFile.apply("/emailTemplate.html");
             emailTemplate =emailTemplate.replace("${firstname}","Name") ;
             message.setContent(emailTemplate,"text/html; charset=utf-8");
 
-            MimeMessageHelper helper =  new MimeMessageHelper(message);
+            MimeMessageHelper helper =  new MimeMessageHelper(message,true, CharEncoding.UTF_8);
             helper.addAttachment("Name-edited.pdf",partToFile.apply(filePart,"Name-edited.pdf"));
+            mailSender.send(message);
             sent=true;
             log.info("------------------> Sent message successfully to user email: {}",recipient);
         } catch (

email-service/src/main/java/com/emailservice/email/EmailController.java

@@ -1,4 +1,6 @@
 spring:
+  config:
+    import: optional:file:.env[.properties]
   application:
     name: email-service
 server: