v2.1.2

main/src/main/java/org/sopt/makers/crew/main/advertisement/dto/AdvertisementsGetResponseDto.java

@@ -1,18 +1,54 @@
 package org.sopt.makers.crew.main.advertisement.dto;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
+import org.sopt.makers.crew.main.entity.advertisement.Advertisement;
+
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;
 
-@Schema(name = "AdvertisementGetResponseDto", description = "광고 구좌 조회 응답 Dto")
+@Schema(name = "AdvertisementsGetResponseDto", description = "광고 구좌 조회 응답 Dto")
 public record AdvertisementsGetResponseDto(
-	@Schema(description = "광고 구좌 이미지 객체", example = "")
+	@Schema(description = "광고 구좌 이미지 리스트", example = "")
 	@NotNull
 	List<AdvertisementGetDto> advertisements
 ) {
-	public static AdvertisementsGetResponseDto of(List<AdvertisementGetDto> advertisements) {
+	@Schema(name = "AdvertisementGetDto", description = "광고 구좌 이미지 Dto")
+	public record AdvertisementGetDto(
+
+		@Schema(description = "광고 id", example = "3")
+		@NotNull
+		Integer advertisementId,
+
+		@Schema(description = "[Desktop] 광고 구좌 이미지 url", example = "[pc 버전 url 형식]")
+		@NotNull
+		String desktopImageUrl,
+
+		@Schema(description = "[mobile] 광고 구좌 이미지 url", example = "[mobile 버전 url 형식]")
+		@NotNull
+		String mobileImageUrl,
 
+		@Schema(description = "광고 구좌 링크", example = "https://www.naver.com")
+		@NotNull
+		String advertisementLink,
+
+		@Schema(description = "광고 게시 시작일", example = "2024-07-31T00:00:00")
+		@NotNull
+		LocalDateTime advertisementStartDate
+	) {
+		public static AdvertisementGetDto of(Advertisement advertisement) {
+			return new AdvertisementGetDto(
+				advertisement.getId(),
+				advertisement.getAdvertisementDesktopImageUrl(),
+				advertisement.getAdvertisementMobileImageUrl(),
+				advertisement.getAdvertisementLink(),
+				advertisement.getAdvertisementStartDate()
+			);
+		}
+	}
+
+	public static AdvertisementsGetResponseDto of(List<AdvertisementGetDto> advertisements) {
 		return new AdvertisementsGetResponseDto(advertisements);
 	}
-}
+}

main/src/main/java/org/sopt/makers/crew/main/advertisement/service/AdvertisementService.java

@@ -1,13 +1,16 @@
 package org.sopt.makers.crew.main.advertisement.service;
 
+import java.time.LocalDateTime;
 import java.util.List;
 
 import org.sopt.makers.crew.main.advertisement.dto.AdvertisementsGetResponseDto;
-import org.sopt.makers.crew.main.advertisement.dto.AdvertisementGetDto;
-import org.sopt.makers.crew.main.common.util.Time;
+import org.sopt.makers.crew.main.advertisement.dto.AdvertisementsGetResponseDto.AdvertisementGetDto;
+import org.sopt.makers.crew.main.global.util.Time;
 import org.sopt.makers.crew.main.entity.advertisement.Advertisement;
 import org.sopt.makers.crew.main.entity.advertisement.AdvertisementRepository;
 import org.sopt.makers.crew.main.entity.advertisement.enums.AdvertisementCategory;
+import org.springframework.data.domain.PageRequest;
+import org.springframework.data.domain.Pageable;
 import org.springframework.stereotype.Service;
 import org.springframework.transaction.annotation.Transactional;
 
@@ -17,21 +20,38 @@
 @RequiredArgsConstructor
 @Transactional(readOnly = true)
 public class AdvertisementService {
-	private final AdvertisementRepository advertisementRepository;
 
+	private final AdvertisementRepository advertisementRepository;
 	private final Time time;
 
 	public AdvertisementsGetResponseDto getAdvertisement(AdvertisementCategory advertisementCategory) {
-		List<Advertisement> advertisements = advertisementRepository.findTop6ByAdvertisementCategoryAndAdvertisementEndDateAfterAndAdvertisementStartDateBeforeOrderByPriority(
-			advertisementCategory, time.now(), time.now());
+		LocalDateTime now = time.now();
+
+		int maxItems = advertisementCategory.getMaxItems();
+		Pageable pageable = PageRequest.of(0, maxItems);
+
+		List<Advertisement> advertisements = advertisementRepository.findAdvertisementsByDateAndType(
+			advertisementCategory,
+			true,
+			now,
+			pageable);
 
-		if (advertisements.isEmpty()) {
-			return AdvertisementsGetResponseDto.of(null);
+		if (!advertisements.isEmpty()) {
+			return createResponseDto(advertisements);
 		}
 
-		List<AdvertisementGetDto> advertisementDtos = advertisements.stream().map(AdvertisementGetDto::of)
-			.toList();
+		advertisements = advertisementRepository.findAdvertisementsByCategory(
+			advertisementCategory,
+			false,
+			pageable);
+
+		return createResponseDto(advertisements);
+	}
 
+	private AdvertisementsGetResponseDto createResponseDto(List<Advertisement> advertisements) {
+		List<AdvertisementGetDto> advertisementDtos = advertisements.stream()
+			.map(AdvertisementGetDto::of)
+			.toList();
 		return AdvertisementsGetResponseDto.of(advertisementDtos);
 	}
-}
+}

main/src/main/java/org/sopt/makers/crew/main/auth/v2/service/AuthV2ServiceImpl.java

@@ -4,7 +4,7 @@
 
 import org.sopt.makers.crew.main.auth.v2.dto.request.AuthV2RequestDto;
 import org.sopt.makers.crew.main.auth.v2.dto.response.AuthV2ResponseDto;
-import org.sopt.makers.crew.main.common.jwt.JwtTokenProvider;
+import org.sopt.makers.crew.main.global.jwt.JwtTokenProvider;
 import org.sopt.makers.crew.main.entity.user.User;
 import org.sopt.makers.crew.main.entity.user.UserRepository;
 import org.sopt.makers.crew.main.external.playground.PlaygroundService;

main/src/main/java/org/sopt/makers/crew/main/comment/v2/CommentV2Api.java

@@ -21,7 +21,6 @@
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2ReportCommentResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2SwitchCommentLikeResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2UpdateCommentResponseDto;
-import org.sopt.makers.crew.main.common.dto.TempResponseDto;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.ModelAttribute;

main/src/main/java/org/sopt/makers/crew/main/comment/v2/CommentV2Controller.java

@@ -1,7 +1,6 @@
 package org.sopt.makers.crew.main.comment.v2;
 
 import io.swagger.v3.oas.annotations.Parameter;
-import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
 
 import java.security.Principal;
@@ -18,8 +17,7 @@
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2SwitchCommentLikeResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2UpdateCommentResponseDto;
 import org.sopt.makers.crew.main.comment.v2.service.CommentV2Service;
-import org.sopt.makers.crew.main.common.dto.TempResponseDto;
-import org.sopt.makers.crew.main.common.util.UserUtil;
+import org.sopt.makers.crew.main.global.util.UserUtil;
 import org.springframework.http.HttpStatus;
 import org.springframework.http.ResponseEntity;
 import org.springframework.web.bind.annotation.DeleteMapping;

main/src/main/java/org/sopt/makers/crew/main/comment/v2/dto/query/CommentV2GetCommentsQueryDto.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.crew.main.comment.v2.dto.query;
 
-import org.sopt.makers.crew.main.common.pagination.dto.PageOptionsDto;
+import org.sopt.makers.crew.main.global.pagination.dto.PageOptionsDto;
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotNull;

main/src/main/java/org/sopt/makers/crew/main/comment/v2/dto/response/CommentV2GetCommentsResponseDto.java

@@ -2,7 +2,7 @@
 
 import java.util.List;
 
-import org.sopt.makers.crew.main.common.pagination.dto.PageMetaDto;
+import org.sopt.makers.crew.main.global.pagination.dto.PageMetaDto;
 
 import io.swagger.v3.oas.annotations.media.ArraySchema;
 import io.swagger.v3.oas.annotations.media.Schema;

main/src/main/java/org/sopt/makers/crew/main/comment/v2/service/CommentV2Service.java

@@ -7,7 +7,7 @@
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2ReportCommentResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2SwitchCommentLikeResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2UpdateCommentResponseDto;
-import org.sopt.makers.crew.main.common.exception.BadRequestException;
+import org.sopt.makers.crew.main.global.exception.BadRequestException;
 
 public interface CommentV2Service {
 

main/src/main/java/org/sopt/makers/crew/main/comment/v2/service/CommentV2ServiceImpl.java

@@ -22,13 +22,13 @@
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2SwitchCommentLikeResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.CommentV2UpdateCommentResponseDto;
 import org.sopt.makers.crew.main.comment.v2.dto.response.ReplyDto;
-import org.sopt.makers.crew.main.common.exception.BadRequestException;
-import org.sopt.makers.crew.main.common.exception.ErrorStatus;
-import org.sopt.makers.crew.main.common.exception.ForbiddenException;
-import org.sopt.makers.crew.main.common.pagination.dto.PageMetaDto;
-import org.sopt.makers.crew.main.common.pagination.dto.PageOptionsDto;
-import org.sopt.makers.crew.main.common.util.MentionSecretStringRemover;
-import org.sopt.makers.crew.main.common.util.Time;
+import org.sopt.makers.crew.main.global.exception.BadRequestException;
+import org.sopt.makers.crew.main.global.exception.ErrorStatus;
+import org.sopt.makers.crew.main.global.exception.ForbiddenException;
+import org.sopt.makers.crew.main.global.pagination.dto.PageMetaDto;
+import org.sopt.makers.crew.main.global.pagination.dto.PageOptionsDto;
+import org.sopt.makers.crew.main.global.util.MentionSecretStringRemover;
+import org.sopt.makers.crew.main.global.util.Time;
 import org.sopt.makers.crew.main.entity.comment.Comment;
 import org.sopt.makers.crew.main.entity.comment.CommentRepository;
 import org.sopt.makers.crew.main.entity.comment.Comments;

main/src/main/java/org/sopt/makers/crew/main/entity/advertisement/Advertisement.java

@@ -5,6 +5,7 @@
 import java.time.LocalDateTime;
 
 import org.sopt.makers.crew.main.entity.advertisement.enums.AdvertisementCategory;
+import org.sopt.makers.crew.main.entity.common.BaseTimeEntity;
 import org.springframework.data.jpa.domain.support.AuditingEntityListener;
 
 import jakarta.persistence.Entity;
@@ -23,9 +24,8 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "advertisement")
-public class Advertisement {
+public class Advertisement extends BaseTimeEntity {
 	/**
 	 * Primary Key
 	 */
@@ -55,16 +55,21 @@ public class Advertisement {
 	@NotNull
 	private LocalDateTime advertisementEndDate;
 
+	@NotNull
+	private boolean isSponsoredContent;
+
 	@Builder
-	private Advertisement(String advertisementDesktopImageUrl, String advertisementMobileImageUrl, String advertisementLink,
+	private Advertisement(String advertisementDesktopImageUrl, String advertisementMobileImageUrl,
+		String advertisementLink,
 		AdvertisementCategory advertisementCategory, Long priority, LocalDateTime advertisementStartDate,
-		LocalDateTime advertisementEndDate) {
+		LocalDateTime advertisementEndDate, boolean isSponsoredContent) {
 		this.advertisementDesktopImageUrl = advertisementDesktopImageUrl;
 		this.advertisementMobileImageUrl = advertisementMobileImageUrl;
 		this.advertisementLink = advertisementLink;
 		this.advertisementCategory = advertisementCategory;
 		this.priority = priority;
 		this.advertisementStartDate = advertisementStartDate;
 		this.advertisementEndDate = advertisementEndDate;
+		this.isSponsoredContent = isSponsoredContent;
 	}
-}
+}

main/src/main/java/org/sopt/makers/crew/main/entity/advertisement/AdvertisementRepository.java

@@ -4,9 +4,31 @@
 import java.util.List;
 
 import org.sopt.makers.crew.main.entity.advertisement.enums.AdvertisementCategory;
+import org.springframework.data.domain.Pageable;
 import org.springframework.data.jpa.repository.JpaRepository;
+import org.springframework.data.jpa.repository.Query;
+import org.springframework.data.repository.query.Param;
 
 public interface AdvertisementRepository extends JpaRepository<Advertisement, Integer> {
-	List<Advertisement> findTop6ByAdvertisementCategoryAndAdvertisementEndDateAfterAndAdvertisementStartDateBeforeOrderByPriority(
-		AdvertisementCategory advertisementCategory, LocalDateTime now1, LocalDateTime now2);
-}
+
+	@Query("SELECT a FROM Advertisement a " +
+		"WHERE a.isSponsoredContent = :isSponsored " +
+		"AND a.advertisementCategory = :category " +
+		"AND a.advertisementStartDate <= :now " +
+		"AND a.advertisementEndDate >= :now " +
+		"ORDER BY a.priority ASC")
+	List<Advertisement> findAdvertisementsByDateAndType(
+		@Param("category") AdvertisementCategory category,
+		@Param("isSponsored") boolean isSponsored,
+		@Param("now") LocalDateTime now,
+		Pageable pageable);
+
+	@Query("SELECT a FROM Advertisement a " +
+		"WHERE a.isSponsoredContent = :isSponsored " +
+		"AND a.advertisementCategory = :category " +
+		"ORDER BY a.priority ASC")
+	List<Advertisement> findAdvertisementsByCategory(
+		@Param("category") AdvertisementCategory category,
+		@Param("isSponsored") boolean isSponsored,
+		Pageable pageable);
+}

main/src/main/java/org/sopt/makers/crew/main/entity/advertisement/enums/AdvertisementCategory.java

@@ -1,5 +1,13 @@
 package org.sopt.makers.crew.main.entity.advertisement.enums;
 
+import lombok.Getter;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Getter
 public enum AdvertisementCategory {
-	POST, MEETING
+	POST(6),
+	MEETING(1);
+
+	private final int maxItems;
 }

main/src/main/java/org/sopt/makers/crew/main/entity/apply/Apply.java

@@ -1,7 +1,7 @@
 package org.sopt.makers.crew.main.entity.apply;
 
 import static jakarta.persistence.GenerationType.IDENTITY;
-import static org.sopt.makers.crew.main.common.exception.ErrorStatus.*;
+import static org.sopt.makers.crew.main.global.exception.ErrorStatus.*;
 
 import jakarta.persistence.Column;
 import jakarta.persistence.Convert;
@@ -21,7 +21,8 @@
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
-import org.sopt.makers.crew.main.common.exception.BadRequestException;
+import org.sopt.makers.crew.main.entity.common.BaseTimeEntity;
+import org.sopt.makers.crew.main.global.exception.BadRequestException;
 import org.sopt.makers.crew.main.entity.apply.enums.ApplyStatusConverter;
 import org.sopt.makers.crew.main.entity.apply.enums.ApplyTypeConverter;
 import org.sopt.makers.crew.main.entity.apply.enums.EnApplyStatus;
@@ -34,9 +35,8 @@
 @Entity
 @Getter
 @NoArgsConstructor(access = AccessLevel.PROTECTED)
-@EntityListeners(AuditingEntityListener.class)
 @Table(name = "apply")
-public class Apply {
+public class Apply extends BaseTimeEntity {
 
 	/**
 	 * Primary Key

main/src/main/java/org/sopt/makers/crew/main/entity/apply/ApplyRepository.java

@@ -1,10 +1,10 @@
 package org.sopt.makers.crew.main.entity.apply;
 
-import static org.sopt.makers.crew.main.common.exception.ErrorStatus.NOT_FOUND_APPLY;
+import static org.sopt.makers.crew.main.global.exception.ErrorStatus.NOT_FOUND_APPLY;
 
 import java.util.List;
-import java.util.Optional;
-import org.sopt.makers.crew.main.common.exception.BadRequestException;
+
+import org.sopt.makers.crew.main.global.exception.BadRequestException;
 import org.sopt.makers.crew.main.entity.apply.enums.EnApplyStatus;
 import org.springframework.data.jpa.repository.JpaRepository;
 import org.springframework.data.jpa.repository.Modifying;

main/src/main/java/org/sopt/makers/crew/main/entity/apply/ApplySearchRepositoryImpl.java

@@ -1,6 +1,6 @@
 package org.sopt.makers.crew.main.entity.apply;
 
-import static org.sopt.makers.crew.main.common.constant.CrewConst.*;
+import static org.sopt.makers.crew.main.global.constant.CrewConst.*;
 import static org.sopt.makers.crew.main.entity.apply.QApply.apply;
 import static org.sopt.makers.crew.main.entity.user.QUser.user;