Merge branch 'fix/68_memberNickname' into 'develop/BE'

fix: course 관련, memberNickname 통일 See merge request s11-bigdata-recom-sub1/S11P21B304!132
lso401 · Oct 9, 2024 · db21ca2 · db21ca2
2 parents d05dfa2 + ac58d92
commit db21ca2
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/BackEnd/src/main/java/chuchu/runnerway/course/dto/response/UserDetailResponseDto.java b/BackEnd/src/main/java/chuchu/runnerway/course/dto/response/UserDetailResponseDto.java
@@ -24,6 +24,6 @@ public class UserDetailResponseDto {
     private double lat;
     private double lng;
     private CourseImageDto courseImage;
-    private String nickname;
+    private String memberNickname;
     private Long memberId;
 }
diff --git a/BackEnd/src/main/java/chuchu/runnerway/course/dto/response/UserListResponseDto.java b/BackEnd/src/main/java/chuchu/runnerway/course/dto/response/UserListResponseDto.java
@@ -17,5 +17,5 @@ public class UserListResponseDto {
     private double lat;
     private double lng;
     private CourseImageDto courseImage;
-    private String nickname;
+    private String memberNickname;
 }
diff --git a/BackEnd/src/main/java/chuchu/runnerway/course/model/service/UserCourseServiceImpl.java b/BackEnd/src/main/java/chuchu/runnerway/course/model/service/UserCourseServiceImpl.java
@@ -67,7 +67,7 @@ public List<UserListResponseDto> findAllUserCourse(double lat, double lng) {
             .map(course -> {
                 // Course -> UserListResponseDto 변환
                 UserListResponseDto dto = mapper.map(course, UserListResponseDto.class);
-                dto.setNickname(course.getMember().getNickname());
+                dto.setMemberNickname((course.getMember().getNickname()));
                 // calcDistance 함수를 사용해 사용자와 코스 간의 거리 계산
                 double distance = calcDistance(lat, lng, course.getLat(), course.getLng());
 
@@ -89,7 +89,7 @@ public UserDetailResponseDto getUserCourse(Long courseId) {
         if(course == null) return null;
 
         UserDetailResponseDto dto = mapper.map(course, UserDetailResponseDto.class);
-        dto.setNickname(course.getMember().getNickname());
+        dto.setMemberNickname(course.getMember().getNickname());
         dto.setMemberId(course.getMember().getMemberId());
         return dto;
     }
@@ -182,7 +182,7 @@ public List<UserListResponseDto> findPopularAllUserCourse(double lat, double lng
             .map(course -> {
                 // Course -> UserListResponseDto 변환
                 UserListResponseDto dto = mapper.map(course, UserListResponseDto.class);
-                dto.setNickname(course.getMember().getNickname());
+                dto.setMemberNickname(course.getMember().getNickname());
                 // calcDistance 함수를 사용해 사용자와 코스 간의 거리 계산
                 double distance = calcDistance(lat, lng, course.getLat(), course.getLng());
 
@@ -203,7 +203,7 @@ public List<UserListResponseDto> findPopularLatelyUserCourse(double lat, double
             .map(course -> {
                 // Course -> UserListResponseDto 변환
                 UserListResponseDto dto = mapper.map(course, UserListResponseDto.class);
-                dto.setNickname(course.getMember().getNickname());
+                dto.setMemberNickname(course.getMember().getNickname());
                 // calcDistance 함수를 사용해 사용자와 코스 간의 거리 계산
                 double distance = calcDistance(lat, lng, course.getLat(), course.getLng());