Merge pull request #124 from prgrms-web-devcourse-final-project/refactor

[REFACTOR]: User 연관관계 추가 및 OAuth·ErrorCode 정리

Author: simount3

back/src/main/java/com/back/domain/user/entity/User.java

@@ -1,9 +1,13 @@
 package com.back.domain.user.entity;
 
+import com.back.domain.comment.entity.Comment;
+import com.back.domain.like.entity.CommentLike;
+import com.back.domain.like.entity.PostLike;
 import com.back.domain.node.entity.BaseLine;
 import com.back.domain.node.entity.BaseNode;
 import com.back.domain.node.entity.DecisionLine;
 import com.back.domain.node.entity.DecisionNode;
+import com.back.domain.post.entity.Post;
 import com.back.domain.scenario.entity.Scenario;
 import com.back.global.baseentity.BaseEntity;
 import jakarta.persistence.*;
@@ -87,4 +91,20 @@ public class User extends BaseEntity {
     @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
     @Builder.Default
     private List<Scenario> scenarios = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<Post> posts = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<Comment> comments = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<PostLike> postLikes = new ArrayList<>();
+
+    @OneToMany(mappedBy = "user", cascade = CascadeType.ALL, orphanRemoval = true)
+    @Builder.Default
+    private List<CommentLike> commentLikes = new ArrayList<>();
 }

back/src/main/java/com/back/global/config/EmbeddedRedisConfig.java

@@ -32,7 +32,6 @@ public void startRedis() {
             System.out.println("========================================");
         } catch (IOException e) {
             System.err.println("Embedded Redis start failed: " + e.getMessage());
-            System.err.println("This is OK if external Redis is already running");
         }
     }
 

back/src/main/java/com/back/global/exception/ErrorCode.java

@@ -26,7 +26,7 @@ public enum ErrorCode {
     LOGIN_ID_DUPLICATION(HttpStatus.BAD_REQUEST, "U003", "Login ID Duplication"),
     INVALID_PASSWORD(HttpStatus.BAD_REQUEST, "U004", "Invalid Password"),
     UNAUTHORIZED_USER(HttpStatus.UNAUTHORIZED, "U005", "Unauthorized User"),
-    NICKNAME_DUPLICATION(HttpStatus.CONFLICT, "U006", "이미 사용 중인 닉네임입니다."),
+    NICKNAME_DUPLICATION(HttpStatus.CONFLICT, "U006", "Nickname Duplication"),
 
     // Post Errors
     POST_NOT_FOUND(HttpStatus.NOT_FOUND, "P001", "Post Not Found"),
@@ -72,11 +72,11 @@ public enum ErrorCode {
 
     // Poll Errors
     POLL_VOTE_NOT_FOUND(HttpStatus.NOT_FOUND, "PV001", "Poll Vote Not Found"),
-    POLL_VOTE_INVALID_FORMAT(HttpStatus.BAD_REQUEST, "PV002", "투표 형식이 올바르지 않습니다."),
-    POLL_VOTE_INVALID_OPTION(HttpStatus.BAD_REQUEST, "PV003", "존재하지 않는 투표 항목입니다." ),
+    POLL_VOTE_INVALID_FORMAT(HttpStatus.BAD_REQUEST, "PV002", "Invalid Poll Format"),
+    POLL_VOTE_INVALID_OPTION(HttpStatus.BAD_REQUEST, "PV003", "Invalid Poll Option" ),
 
     // Lock Errors
-    LOCK_ACQUISITION_FAILED(HttpStatus.CONFLICT, "L001", "다른 요청이 처리 중입니다. 잠시 후 다시 시도해주세요."),
+    LOCK_ACQUISITION_FAILED(HttpStatus.CONFLICT, "L001", "Another request is being processed. Please try again later."),
 
     // Storage Errors
     STORAGE_UPLOAD_FAILED(HttpStatus.INTERNAL_SERVER_ERROR, "ST001", "Failed to upload file to storage"),

back/src/main/java/com/back/global/security/oauth2/OAuthAttributes.java

@@ -13,8 +13,7 @@ public record OAuthAttributes(
         Map<String, Object> attributes,
         String nameAttributeKey,
         String name,
-        String email,
-        String picture
+        String email
 ) {
 
     public static OAuthAttributes of(String registrationId, String userNameAttributeName, Map<String, Object> attributes) {
@@ -32,8 +31,7 @@ private static OAuthAttributes ofGoogle(String userNameAttributeName, Map<String
                 attributes,
                 userNameAttributeName,
                 (String) attributes.get("name"),
-                (String) attributes.get("email"),
-                (String) attributes.get("picture")
+                (String) attributes.get("email")
         );
     }
 
@@ -47,8 +45,7 @@ private static OAuthAttributes ofGithub(String userNameAttributeName, Map<String
                 attributes,
                 userNameAttributeName,
                 name,
-                email,
-                (String) attributes.get("avatar_url")
+                email
         );
     }
 }