Merge branch 'main' into hotfix/delete-session

parkingkim · Apr 5, 2024 · dc2f500 · dc2f500
2 parents 686cfb1 + fa4c68d
commit dc2f500
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 12 deletions.
diff --git a/src/main/java/com/example/parking/application/member/MemberService.java b/src/main/java/com/example/parking/application/member/MemberService.java
@@ -24,7 +24,6 @@ public MemberService(MemberRepository memberRepository) {
     @Transactional
     public Long signup(MemberSignupRequest dto) {
         Member member = new Member(
-                dto.getName(),
                 dto.getEmail(),
                 dto.getNickname(),
                 new Password(dto.getPassword()));
@@ -68,7 +67,7 @@ public void deleteMember(Long memberId) {
     public MemberInfoResponse findMemberInfo(Long memberId) {
         Member member = memberRepository.getById(memberId);
 
-        return new MemberInfoResponse(member.getName(), member.getEmail());
+        return new MemberInfoResponse(member.getNickname(), member.getEmail());
     }
 
     @Transactional

diff --git a/src/main/java/com/example/parking/domain/member/Member.java b/src/main/java/com/example/parking/domain/member/Member.java
@@ -19,8 +19,6 @@ public class Member {
     @GeneratedValue(strategy = GenerationType.IDENTITY)
     private Long id;
 
-    private String name;
-
     @Column(unique = true)
     private String email;
 
@@ -31,8 +29,7 @@ public class Member {
 
     private Boolean deleted = Boolean.FALSE;
 
-    public Member(String name, String email, String nickname, Password password) {
-        this.name = name;
+    public Member(String email, String nickname, Password password) {
         this.email = email;
         this.nickname = nickname;
         this.password = password;

diff --git a/src/main/resources/db/migration/mysql/V4.0.0__drop_column_member_table.sql b/src/main/resources/db/migration/mysql/V4.0.0__drop_column_member_table.sql
@@ -0,0 +1,2 @@
+ALTER TABLE member
+    DROP COLUMN name;
diff --git a/src/test/java/com/example/parking/application/parking/ParkingServiceTest.java b/src/test/java/com/example/parking/application/parking/ParkingServiceTest.java
@@ -46,7 +46,9 @@ class ParkingServiceTest extends ContainerTest {
         List<Parking> parkings = List.of(parking);
         parkingService.saveAll(parkings);
 
-        Member member = new Member("하디", "email", "동혁", new Password("qwer1234"));
+
+        Member member = new Member( "email", "하디", new Password("qwer1234"));
+
         memberRepository.save(member);
 
         ReviewCreateRequest reviewCreateRequest = new ReviewCreateRequest(

diff --git a/src/test/java/com/example/parking/domain/member/MemberTest.java b/src/test/java/com/example/parking/domain/member/MemberTest.java
@@ -13,7 +13,7 @@ class MemberTest {
         // given
         String plainPassword = "password";
         Password password = new Password(plainPassword);
-        Member member = new Member("name", "[email protected]", "nickname", password);
+        Member member = new Member("[email protected]", "nickname", password);
 
         // when, then
         Assertions.assertThat(member.checkPassword(plainPassword)).isTrue();
@@ -24,7 +24,7 @@ class MemberTest {
         // given
         String plainPassword = "password";
         Password password = new Password(plainPassword);
-        Member member = new Member("name", "[email protected]", "nickname", password);
+        Member member = new Member("[email protected]", "nickname", password);
         String wrongPlainPassword = "wrongPassword";
 
         // when, then
@@ -36,7 +36,7 @@ class MemberTest {
         // given
         String previousPassword = "password";
         Password password = new Password(previousPassword);
-        Member member = new Member("name", "[email protected]", "nickname", password);
+        Member member = new Member("[email protected]", "nickname", password);
         String newPassword = "newPassword";
 
         // when
@@ -51,7 +51,7 @@ class MemberTest {
         // given
         String previousPassword = "password";
         Password password = new Password(previousPassword);
-        Member member = new Member("name", "[email protected]", "nickname", password);
+        Member member = new Member("[email protected]", "nickname", password);
         String newPassword = "newPassword";
 
         String wrongPreviousPassword = "wrongPassword";

diff --git a/src/test/java/com/example/parking/fake/BasicMemberRepository.java b/src/test/java/com/example/parking/fake/BasicMemberRepository.java
@@ -44,7 +44,6 @@ public List<Member> saveAndGet(int size) {
         LinkedList<Member> result = new LinkedList<>();
         for (int i = 0; i < size; i++) {
             Member member = new Member(
-                    "name" + i,
                     "testEmail" + i + "@email.com",
                     "nickname" + i,
                     new Password("password1234")