fix: 유저 프로필에서 scrap 정보를 올바르게 가져오도록 수정한다. (#133)

Author: funnysunny08

src/main/java/org/runnect/server/course/repository/CourseRepository.java

@@ -25,7 +25,7 @@ public interface CourseRepository extends JpaRepository<Course, Long> {
     @Query("select c from Course c join fetch c.runnectUser where c.runnectUser.id = :userId and c.isPrivate = true and c.deletedAt = null order by c.createdAt desc")
     List<Course> findCourseByUserIdOnlyPrivate(@Param("userId") Long userId);
 
-    @Query("select c from Course c where c.runnectUser = :runnectUser and c.isPrivate = false and c.deletedAt = null order by c.createdAt desc")
+    @Query("select c from Course c join fetch c.publicCourse where c.runnectUser = :runnectUser and c.isPrivate = false and c.deletedAt = null order by c.createdAt desc")
     List<Course> findCoursesForUserProfile(@Param("runnectUser") RunnectUser runnectUser);
 
     List<Course> findCoursesByRunnectUserAndIsPrivateIsFalseAndDeletedAtIsNull(RunnectUser runnectUser);

src/main/java/org/runnect/server/scrap/repository/ScrapRepository.java

@@ -25,6 +25,9 @@ public interface ScrapRepository extends Repository<Scrap, Long> {
 
     Boolean existsByPublicCourseAndRunnectUser(PublicCourse publicCourse, RunnectUser runnectUser);
 
+    @Query("select s.publicCourse.id from Scrap s where s.runnectUser = :runnectUser and s.scrapTF = true")
+    List<Long> getScrappedTruePublicCourseIds(@Param("runnectUser") RunnectUser runnectUser);
+
     // DELETE
     Long deleteByPublicCourseIn(Collection<PublicCourse> publicCourses);
 

src/main/java/org/runnect/server/user/service/UserService.java

@@ -7,16 +7,15 @@
 import org.runnect.server.common.constant.ErrorStatus;
 import org.runnect.server.common.exception.UnauthorizedException;
 import org.runnect.server.course.repository.CourseRepository;
-import org.runnect.server.user.dto.request.UpdateUserNicknameRequestDto;
 import org.runnect.server.publicCourse.entity.PublicCourse;
 import org.runnect.server.scrap.repository.ScrapRepository;
+import org.runnect.server.user.dto.request.UpdateUserNicknameRequestDto;
+import org.runnect.server.user.dto.response.DeleteUserResponseDto;
 import org.runnect.server.user.dto.response.MyPageResponseDto;
 import org.runnect.server.user.dto.response.UpdateUserNicknameResponseDto;
 import org.runnect.server.user.dto.response.UserProfileResponseDto;
 import org.runnect.server.user.dto.response.UserProfileResponseDto.PublicCourseResponse;
 import org.runnect.server.user.dto.response.UserProfileResponseDto.UserProfile;
-import org.runnect.server.user.dto.response.DeleteUserResponseDto;
-
 import org.runnect.server.user.entity.RunnectUser;
 import org.runnect.server.user.entity.SocialType;
 import org.runnect.server.user.exception.userException.DuplicateNicknameException;
@@ -72,13 +71,15 @@ public UserProfileResponseDto getUserProfile(Long profileUserId, Long requestUse
             .orElseThrow(() -> new NotFoundUserException(ErrorStatus.NOT_FOUND_USER_EXCEPTION,
                 ErrorStatus.NOT_FOUND_USER_EXCEPTION.getMessage()));
 
+        List<Long> scrappedPublicCourseIds = scrapRepository.getScrappedTruePublicCourseIds(requestUser);
+
         List<PublicCourse> publicCourses = courseRepository.findCoursesForUserProfile(profileUser)
                 .stream().map(course -> course.getPublicCourse()).collect(Collectors.toList());
 
         List<PublicCourseResponse> publicCourseResponses = publicCourses.stream()
             .map(publicCourse ->
                 PublicCourseResponse.of(publicCourse, publicCourse.getCourse(),
-                    scrapRepository.existsByPublicCourseAndRunnectUser(publicCourse, requestUser)))
+                    scrappedPublicCourseIds.contains(publicCourse.getId())))
             .collect(Collectors.toList());
 
         return UserProfileResponseDto.of(userProfile, publicCourseResponses);