merge: feature/mypage into develop

Author: dnzp75

src/main/java/com/example/log4u/common/entity/BaseEntity.java

@@ -9,8 +9,15 @@
 import jakarta.persistence.Column;
 import jakarta.persistence.EntityListeners;
 import jakarta.persistence.MappedSuperclass;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
 import lombok.Getter;
+import lombok.NoArgsConstructor;
+import lombok.experimental.SuperBuilder;
 
+@SuperBuilder
+@NoArgsConstructor(access = AccessLevel.PROTECTED)
+@AllArgsConstructor(access = AccessLevel.PACKAGE)
 @Getter
 @MappedSuperclass
 @EntityListeners(AuditingEntityListener.class)
@@ -21,6 +28,5 @@ abstract public class BaseEntity {
 	private LocalDateTime createdAt;
 
 	@LastModifiedDate
-	@Column(nullable = false)
 	private LocalDateTime updatedAt;
 }

src/main/java/com/example/log4u/common/util/PageableUtil.java

@@ -0,0 +1,20 @@
+package com.example.log4u.common.util;
+
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.domain.SliceImpl;
+
+public class PageableUtil {
+	public static <T> Slice<T> checkAndCreateSlice(List<T> content, Pageable pageable) {
+		boolean hasNext = content.size() > pageable.getPageSize();
+
+		// 다음 페이지가 있으면 마지막 항목 제거
+		if (hasNext) {
+			content.remove(content.size() - 1);  // removeLast() 대신 인덱스로 처리
+		}
+
+		return new SliceImpl<>(content, pageable, hasNext);
+	}
+}

src/main/java/com/example/log4u/domain/diary/repository/CustomDiaryRepository.java

@@ -26,6 +26,12 @@ Slice<Diary> findByUserIdAndVisibilityInAndCursorId(
 		Pageable pageable
 	);
 
+	Slice<Diary> getLikeDiarySliceByUserId(
+		Long userId,
+		List<VisibilityType> visibilities,
+		Long cursorId,
+		Pageable pageable);
+
 	List<DiaryMarkerResponseDto> findDiariesInBounds(double south, double north, double west, double east);
 
 	List<Diary> findInBoundsByUserId(Long userId, double south, double north, double west, double east);

src/main/java/com/example/log4u/domain/diary/repository/CustomDiaryRepositoryImpl.java

@@ -14,6 +14,7 @@
 import com.example.log4u.domain.diary.VisibilityType;
 import com.example.log4u.domain.diary.entity.Diary;
 import com.example.log4u.domain.diary.entity.QDiary;
+import com.example.log4u.domain.like.entity.QLike;
 import com.example.log4u.domain.map.dto.response.DiaryMarkerResponseDto;
 import com.querydsl.core.types.OrderSpecifier;
 import com.querydsl.core.types.Projections;
@@ -29,14 +30,17 @@ public class CustomDiaryRepositoryImpl implements CustomDiaryRepository {
 
 	private final JPAQueryFactory queryFactory;
 
+	private final QDiary diary = QDiary.diary;
+	private final QLike like = QLike.like;
+
 	@Override
 	public Page<Diary> searchDiaries(
 		String keyword,
 		List<VisibilityType> visibilities,
 		SortType sort,
 		Pageable pageable
 	) {
-		QDiary diary = QDiary.diary;
+		// QDiary diary = QDiary.diary;
 
 		// 조건 생성
 		BooleanExpression condition = createCondition(diary, keyword, visibilities, null);
@@ -138,6 +142,33 @@ private Slice<Diary> checkAndCreateSlice(List<Diary> content, Pageable pageable)
 		return new SliceImpl<>(content, pageable, hasNext);
 	}
 
+	@Override
+	public Slice<Diary> getLikeDiarySliceByUserId(
+		Long userId,
+		List<VisibilityType> visibilities,
+		Long cursorId,
+		Pageable pageable) {
+		QDiary diary = QDiary.diary;
+
+		// 조건 생성
+		BooleanExpression condition = createCondition(diary, null, visibilities, userId);
+
+		// limit + 1로 다음 페이지 존재 여부 확인
+		List<Diary> content = queryFactory
+			.selectFrom(diary)
+			.innerJoin(like)
+			.on(like.diaryId.eq(diary.diaryId))
+			.where(like.userId.eq(userId)
+				.and(condition)
+				.and(like.likeId.lt(cursorId)))
+			.orderBy(like.createdAt.desc())
+			.limit(pageable.getPageSize() + 1)
+			.fetch();
+
+		// 다음 페이지 여부를 계산하여 반환
+		return checkAndCreateSlice(content, pageable);
+	}
+
 	@Override
 	public List<DiaryMarkerResponseDto> findDiariesInBounds(double south, double north, double west, double east) {
 		QDiary d = QDiary.diary;

src/main/java/com/example/log4u/domain/diary/service/DiaryService.java

@@ -218,4 +218,44 @@ public void checkDiaryExists(Long diaryId) {
 			throw new NotFoundDiaryException();
 		}
 	}
+
+	@Transactional(readOnly = true)
+	public PageResponse<DiaryResponseDto> getMyDiariesByCursor(Long userId, VisibilityType visibilityType,
+		Long cursorId, int size) {
+		List<VisibilityType> visibilities =
+			visibilityType == null ? List.of(VisibilityType.PUBLIC, VisibilityType.PRIVATE, VisibilityType.FOLLOWER) :
+				List.of(visibilityType);
+
+		Slice<Diary> diaries = diaryRepository.findByUserIdAndVisibilityInAndCursorId(
+			userId,
+			visibilities,
+			cursorId != null ? cursorId : Long.MAX_VALUE,
+			PageRequest.of(0, size)
+		);
+
+		Slice<DiaryResponseDto> dtoSlice = mapToDtoSlice(diaries);
+
+		Long nextCursor = !dtoSlice.isEmpty() ? dtoSlice.getContent().getLast().diaryId() : null;
+
+		return PageResponse.of(dtoSlice, nextCursor);
+	}
+
+	@Transactional(readOnly = true)
+	public PageResponse<DiaryResponseDto> getLikeDiariesByCursor(Long userId, Long targetUserId, Long cursorId,
+		int size) {
+		List<VisibilityType> visibilities = determineAccessibleVisibilities(userId, targetUserId);
+
+		Slice<Diary> diaries = diaryRepository.getLikeDiarySliceByUserId(
+			targetUserId,
+			visibilities,
+			cursorId != null ? cursorId : Long.MAX_VALUE,
+			PageRequest.of(0, size)
+		);
+
+		Slice<DiaryResponseDto> dtoSlice = mapToDtoSlice(diaries);
+
+		Long nextCursor = !dtoSlice.isEmpty() ? dtoSlice.getContent().getLast().diaryId() : null;
+
+		return PageResponse.of(dtoSlice, nextCursor);
+	}
 }

src/main/java/com/example/log4u/domain/follow/repository/FollowQuerydsl.java

@@ -0,0 +1,69 @@
+package com.example.log4u.domain.follow.repository;
+
+import java.util.List;
+
+import org.springframework.data.domain.Pageable;
+import org.springframework.data.domain.Slice;
+import org.springframework.data.jpa.repository.support.QuerydslRepositorySupport;
+import org.springframework.stereotype.Repository;
+
+import com.example.log4u.common.util.PageableUtil;
+import com.example.log4u.domain.follow.entitiy.Follow;
+import com.example.log4u.domain.follow.entitiy.QFollow;
+import com.example.log4u.domain.user.dto.UserThumbnailResponseDto;
+import com.example.log4u.domain.user.entity.QUser;
+import com.querydsl.core.BooleanBuilder;
+import com.querydsl.core.types.Projections;
+import com.querydsl.core.types.dsl.NumberPath;
+
+@Repository
+public class FollowQuerydsl extends QuerydslRepositorySupport {
+	private final QFollow follow = QFollow.follow;
+	private final QUser user = QUser.user;
+
+	public FollowQuerydsl() {
+		super(Follow.class);
+	}
+
+	private NumberPath<Long> getNumberPath(boolean isFollowerQuery) {
+		return isFollowerQuery ? follow.followerId : follow.followingId;
+	}
+
+	private BooleanBuilder getBooleanBuilder(boolean isFollowerQuery, Long userId, Long cursorId) {
+		BooleanBuilder builder = new BooleanBuilder();
+		builder.and(getNumberPath(isFollowerQuery).eq(userId));
+
+		if (cursorId != null) {
+			builder.and(follow.id.lt(cursorId));
+		}
+
+		return builder;
+	}
+
+	private List<UserThumbnailResponseDto> getContent(boolean isFollowerQuery, Long userId, Long cursorId) {
+		BooleanBuilder builder = getBooleanBuilder(isFollowerQuery, userId, cursorId);
+
+		return from(follow)
+			.select(Projections.constructor(UserThumbnailResponseDto.class,
+				getNumberPath(!isFollowerQuery),
+				user.nickname,
+				user.nickname))
+			.where(builder)
+			.distinct()
+			.fetch();
+	}
+
+	//내 팔로워 아이디 슬라이스
+	public Slice<UserThumbnailResponseDto> getFollowerSliceByUserId(Long userId, Long cursorId, Pageable pageable) {
+		boolean isFollowerQuery = true;
+		List<UserThumbnailResponseDto> content = getContent(isFollowerQuery, userId, cursorId);
+		return PageableUtil.checkAndCreateSlice(content, pageable);
+	}
+
+	// 내가 팔로잉하는 아이디 슬라이스
+	public Slice<UserThumbnailResponseDto> getFollowingSliceByUserId(Long userId, Long cursorId, Pageable pageable) {
+		boolean isFollowerQuery = false;
+		List<UserThumbnailResponseDto> content = getContent(isFollowerQuery, userId, cursorId);
+		return PageableUtil.checkAndCreateSlice(content, pageable);
+	}
+}

src/main/java/com/example/log4u/domain/reports/controller/ReportsController.java

@@ -2,12 +2,14 @@
 
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
 import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.PostMapping;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RestController;
 
+import com.example.log4u.common.oauth2.dto.CustomOAuth2User;
 import com.example.log4u.domain.reports.dto.ReportCreateRequestDto;
 import com.example.log4u.domain.reports.service.ReportService;
 
@@ -21,18 +23,22 @@ public class ReportsController {
 
 	@PostMapping("/diaries/{diaryId}")
 	public ResponseEntity<Void> createReportForDiary(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
 		@RequestBody ReportCreateRequestDto reportCreateRequestDto,
-		@PathVariable Long diaryId) {
-		long reporterId = 1L; // SecurityContextHolder 에서 온다고 가정
+		@PathVariable Long diaryId
+	) {
+		long reporterId = customOAuth2User.getUserId();
 		reportService.createDiaryReport(reporterId, reportCreateRequestDto, diaryId);
 		return new ResponseEntity<>(HttpStatus.CREATED);
 	}
 
 	@PostMapping("/comments/{commentId}")
 	public ResponseEntity<Void> createReport(
+		@AuthenticationPrincipal CustomOAuth2User customOAuth2User,
 		@RequestBody ReportCreateRequestDto reportCreateRequestDto,
-		@PathVariable Long commentId) {
-		long reporterId = 1L;
+		@PathVariable Long commentId
+	) {
+		long reporterId = customOAuth2User.getUserId();
 		reportService.createCommentReport(reporterId, reportCreateRequestDto, commentId);
 		return new ResponseEntity<>(HttpStatus.CREATED);
 	}

src/main/java/com/example/log4u/domain/subscription/PaymentProvider.java

@@ -0,0 +1,7 @@
+package com.example.log4u.domain.subscription;
+
+public enum PaymentProvider {
+	TOSS,
+	KAKAO,
+	NAVER
+}

src/main/java/com/example/log4u/domain/subscription/PaymentStatus.java

@@ -0,0 +1,7 @@
+package com.example.log4u.domain.subscription;
+
+public enum PaymentStatus {
+	SUCCESS,   // 결제 완료
+	FAILED,    // 결제 실패
+	REFUNDED   // 환불 완료
+}

src/main/java/com/example/log4u/domain/subscription/dto/SubscriptionResponseDto.java

@@ -0,0 +1,20 @@
+package com.example.log4u.domain.subscription.dto;
+
+import java.time.LocalDateTime;
+
+import com.example.log4u.domain.subscription.PaymentProvider;
+
+import jakarta.annotation.Nullable;
+import lombok.Builder;
+
+@Builder
+public record SubscriptionResponseDto(
+	boolean isSubscriptionActive,
+
+	@Nullable
+	PaymentProvider paymentProvider,
+
+	@Nullable
+	LocalDateTime startDate
+) {
+}