From b82a5ee8ab39923b371233322c1e74e5516271a2 Mon Sep 17 00:00:00 2001
From: GiHun Nam <52378919+gikhoon@users.noreply.github.com>
Date: Thu, 22 Aug 2024 22:20:12 +0900
Subject: [PATCH] =?UTF-8?q?Refactor:=20=EB=A9=A4=EB=B2=84=20=EC=9D=B4?=
 =?UTF-8?q?=EB=A6=84=20=EB=B3=80=EC=88=98=EB=AA=85=20=EB=B3=80=EA=B2=BD=20?=
 =?UTF-8?q?=20(#121)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* refactor: 멤버 이름 항목 변수명 변경

- memberName -> name

* refactor: 사용하지 않는 DTO 제거

* refactor: 멤버 포지션 변수명 변경
---
 .../dto/AttendanceRecordResponse.java         |  2 +-
 .../api/education/dto/WinnerInfoResponse.java |  4 +--
 .../mypage/dto/MyPageMemberInfoResponse.java  | 25 -------------------
 .../csquiz/api/quiz/dto/KingMemberInfo.java   |  2 +-
 .../csquiz/api/record/dto/RecordResponse.java |  2 +-
 .../csquiz/api/record/dto/ScorerResponse.java |  2 +-
 6 files changed, 6 insertions(+), 31 deletions(-)
 delete mode 100644 src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java

diff --git a/src/main/java/org/cotato/csquiz/api/attendance/dto/AttendanceRecordResponse.java b/src/main/java/org/cotato/csquiz/api/attendance/dto/AttendanceRecordResponse.java
index c5ee83f7..4caaca1b 100644
--- a/src/main/java/org/cotato/csquiz/api/attendance/dto/AttendanceRecordResponse.java
+++ b/src/main/java/org/cotato/csquiz/api/attendance/dto/AttendanceRecordResponse.java
@@ -17,7 +17,7 @@ public static AttendanceRecordResponse of(Member member, AttendanceStatistic att
 
     public record AttendanceMemberInfo(
             Long memberId,
-            String memberName,
+            String name,
             MemberPosition position
     ){
         static AttendanceMemberInfo from(Member member) {
diff --git a/src/main/java/org/cotato/csquiz/api/education/dto/WinnerInfoResponse.java b/src/main/java/org/cotato/csquiz/api/education/dto/WinnerInfoResponse.java
index a1fad2d8..b091390c 100644
--- a/src/main/java/org/cotato/csquiz/api/education/dto/WinnerInfoResponse.java
+++ b/src/main/java/org/cotato/csquiz/api/education/dto/WinnerInfoResponse.java
@@ -6,10 +6,10 @@
 
 public record WinnerInfoResponse(
         Long memberId,
-        String memberName,
+        String name,
         Long educationId,
         String backFourNumber,
-        MemberPosition memberPosition
+        MemberPosition position
 ) {
     public static WinnerInfoResponse of(Winner winner, Member member, String backFourNumber) {
         return new WinnerInfoResponse(
diff --git a/src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java b/src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java
deleted file mode 100644
index d7827c5a..00000000
--- a/src/main/java/org/cotato/csquiz/api/mypage/dto/MyPageMemberInfoResponse.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package org.cotato.csquiz.api.mypage.dto;
-
-import org.cotato.csquiz.domain.auth.enums.MemberPosition;
-import org.cotato.csquiz.domain.auth.enums.MemberRole;
-import org.cotato.csquiz.domain.auth.entity.Member;
-
-public record MyPageMemberInfoResponse(
-        Long memberId,
-        String memberName,
-        String phoneNumber,
-        Integer generationNumber,
-        MemberRole memberRole,
-        MemberPosition memberPosition
-) {
-    public static MyPageMemberInfoResponse of(Member member, String originPhoneNumber) {
-        return new MyPageMemberInfoResponse(
-                member.getId(),
-                member.getName(),
-                originPhoneNumber,
-                member.getPassedGenerationNumber(),
-                member.getRole(),
-                member.getPosition()
-        );
-    }
-}
diff --git a/src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java b/src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java
index 1f7f6a47..211e04f5 100644
--- a/src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java
+++ b/src/main/java/org/cotato/csquiz/api/quiz/dto/KingMemberInfo.java
@@ -4,7 +4,7 @@
 
 public record KingMemberInfo(
         Long memberId,
-        String memberName,
+        String name,
         String backFourNumber
 ) {
     public static KingMemberInfo from(Member member, String backFourNumber) {
diff --git a/src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java b/src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java
index f529cb5c..6039632f 100644
--- a/src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java
+++ b/src/main/java/org/cotato/csquiz/api/record/dto/RecordResponse.java
@@ -7,7 +7,7 @@ public record RecordResponse(
         Long recordId,
         Long ticketNumber,
         Long memberId,
-        String memberName,
+        String name,
         String backFourNumber,
         String reply
 ) {
diff --git a/src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java b/src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java
index 0f88c6d9..595d9d3e 100644
--- a/src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java
+++ b/src/main/java/org/cotato/csquiz/api/record/dto/ScorerResponse.java
@@ -6,7 +6,7 @@
 public record ScorerResponse(
         Long scorerId,
         Long memberId,
-        String memberName,
+        String name,
         String backFourNumber
 ) {
     public static ScorerResponse of(Scorer scorer, Member member, String backFourNumber) {