i-Dear · xodnz · Jun 2, 2024 · May 13, 2024 · May 13, 2024 · May 13, 2024
diff --git a/src/main/java/com/syncd/adapter/out/gmail/GmailAdapter.java b/src/main/java/com/syncd/adapter/out/gmail/GmailAdapter.java
@@ -20,24 +20,24 @@ public class GmailAdapter implements SendMailPort {
     @Override
     @Async
     public String sendInviteMail(String email, String hostName, String userName, String projectName, String projectId) {
-        MimeMessage message = createMail(email, hostName, userName, projectName,projectId);
+        MimeMessage message = createMail(email, hostName, projectName,projectId);
         // 실제 메일 전송
         javaMailSender.send(message);
 
         return projectName;
     }
 
     @Override
-    public String sendIviteMailBatch(String hostName, String projectName, List<User> users,String projectId) {
-        users.forEach(user -> {
-            MimeMessage message = createMail(user.getEmail(), hostName, user.getName(), projectName,projectId);
+    public String sendIviteMailBatch(String hostName, String projectName, List<String> userEmails,String projectId) {
+        userEmails.forEach(user -> {
+            MimeMessage message = createMail(user, hostName, projectName,projectId);
             javaMailSender.send(message);
         });
         return projectName;
     }
 
     // 메일 양식 작성
-    public MimeMessage createMail(String email, String hostName, String userName, String projectName, String projectId){
+    public MimeMessage createMail(String email, String hostName, String projectName, String projectId){
         MimeMessage message = javaMailSender.createMimeMessage();
 
         try {
@@ -85,8 +85,8 @@ public MimeMessage createMail(String email, String hostName, String userName, St
                     "<body>\n" +
                     "    <div class=\"container\">\n" +
                     "        <h1>싱크대 프로젝트에 초대받았습니다!</h1>\n" +
-                    "        <p>"+hostName+"님이 "+userName+"님을 "+projectName+" 프로젝트에 초대되었습니다. 아래 버튼을 클릭하시면 초대에 응하실 수 있습니다</p>\n" +
-                    "        <a href=\"https://syncd.i-dear.org/invite/"+projectId+"\" class=\"btn\">초대 수락</a>\n" +
+                    "        <p>"+hostName+"님이 "+projectName+" 프로젝트에 초대하였습니다. 아래 버튼을 클릭하여 협업하세요!</p>\n" +
+                    "        <a href=\"https://syncd.i-dear.org/\" class=\"btn\">sync-d 접속</a>\n" +
                     "    </div>\n" +
                     "</body>\n" +
                     "</html>\n";

diff --git a/src/main/java/com/syncd/application/port/out/gmail/SendMailPort.java b/src/main/java/com/syncd/application/port/out/gmail/SendMailPort.java
@@ -9,5 +9,5 @@ public interface SendMailPort {
     @Async
     String sendInviteMail(String email,String hostName, String userName, String projectName, String ProjectId);
 
-    String sendIviteMailBatch(String hostName, String projectName, List<User> users, String ProjectId);
+    String sendIviteMailBatch(String hostName, String projectName, List<String> userEmails, String ProjectId);
 }
diff --git a/src/main/java/com/syncd/application/service/JwtService.java b/src/main/java/com/syncd/application/service/JwtService.java
@@ -78,7 +78,8 @@ private static Key createSigningKey() {
 //    }
     @Override
     public String getUsernameFromToken(String token) {
-        return Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody().getSubject();
+        Claims claims = Jwts.parser().setSigningKey(secretKey).parseClaimsJws(token).getBody();
+        return claims.get("name", String.class);
     }
     @Override
     public boolean validateToken(String token) {

diff --git a/src/main/java/com/syncd/application/service/ProjectService.java b/src/main/java/com/syncd/application/service/ProjectService.java
@@ -24,6 +24,7 @@
 
 import java.util.ArrayList;
 import java.util.List;
+import java.util.Objects;
 import java.util.Optional;
 import java.util.stream.Collectors;
 
@@ -46,33 +47,36 @@ public class ProjectService implements CreateProjectUsecase, GetAllRoomsByUserId
 
     @Override
     public CreateProjectResponseDto createProject(String hostId, String hostName, String projectName, String description, MultipartFile img, List<String> userEmails){
-        List<User> users = new ArrayList<>();
-        if(userEmails!=null){
-            users = readUserPort.usersFromEmails(userEmails);
-        }
         String imgURL = "";
+        System.out.println(hostName);
         if (img != null && !img.isEmpty()) {
             Optional<String> optionalImgURL = s3Port.uploadMultipartFileToS3(img, hostName, projectName);
             imgURL = optionalImgURL.orElseThrow(() -> new IllegalStateException("Failed to upload image to S3"));
         }
 
         Project project = new Project();
         project = project.createProjectDomain(projectName, description, imgURL, hostId);
-
+        project.addUsers(userInProjectFromEmail(userEmails));
         CreateProjectResponseDto createProjectResponseDto = new CreateProjectResponseDto(writeProjectPort.CreateProject(project));
 
         User host = readUserPort.findByUserId(hostId);
-        List<UserInProject> members = new ArrayList<>();
-        if (userEmails != null && !userEmails.isEmpty()) {
-            members = userEmails.stream()
-                    .map(email -> createUserInProjectWithRoleMember(email, host.getName(), projectName, createProjectResponseDto.projectId()))
-                    .collect(Collectors.toList());
-        }
-
-        sendMailPort.sendIviteMailBatch(hostName, projectName, users,project.getId());
+//        List<UserInProject> members = new ArrayList<>();
+//        if (userEmails != null && !userEmails.isEmpty()) {
+//            members = userEmails.stream()
+//                    .map(email -> createUserInProjectWithRoleMember(email, host.getName(), projectName, createProjectResponseDto.projectId()))
+//                    .collect(Collectors.toList());
+//        }
+
+        sendMailPort.sendIviteMailBatch(hostName, projectName, userEmails, project.getId());
         return createProjectResponseDto;
     }
 
+    private List<UserInProject> userInProjectFromEmail(List<String> userEmails) {
+        return userEmails.stream()
+                .map(email -> new UserInProject(email, Role.MEMBER))
+                .collect(Collectors.toList());
+    }
+
     @Override
     public JoinProjectUsecase.JoinProjectResponseDto joinProject(String userId, String projectId) {
         UserInProject userInProject = new UserInProject(userId, Role.MEMBER);
@@ -221,9 +225,9 @@ private GetAllRoomsByUserIdResponseDto mapProjectsToResponse(String userId, List
         return new GetAllRoomsByUserIdResponseDto(userId, projectDtos);
     }
 
-    private ProjectForGetAllInfoAboutRoomsByUserIdResponseDto convertProjectToDto(String userId, Project project) {
+    private ProjectForGetAllInfoAboutRoomsByUserIdResponseDto convertProjectToDto(String userEmail, Project project) {
         Role userRole = project.getUsers().stream()
-                .filter(user -> userId.equals(user.getUserId()))
+                .filter(user -> userEmail.equals(user.getUserId()))
                 .map(UserInProject::getRole)
                 .findFirst()
                 .orElse(null);
@@ -234,9 +238,11 @@ private ProjectForGetAllInfoAboutRoomsByUserIdResponseDto convertProjectToDto(St
 
         List<String> userEmails = usersInProject.stream()
                 .map(UserInProject::getUserId)
-                .map(readUserPort::findByUserId)
-                .filter(user -> user != null)
-                .map(User::getEmail)
+                .map(userId -> {
+                    User user = readUserPort.findByUserId(userId);
+                    return user != null ? user.getEmail() : null;
+                })
+                .filter(Objects::nonNull)
                 .collect(Collectors.toList());
 
         return new ProjectForGetAllInfoAboutRoomsByUserIdResponseDto(

diff --git a/src/main/java/com/syncd/domain/project/Project.java b/src/main/java/com/syncd/domain/project/Project.java
@@ -23,6 +23,7 @@ public class Project {
     private String lastModifiedDate;
     private int leftChanceForUserstory;
 
+
     public void addUsers(List<UserInProject> newUsers) {
         if (this.users == null) {
             this.users = new ArrayList<>();

diff --git a/src/test/java/Dummy/Stub/application/out/gmail/StubSendMailPort.java b/src/test/java/Dummy/Stub/application/out/gmail/StubSendMailPort.java
@@ -13,7 +13,8 @@ public String sendInviteMail(String email, String hostName, String userName, Str
     }
 
     @Override
-    public String sendIviteMailBatch(String hostName, String projectName, List<User> users, String ProjectId) {
+    public String sendIviteMailBatch(String hostName, String projectName, List<String> userEmails, String ProjectId) {
+
         return Consistent.ProjectName.getValue();
     }
 }