[team-31] 데이먼 3주차 1번째 PR 요청

BE/build.gradle

@@ -1,6 +1,13 @@
+buildscript {
+    ext {
+        queryDslVersion = "5.0.0"
+    }
+}
+
 plugins {
     id 'org.springframework.boot' version '2.7.0'
     id 'io.spring.dependency-management' version '1.0.11.RELEASE'
+    id "com.ewerk.gradle.plugins.querydsl" version "1.0.10"
     id 'java'
 }
 
@@ -26,6 +33,8 @@ dependencies {
     implementation 'org.springframework.boot:spring-boot-starter-webflux'
     implementation 'io.jsonwebtoken:jjwt:0.9.1'
     implementation 'javax.xml.bind:jaxb-api:2.3.1'
+    implementation "com.querydsl:querydsl-jpa:${queryDslVersion}"
+    annotationProcessor "com.querydsl:querydsl-apt:${queryDslVersion}"
     compileOnly 'org.projectlombok:lombok'
     runtimeOnly 'com.h2database:h2'
     runtimeOnly 'mysql:mysql-connector-java'
@@ -41,3 +50,18 @@ jar {
 tasks.named('test') {
     useJUnitPlatform()
 }
+
+def querydslDir = "$buildDir/generated/querydsl"
+querydsl {
+    jpa = true
+    querydslSourcesDir = querydslDir
+}
+sourceSets {
+    main.java.srcDir querydslDir
+}
+configurations {
+    querydsl.extendsFrom compileClasspath
+}
+compileQuerydsl {
+    options.annotationProcessorPath = configurations.querydsl
+}

BE/src/main/java/com/team31/codesquad/issuetracker/config/mvc/LoginNameArgumentResolver.java → BE/src/main/java/com/team31/codesquad/issuetracker/config/mvc/LoginUserArgumentResolver.java

@@ -1,6 +1,7 @@
 package com.team31.codesquad.issuetracker.config.mvc;
 
-import com.team31.codesquad.issuetracker.config.mvc.annotation.LoginName;
+import com.team31.codesquad.issuetracker.config.mvc.annotation.LoginUser;
+import com.team31.codesquad.issuetracker.domain.user.UserRepository;
 import com.team31.codesquad.issuetracker.util.JwtUtil;
 import lombok.RequiredArgsConstructor;
 import org.springframework.core.MethodParameter;
@@ -12,12 +13,13 @@
 
 @Component
 @RequiredArgsConstructor
-public class LoginNameArgumentResolver implements HandlerMethodArgumentResolver {
+public class LoginUserArgumentResolver implements HandlerMethodArgumentResolver {
 
     private final JwtUtil jwtUtil;
+    private final UserRepository userRepository;
 
     @Override public boolean supportsParameter(MethodParameter parameter) {
-        return parameter.getParameterAnnotation(LoginName.class) != null;
+        return parameter.getParameterAnnotation(LoginUser.class) != null;
     }
 
     @Override
@@ -32,10 +34,10 @@ public Object resolveArgument(MethodParameter parameter, ModelAndViewContainer m
 
         String token = authorizationHeader.substring(7);
         if (token.equals(jwtUtil.getAdminPassword())) {
-            return jwtUtil.getAdminLoginName();
+            return userRepository.findByLoginName(jwtUtil.getAdminLoginName());
         }
+
         String loginName = jwtUtil.getPayload(token);
-        System.out.println("loginName = " + loginName);
-        return loginName;
+        return userRepository.findByLoginName(loginName);
     }
 }

BE/src/main/java/com/team31/codesquad/issuetracker/config/mvc/WebConfig.java

@@ -12,19 +12,21 @@
 @RequiredArgsConstructor
 public class WebConfig implements WebMvcConfigurer {
 
-    private final LoginNameArgumentResolver loginNameArgumentResolver;
+    private final LoginUserArgumentResolver loginUserArgumentResolver;
 
     @Override
     public void addArgumentResolvers(List<HandlerMethodArgumentResolver> resolvers) {
-        resolvers.add(loginNameArgumentResolver);
+        resolvers.add(loginUserArgumentResolver);
     }
 
     @Bean
     public WebMvcConfigurer corsConfigurer() {
         return new WebMvcConfigurer() {
             @Override public void addCorsMappings(CorsRegistry registry) {
                 registry.addMapping("/**")
-                        .allowedOrigins("http://localhost:3000")
+                        .allowedOrigins("http://localhost:3000",
+                                "http://ec2-3-37-163-26.ap-northeast-2.compute.amazonaws.com",
+                                "http://localhost:80")
                         .allowedMethods("*")
                         .allowedHeaders("*")
                         .exposedHeaders("*")

BE/src/main/java/com/team31/codesquad/issuetracker/config/mvc/annotation/LoginName.java → BE/src/main/java/com/team31/codesquad/issuetracker/config/mvc/annotation/LoginUser.java

@@ -7,6 +7,6 @@
 
 @Target(ElementType.PARAMETER)
 @Retention(RetentionPolicy.RUNTIME)
-public @interface LoginName {
+public @interface LoginUser {
 
 }

BE/src/main/java/com/team31/codesquad/issuetracker/config/querydsl/QuerydslConfig.java

@@ -0,0 +1,16 @@
+package com.team31.codesquad.issuetracker.config.querydsl;
+
+import com.querydsl.jpa.impl.JPAQueryFactory;
+import javax.persistence.EntityManager;
+import org.springframework.context.annotation.Bean;
+import org.springframework.context.annotation.Configuration;
+
+@Configuration
+public class QuerydslConfig {
+
+    @Bean
+    public JPAQueryFactory jpaQueryFactory(EntityManager em) {
+        return new JPAQueryFactory(em);
+    }
+
+}

BE/src/main/java/com/team31/codesquad/issuetracker/domain/comment/Comment.java

@@ -57,10 +57,14 @@ public Comment(Issue issue, User author, String content) {
         this.systemMessage = false;
     }
 
-    public static Comment createStatusChangeComment(Issue issue,
-            IssueStatus status, User statusChangeUser) {
+    public Comment(User author, String content) {
+        this.author = author;
+        this.content = content;
+        this.systemMessage = false;
+    }
+
+    public static Comment createStatusChangeComment(IssueStatus status, User statusChangeUser) {
         Comment comment = new Comment();
-        comment.issue = issue;
         comment.author = statusChangeUser;
         comment.content =
                 status.equals(IssueStatus.OPEN) ? ISSUE_OPEN_MESSAGE : ISSUE_CLOSED_MESSAGE;
@@ -79,8 +83,8 @@ public void validateIssue(Long issueId) {
         }
     }
 
-    public void validateAuthor(String loginName) {
-        if (!loginName.equals(getAuthor().getLoginName())) {
+    public void validateAuthor(User user) {
+        if (!user.equals(getAuthor())) {
             throw new IllegalArgumentException("작성자만 접근이 가능합니다.");
         }
     }

BE/src/main/java/com/team31/codesquad/issuetracker/domain/comment/CommentRepository.java

@@ -1,7 +1,10 @@
 package com.team31.codesquad.issuetracker.domain.comment;
 
+import com.team31.codesquad.issuetracker.domain.issue.Issue;
+import java.util.List;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface CommentRepository extends JpaRepository<Comment, Long> {
 
+    List<Comment> findAllByIssue(Issue issue);
 }

BE/src/main/java/com/team31/codesquad/issuetracker/domain/comment/Reaction.java

@@ -36,11 +36,11 @@ public class Reaction extends BaseTimeEntity {
 
     @Enumerated(EnumType.STRING)
     @Column(nullable = false)
-    private ReactionEmoji reactionEmoji;
+    private ReactionEmoji emoji;
 
-    public Reaction(User user, Comment comment, ReactionEmoji reactionEmoji) {
+    public Reaction(User user, Comment comment, ReactionEmoji emoji) {
         this.user = user;
         this.comment = comment;
-        this.reactionEmoji = reactionEmoji;
+        this.emoji = emoji;
     }
 }

BE/src/main/java/com/team31/codesquad/issuetracker/domain/comment/ReactionRepository.java

@@ -2,9 +2,13 @@
 
 import com.team31.codesquad.issuetracker.domain.user.User;
 import java.util.List;
+import java.util.Optional;
 import org.springframework.data.jpa.repository.JpaRepository;
 
 public interface ReactionRepository extends JpaRepository<Reaction, Long> {
 
     List<Reaction> findAllByUserAndComment(User user, Comment comment);
+
+    Optional<Reaction> findByUserAndCommentAndEmoji(User user, Comment comment,
+            ReactionEmoji emoji);
 }

BE/src/main/java/com/team31/codesquad/issuetracker/domain/issue/Issue.java

@@ -7,7 +7,9 @@
 import com.team31.codesquad.issuetracker.domain.user.User;
 import java.time.LocalDateTime;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.List;
+import java.util.Set;
 import javax.persistence.CascadeType;
 import javax.persistence.Column;
 import javax.persistence.Entity;
@@ -47,10 +49,10 @@ public class Issue extends BaseTimeEntity {
     private User author;
 
     @OneToMany(mappedBy = "issue", cascade = CascadeType.ALL)
-    private List<AssignedUser> assignees = new ArrayList<>();
+    private Set<AssignedUser> assignees = new HashSet<>();
 
     @OneToMany(mappedBy = "issue", cascade = CascadeType.ALL)
-    private List<IssueLabel> issueLabels = new ArrayList<>();
+    private Set<IssueLabel> issueLabels = new HashSet<>();
 
     @ManyToOne(fetch = FetchType.LAZY)
     @JoinColumn(name = "milestone_id")
@@ -65,21 +67,16 @@ public class Issue extends BaseTimeEntity {
     @JoinColumn(name = "status_change_user_id")
     private User statusChangeUser;
 
-    public static Issue createIssue(String title, User author, List<AssignedUser> assignedUsers,
-            List<IssueLabel> issueLabels, Milestone milestone) {
+    public static Issue createIssue(String title, User author, Milestone milestone,
+            Comment comment) {
         Issue issue = new Issue();
         issue.status = IssueStatus.OPEN;
         issue.title = title;
         issue.author = author;
-        for (AssignedUser assignedUser : assignedUsers) {
-            issue.addAssignedUser(assignedUser);
-        }
-        for (IssueLabel issueLabel : issueLabels) {
-            issue.addIssueLabel(issueLabel);
-        }
         issue.milestone = milestone;
         issue.statusChangedAt = LocalDateTime.now();
         issue.statusChangeUser = author;
+        issue.addComment(comment);
 
         return issue;
     }
@@ -91,7 +88,7 @@ private void addIssueLabel(IssueLabel issueLabel) {
     }
 
     public void updateAssignedUsers(List<AssignedUser> assignedUsers) {
-        this.assignees = new ArrayList<>();
+        this.assignees = new HashSet<>();
         for (AssignedUser assignedUser : assignedUsers) {
             addAssignedUser(assignedUser);
         }
@@ -123,7 +120,7 @@ public void changStatus(IssueStatus status, User statusChangeUser) {
         this.status = status;
         this.statusChangeUser = statusChangeUser;
         this.statusChangedAt = LocalDateTime.now();
-        Comment comment = Comment.createStatusChangeComment(this, status, statusChangeUser);
+        Comment comment = Comment.createStatusChangeComment(status, statusChangeUser);
         addComment(comment);
     }
 
@@ -137,7 +134,7 @@ public void updateMilestone(Milestone milestone) {
     }
 
     public void updateIssueLabels(List<IssueLabel> issueLabels) {
-        this.issueLabels = new ArrayList<>();
+        this.issueLabels = new HashSet<>();
         for (IssueLabel issueLabel : issueLabels) {
             addIssueLabel(issueLabel);
         }

BE/src/main/java/com/team31/codesquad/issuetracker/domain/issue/IssueLabel.java

@@ -2,6 +2,7 @@
 
 import com.team31.codesquad.issuetracker.domain.BaseTimeEntity;
 import com.team31.codesquad.issuetracker.domain.label.Label;
+import java.util.Objects;
 import javax.persistence.Column;
 import javax.persistence.Entity;
 import javax.persistence.FetchType;
@@ -32,11 +33,29 @@ public class IssueLabel extends BaseTimeEntity {
     @JoinColumn(name = "label_id")
     private Label label;
 
-    public IssueLabel(Label label) {
+    public IssueLabel(Label label, Issue issue) {
         this.label = label;
+        this.issue = issue;
     }
 
     public void setIssue(Issue issue) {
         this.issue = issue;
     }
+
+    @Override
+    public boolean equals(Object o) {
+        if (this == o) {
+            return true;
+        }
+        if (o == null || getClass() != o.getClass()) {
+            return false;
+        }
+        IssueLabel that = (IssueLabel) o;
+        return Objects.equals(getId(), that.getId());
+    }
+
+    @Override
+    public int hashCode() {
+        return Objects.hash(getId());
+    }
 }