YEL-163 [feat] toString 수정

team-yello · Sep 18, 2023 · efd54c8 · efd54c8
1 parent 25d9795
commit efd54c8
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 4 deletions.
diff --git a/src/main/java/com/yello/server/domain/friend/dto/response/FriendResponse.java b/src/main/java/com/yello/server/domain/friend/dto/response/FriendResponse.java
@@ -1,5 +1,6 @@
 package com.yello.server.domain.friend.dto.response;
 
+import com.yello.server.domain.group.entity.SchoolType;
 import com.yello.server.domain.user.entity.User;
 import lombok.Builder;
 
@@ -15,7 +16,8 @@ public static FriendResponse of(User user) {
         return FriendResponse.builder()
             .id(user.getId())
             .name(user.getName())
-            .group(user.groupString())
+            .group(user.getGroup().getSchoolType()==SchoolType.UNIVERSITY ? user.groupString()
+                : user.highSchoolString())
             .profileImage(user.getProfileImage())
             .build();
     }

diff --git a/src/main/java/com/yello/server/domain/friend/dto/response/SearchFriendVO.java b/src/main/java/com/yello/server/domain/friend/dto/response/SearchFriendVO.java
@@ -1,5 +1,6 @@
 package com.yello.server.domain.friend.dto.response;
 
+import com.yello.server.domain.group.entity.SchoolType;
 import com.yello.server.domain.user.entity.User;
 import lombok.Builder;
 
@@ -17,7 +18,8 @@ public static SearchFriendVO of(User user, Boolean isFriend) {
         return SearchFriendVO.builder()
             .id(user.getId())
             .name(user.getName())
-            .group(user.groupString())
+            .group(user.getGroup().getSchoolType()==SchoolType.UNIVERSITY ? user.groupString()
+                : user.highSchoolString())
             .profileImage(user.getProfileImage())
             .yelloId(user.getYelloId())
             .isFriend(isFriend)

diff --git a/src/main/java/com/yello/server/domain/user/dto/response/UserDetailResponse.java b/src/main/java/com/yello/server/domain/user/dto/response/UserDetailResponse.java
@@ -1,5 +1,6 @@
 package com.yello.server.domain.user.dto.response;
 
+import com.yello.server.domain.group.entity.SchoolType;
 import com.yello.server.domain.user.entity.User;
 import lombok.Builder;
 
@@ -19,7 +20,8 @@ public static UserDetailResponse of(User user, Integer yelloCount, Integer frien
         return UserDetailResponse.builder()
             .userId(user.getId())
             .name(user.getName())
-            .group(user.groupString())
+            .group(user.getGroup().getSchoolType()==SchoolType.UNIVERSITY ? user.groupString()
+                : user.highSchoolString())
             .profileImageUrl(user.getProfileImage())
             .yelloId(user.getYelloId())
             .yelloCount(yelloCount)

diff --git a/src/main/java/com/yello/server/domain/user/dto/response/UserResponse.java b/src/main/java/com/yello/server/domain/user/dto/response/UserResponse.java
@@ -1,5 +1,6 @@
 package com.yello.server.domain.user.dto.response;
 
+import com.yello.server.domain.group.entity.SchoolType;
 import com.yello.server.domain.user.entity.User;
 import lombok.Builder;
 
@@ -18,7 +19,8 @@ public static UserResponse of(User user, Integer yelloCount, Integer friendCount
         return UserResponse.builder()
             .userId(user.getId())
             .name(user.getName())
-            .group(user.groupString())
+            .group(user.getGroup().getSchoolType()==SchoolType.UNIVERSITY ? user.groupString()
+                : user.highSchoolString())
             .profileImageUrl(user.getProfileImage())
             .yelloId(user.getYelloId())
             .yelloCount(yelloCount)

diff --git a/src/main/java/com/yello/server/domain/user/entity/User.java b/src/main/java/com/yello/server/domain/user/entity/User.java
@@ -159,6 +159,11 @@ public String groupString() {
         return this.group.toString() + " " + this.getGroupAdmissionYear() + "학번";
     }
 
+    public String highSchoolString() {
+        return this.group.getSchoolName() + " " + this.getGroupAdmissionYear() + "학년 "
+            + this.group.getDepartmentName() + "반";
+    }
+
     public void increaseRecommendCount() {
         this.recommendCount += 1;
     }