fix: merge conflict 오류 수정

coffee-meet · Oct 25, 2023 · 474fb8e · 474fb8e
1 parent dbf93fe
commit 474fb8e
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/main/java/coffeemeet/server/user/dto/MyProfileResponse.java b/src/main/java/coffeemeet/server/user/dto/MyProfileResponse.java
@@ -30,8 +30,8 @@ public static MyProfileResponse of(User user, List<Interest> interests) {
         user.getProfile().getNickname(),
         user.getProfile().getEmail().getEmail(),
         user.getProfile().getProfileImageUrl(),
-        user.getProfile().getBirth().getYear(),
-        user.getProfile().getBirth().getDay(),
+        user.getProfile().getBirth().getBirthYear(),
+        user.getProfile().getBirth().getBirthDay(),
         user.getReportInfo().getReportedCount(),
         user.getReportInfo().getSanctionPeriod(),
         user.getCertification().getCompanyEmail().getCompanyEmail(),

diff --git a/src/test/java/coffeemeet/server/common/fixture/entity/UserFixture.java b/src/test/java/coffeemeet/server/common/fixture/entity/UserFixture.java
@@ -22,8 +22,8 @@ public static User user() {
 
   private static Birth birth() {
     return Instancio.of(Birth.class)
-        .generate(field(Birth::getYear), gen -> gen.ints().range(1000, 9999))
-        .generate(field(Birth::getDay), gen -> gen.ints().range(1000, 9999))
+        .generate(field(Birth::getBirthYear), gen -> gen.ints().range(1000, 9999))
+        .generate(field(Birth::getBirthDay), gen -> gen.ints().range(1000, 9999))
         .create();
   }