Feat/#41 일반 유저 홈화면 조회 기능 구현

src/main/java/com/campus/campus/domain/councilpost/application/dto/response/GetActivePartnershipListForUserResponse.java

@@ -0,0 +1,18 @@
+package com.campus.campus.domain.councilpost.application.dto.response;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record GetActivePartnershipListForUserResponse(
+	@Schema(description = "제휴글 id", example = "1")
+	Long postId,
+
+	@Schema(description = "제휴글 이름", example = "투썸 제휴")
+	String title,
+
+	@Schema(description = "제휴 장소", example = "투썸 플레이스")
+	String place,
+
+	@Schema(description = "썸네일 image url", example = "https://www.example.com.png")
+	String thumbnailImageUrl
+) {
+}

src/main/java/com/campus/campus/domain/councilpost/application/dto/response/GetPostListForCouncilResponse.java

@@ -0,0 +1,32 @@
+package com.campus.campus.domain.councilpost.application.dto.response;
+
+import java.time.LocalDateTime;
+
+import com.campus.campus.domain.councilpost.domain.entity.PostCategory;
+import com.campus.campus.domain.councilpost.domain.entity.ThumbnailIcon;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record GetPostListForCouncilResponse(
+	@Schema(description = "게시글 id", example = "1")
+	Long postId,
+
+	@Schema(description = "게시글 카테고리", example = "EVENT")
+	PostCategory category,
+
+	@Schema(description = "게시글 이름", example = "중간고사 간식생사")
+	String title,
+
+	@Schema(description = "장소", example = "310관 1층")
+	String place,
+
+	@Schema(description = "시간(끝나는 시간 or 행사날짜", example = "2026-01-10T18:00:00")
+	LocalDateTime dateTime,
+
+	@Schema(description = "썸네일 image url", example = "https://www.example.com.png")
+	String thumbnailImageUrl,
+
+	@Schema(description = "썸네일 아이콘", example = "FOOD")
+	ThumbnailIcon thumbnailIcon
+) {
+}

src/main/java/com/campus/campus/domain/councilpost/application/dto/response/GetUpcomingEventListForCouncilResponse.java

@@ -0,0 +1,29 @@
+package com.campus.campus.domain.councilpost.application.dto.response;
+
+import java.time.LocalDateTime;
+
+import com.campus.campus.domain.councilpost.domain.entity.PostCategory;
+import com.campus.campus.domain.councilpost.domain.entity.ThumbnailIcon;
+
+import io.swagger.v3.oas.annotations.media.Schema;
+
+public record GetUpcomingEventListForCouncilResponse(
+	@Schema(description = "게시글 id", example = "1")
+	Long postId,
+
+	@Schema(description = "게시글 카테고리", example = "EVENT")
+	PostCategory category,
+
+	@Schema(description = "게시글 이름", example = "중간고사 간식생사")
+	String title,
+
+	@Schema(description = "장소", example = "310관 1층")
+	String place,
+
+	@Schema(description = "시간(끝나는 시간 or 행사날짜", example = "2026-01-10T18:00:00")
+	LocalDateTime dateTime,
+
+	@Schema(description = "썸네일 아이콘", example = "FOOD")
+	ThumbnailIcon thumbnailIcon
+) {
+}

src/main/java/com/campus/campus/domain/councilpost/application/mapper/StudentCouncilPostMapper.java

@@ -7,6 +7,9 @@
 import org.springframework.stereotype.Component;
 
 import com.campus.campus.domain.council.domain.entity.StudentCouncil;
+import com.campus.campus.domain.councilpost.application.dto.response.GetPostListForCouncilResponse;
+import com.campus.campus.domain.councilpost.application.dto.response.GetUpcomingEventListForCouncilResponse;
+import com.campus.campus.domain.councilpost.application.dto.response.GetActivePartnershipListForUserResponse;
 import com.campus.campus.domain.councilpost.application.dto.response.PostListItemResponse;
 import com.campus.campus.domain.councilpost.application.dto.request.PostRequest;
 import com.campus.campus.domain.councilpost.application.dto.response.PostResponse;
@@ -19,7 +22,7 @@
 @RequiredArgsConstructor
 public class StudentCouncilPostMapper {
 
-	public PostListItemResponse toPostListItemResponse(StudentCouncilPost post, Long currentUserId) {
+	public PostListItemResponse toPostListItemResponse(StudentCouncilPost post, Long councilId) {
 		return new PostListItemResponse(
 			post.getId(),
 			post.getCategory(),
@@ -30,7 +33,39 @@ public PostListItemResponse toPostListItemResponse(StudentCouncilPost post, Long
 				: post.getEndDateTime(),
 			post.getThumbnailImageUrl(),
 			post.getThumbnailIcon(),
-			post.isWrittenByCouncil(currentUserId)
+			post.isWrittenByCouncil(councilId)
+		);
+	}
+
+	public GetPostListForCouncilResponse toGetPostListForCouncilResponse(StudentCouncilPost post) {
+		return new GetPostListForCouncilResponse(
+			post.getId(),
+			post.getCategory(),
+			post.getTitle(),
+			post.getPlace(),
+			post.isEvent() ? post.getStartDateTime() : post.getEndDateTime(),
+			post.getThumbnailImageUrl(),
+			post.getThumbnailIcon()
+		);
+	}
+
+	public GetUpcomingEventListForCouncilResponse toGetUpcomingEventListForCouncilResponse(StudentCouncilPost post) {
+		return new GetUpcomingEventListForCouncilResponse(
+			post.getId(),
+			post.getCategory(),
+			post.getTitle(),
+			post.getPlace(),
+			post.getStartDateTime(),
+			post.getThumbnailIcon()
+		);
+	}
+
+	public GetActivePartnershipListForUserResponse toGetActivePartnershipListForUserResponse(StudentCouncilPost post) {
+		return new GetActivePartnershipListForUserResponse(
+			post.getId(),
+			post.getTitle(),
+			post.getPlace(),
+			post.getThumbnailImageUrl()
 		);
 	}
 
@@ -59,7 +94,8 @@ public PostResponse toPostResponse(StudentCouncilPost post, List<String> images,
 		return builder.build();
 	}
 
-	public StudentCouncilPost createStudentCouncilPost(StudentCouncil writer, PostRequest dto, LocalDateTime startDateTime,
+	public StudentCouncilPost createStudentCouncilPost(StudentCouncil writer, PostRequest dto,
+		LocalDateTime startDateTime,
 		LocalDateTime endDateTime) {
 		return StudentCouncilPost.builder()
 			.writer(writer)

src/main/java/com/campus/campus/domain/councilpost/application/service/UserPostService.java → src/main/java/com/campus/campus/domain/councilpost/application/service/StudentCouncilPostForUserService.java

@@ -12,6 +12,7 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.campus.campus.domain.council.domain.entity.CouncilType;
+import com.campus.campus.domain.councilpost.application.dto.response.GetActivePartnershipListForUserResponse;
 import com.campus.campus.domain.councilpost.application.dto.response.PostListItemResponse;
 import com.campus.campus.domain.councilpost.application.dto.response.PostResponse;
 import com.campus.campus.domain.councilpost.application.exception.CollegeNotSetException;
@@ -34,7 +35,8 @@
 @Service
 @RequiredArgsConstructor
 @Slf4j
-public class UserPostService {
+@Transactional(readOnly = true)
+public class StudentCouncilPostForUserService {
 
 	private static final int UPCOMING_HOURS = 72;
 	private static final ZoneId KST = ZoneId.of("Asia/Seoul");
@@ -44,7 +46,6 @@ public class UserPostService {
 	private final UserRepository userRepository;
 	private final PostAccessPolicy postAccessPolicy;
 
-	@Transactional(readOnly = true)
 	public Page<PostListItemResponse> findSchoolPosts(PostCategory category, int page, int size, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -56,7 +57,6 @@ public Page<PostListItemResponse> findSchoolPosts(PostCategory category, int pag
 		return posts.map(post -> studentCouncilPostMapper.toPostListItemResponse(post, userId));
 	}
 
-	@Transactional(readOnly = true)
 	public Page<PostListItemResponse> findCollegePosts(PostCategory category, int page, int size, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -72,7 +72,6 @@ public Page<PostListItemResponse> findCollegePosts(PostCategory category, int pa
 		return posts.map(post -> studentCouncilPostMapper.toPostListItemResponse(post, userId));
 	}
 
-	@Transactional(readOnly = true)
 	public Page<PostListItemResponse> findMajorPosts(PostCategory category, int page, int size, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -84,7 +83,6 @@ public Page<PostListItemResponse> findMajorPosts(PostCategory category, int page
 		return posts.map(post -> studentCouncilPostMapper.toPostListItemResponse(post, userId));
 	}
 
-	@Transactional(readOnly = true)
 	public Page<PostListItemResponse> findUpcomingSchoolEvents72h(int page, int size, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -105,7 +103,6 @@ public Page<PostListItemResponse> findUpcomingSchoolEvents72h(int page, int size
 		return posts.map(post -> studentCouncilPostMapper.toPostListItemResponse(post, userId));
 	}
 
-	@Transactional(readOnly = true)
 	public Page<PostListItemResponse> findUpcomingCollegeEvents72h(int page, int size, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -134,7 +131,6 @@ public Page<PostListItemResponse> findUpcomingCollegeEvents72h(int page, int siz
 		return posts.map(post -> studentCouncilPostMapper.toPostListItemResponse(post, userId));
 	}
 
-	@Transactional(readOnly = true)
 	public Page<PostListItemResponse> findUpcomingMajorEvents72h(int page, int size, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -163,7 +159,6 @@ public Page<PostListItemResponse> findUpcomingMajorEvents72h(int page, int size,
 		return posts.map(post -> studentCouncilPostMapper.toPostListItemResponse(post, userId));
 	}
 
-	@Transactional(readOnly = true)
 	public PostResponse findById(Long postId, Long userId) {
 		User user = userRepository.findByIdWithAcademicInfo(userId).orElseThrow(UserNotFoundException::new);
 
@@ -180,4 +175,42 @@ public PostResponse findById(Long postId, Long userId) {
 
 		return studentCouncilPostMapper.toPostResponse(post, imageUrls, userId);
 	}
+
+	public List<GetActivePartnershipListForUserResponse> findActivePartnershipForUser(CouncilType councilType,
+		Long userId) {
+		User user = userRepository.findByIdAndDeletedAtIsNull(userId)
+			.orElseThrow(UserNotFoundException::new);
+
+		if (user.getSchool() == null) {
+			return List.of();
+		}
+
+		Long schoolId = user.getSchool().getSchoolId();
+		Long collegeId = null;
+		Long majorId = null;
+
+		if (CouncilType.COLLEGE_COUNCIL.equals(councilType)) {
+			if (user.getCollege() == null) {
+				return List.of();
+			}
+			collegeId = user.getCollege().getCollegeId();
+		}
+
+		if (CouncilType.MAJOR_COUNCIL.equals(councilType)) {
+			if (user.getMajor() == null) {
+				return List.of();
+			}
+			majorId = user.getMajor().getMajorId();
+		}
+
+		LocalDateTime now = LocalDateTime.now();
+		Pageable partnershipCount = PageRequest.of(0, 3);
+
+		List<StudentCouncilPost> partnerships = studentCouncilPostRepository.findRandomActivePartnerships(schoolId,
+			councilType, PostCategory.PARTNERSHIP, collegeId, majorId, now, partnershipCount);
+
+		return partnerships.stream()
+			.map(studentCouncilPostMapper::toGetActivePartnershipListForUserResponse)
+			.toList();
+	}
 }

src/main/java/com/campus/campus/domain/councilpost/application/service/StudentCouncilPostService.java

@@ -12,10 +12,13 @@
 import org.springframework.transaction.annotation.Transactional;
 
 import com.campus.campus.domain.council.application.exception.StudentCouncilNotFoundException;
+import com.campus.campus.domain.council.domain.entity.CouncilType;
 import com.campus.campus.domain.council.domain.entity.StudentCouncil;
 import com.campus.campus.domain.council.domain.repository.StudentCouncilRepository;
+import com.campus.campus.domain.councilpost.application.dto.response.GetActivePartnershipListForUserResponse;
+import com.campus.campus.domain.councilpost.application.dto.response.GetPostListForCouncilResponse;
+import com.campus.campus.domain.councilpost.application.dto.response.GetUpcomingEventListForCouncilResponse;
 import com.campus.campus.domain.councilpost.application.dto.response.NormalizedDateTime;
-import com.campus.campus.domain.councilpost.application.dto.response.PostListItemResponse;
 import com.campus.campus.domain.councilpost.application.dto.request.PostRequest;
 import com.campus.campus.domain.councilpost.application.dto.response.PostResponse;
 import com.campus.campus.domain.councilpost.application.exception.NotPostWriterException;
@@ -29,6 +32,9 @@
 import com.campus.campus.domain.councilpost.domain.entity.StudentCouncilPost;
 import com.campus.campus.domain.councilpost.domain.repository.PostImageRepository;
 import com.campus.campus.domain.councilpost.domain.repository.StudentCouncilPostRepository;
+import com.campus.campus.domain.user.application.exception.UserNotFoundException;
+import com.campus.campus.domain.user.domain.entity.User;
+import com.campus.campus.domain.user.domain.repository.UserRepository;
 import com.campus.campus.global.oci.application.service.PresignedUrlService;
 
 import lombok.RequiredArgsConstructor;
@@ -39,6 +45,7 @@
 @RequiredArgsConstructor
 public class StudentCouncilPostService {
 
+	private final UserRepository userRepository;
 	private final StudentCouncilPostRepository postRepository;
 	private final StudentCouncilRepository studentCouncilRepository;
 	private final PostImageRepository postImageRepository;
@@ -100,34 +107,67 @@ public PostResponse findById(Long postId, Long currentUserId) {
 	}
 
 	@Transactional(readOnly = true)
-	public Page<PostListItemResponse> findAll(PostCategory category, int page, int size, Long currentUserId) {
-		Pageable pageable = PageRequest.of(Math.max(page - 1, 0), size, Sort.by(Sort.Direction.DESC, "createdAt"));
+	public Page<GetPostListForCouncilResponse> findPostListByCouncilTypeForCouncil(Long councilId,
+		PostCategory category,
+		CouncilType councilType, int page, int size) {
+		StudentCouncil studentCouncil = studentCouncilRepository
+			.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
+			.orElseThrow(StudentCouncilNotFoundException::new);
 
-		Page<StudentCouncilPost> posts = (category == null)
-			? postRepository.findAll(pageable)
-			: postRepository.findAllByCategory(category, pageable);
+		Long schoolId = studentCouncil.getSchool().getSchoolId();
+		Long collegeId = CouncilType.COLLEGE_COUNCIL.equals(councilType)
+			&& studentCouncil.getCollege() != null
+			? studentCouncil.getCollege().getCollegeId()
+			: null;
+		Long majorId = CouncilType.MAJOR_COUNCIL.equals(councilType)
+			&& studentCouncil.getMajor() != null
+			? studentCouncil.getMajor().getMajorId()
+			: null;
+
+		Sort sort;
+		if (category == PostCategory.EVENT) {
+			sort = Sort.by(Sort.Direction.ASC, "startDateTime");
+		} else {
+			sort = Sort.by(Sort.Direction.ASC, "endDateTime");
+		}
 
-		return posts.map(post ->
-			studentCouncilPostMapper.toPostListItemResponse(post, currentUserId)
-		);
+		Pageable pageable = PageRequest.of(Math.max(page - 1, 0), size, sort);
+
+		LocalDateTime now = LocalDateTime.now();
+
+		Page<StudentCouncilPost> posts = postRepository.findPostsBySchoolAndFilters(schoolId, councilType, category,
+			collegeId, majorId, now, pageable);
+
+		return posts.map(studentCouncilPostMapper::toGetPostListForCouncilResponse);
 	}
 
 	@Transactional(readOnly = true)
-	public Page<PostListItemResponse> findUpcomingEvents(int page, int size, Long currentUserId) {
-		Pageable pageable = PageRequest.of(
-			Math.max(page - 1, 0),
-			size,
-			Sort.by(Sort.Direction.ASC, "startDateTime")
-		);
+	public Page<GetUpcomingEventListForCouncilResponse> findUpcomingEventsByCouncilTypeForCouncil(Long councilId,
+		CouncilType councilType, int page, int size) {
+		Pageable pageable = PageRequest.of(Math.max(page - 1, 0), size,
+			Sort.by(Sort.Direction.ASC, "startDateTime"));
+
+		StudentCouncil studentCouncil = studentCouncilRepository
+			.findByIdAndManagerApprovedIsTrueAndDeletedAtIsNull(councilId)
+			.orElseThrow(StudentCouncilNotFoundException::new);
+
+		Long schoolId = studentCouncil.getSchool().getSchoolId();
+		Long collegeId = CouncilType.COLLEGE_COUNCIL.equals(councilType)
+			&& studentCouncil.getCollege() != null
+			? studentCouncil.getCollege().getCollegeId()
+			: null;
+		Long majorId = CouncilType.MAJOR_COUNCIL.equals(councilType)
+			&& studentCouncil.getMajor() != null
+			? studentCouncil.getMajor().getMajorId()
+			: null;
 
 		LocalDateTime now = LocalDateTime.now();
 		LocalDateTime limit = now.plusHours(UPCOMING_EVENT_WINDOW_HOURS);
 
-		Page<StudentCouncilPost> posts = postRepository.findUpcomingEvents(PostCategory.EVENT, now, limit, pageable);
+		Page<StudentCouncilPost> posts = postRepository.findUpcomingEventsBySchoolAndFilters(schoolId, councilType,
+			PostCategory.EVENT, collegeId, majorId, now, limit, pageable);
 
-		return posts.map(post ->
-			studentCouncilPostMapper.toPostListItemResponse(post, currentUserId)
-		);
+		return posts.map(studentCouncilPostMapper::toGetUpcomingEventListForCouncilResponse);
 	}
 
 	@Transactional