dev -> main

.github/workflows/ci-cd.yml

@@ -78,6 +78,13 @@ jobs:
           docker build -f Dockerfile.prod -t ${{ secrets.DOCKER_REPO }}/clubber-backend-prod .
           docker push ${{ secrets.DOCKER_REPO }}/clubber-backend-prod
 
+      - name: docker build and push to prod nginx
+        if: contains(github.ref, 'main')
+        run: |
+          docker login -u ${{ secrets.DOCKER_USERNAME }} -p ${{ secrets.DOCKER_PASSWORD }}
+          docker build -f Dockerfile.nginx.prod -t ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod .
+          docker push ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod
+
       - name: Copy docker-compose.yml to EC2 DEV
         if: contains(github.ref, 'dev')
         uses: appleboy/scp-action@master
@@ -126,5 +133,6 @@ jobs:
             sudo docker rm -f $(docker ps -qa)
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-backend-prod
             sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-front-prod
+            sudo docker pull ${{ secrets.DOCKER_REPO }}/clubber-nginx-prod
             sudo docker-compose -f docker-compose-prod.yml up -d
             sudo docker image prune -f

Dockerfile.nginx.prod

@@ -0,0 +1,43 @@
+# Use the official NGINX base image
+FROM nginx:1.24.0
+
+# Install dependencies
+RUN apt-get update && \
+    apt-get install -y --no-install-recommends \
+    wget \
+    curl \
+    build-essential \
+    libpcre3-dev \
+    zlib1g-dev \
+    libmaxminddb-dev \
+    git \
+    && rm -rf /var/lib/apt/lists/*
+
+# Download and extract NGINX source code
+ARG NGINX_VERSION=1.24.0
+WORKDIR /usr/src
+RUN wget http://nginx.org/download/nginx-${NGINX_VERSION}.tar.gz && \
+    tar -zxvf nginx-${NGINX_VERSION}.tar.gz && \
+    rm nginx-${NGINX_VERSION}.tar.gz
+
+# Clone ngx_http_geoip2_module
+RUN git clone https://github.com/leev/ngx_http_geoip2_module.git
+
+# Build NGINX with geoip2 module
+WORKDIR /usr/src/nginx-${NGINX_VERSION}
+RUN ./configure \
+    --with-compat \
+    --add-dynamic-module=../ngx_http_geoip2_module && \
+    make modules
+
+# Copy the built module to the NGINX modules directory
+RUN mkdir -p /usr/lib/nginx/modules/
+RUN cp objs/ngx_http_geoip2_module.so /usr/lib/nginx/modules/
+
+# Clean up
+RUN apt-get purge -y --auto-remove \
+    wget \
+    curl \
+    build-essential \
+    git && \
+    rm -rf /usr/src/*

docker-compose-prod.yml

@@ -24,13 +24,14 @@ services:
 
   nginx:
     container_name: nginx
-    image: nginx:latest
+    image: ssuclubber/clubber-nginx-prod
     environment:
       - TZ=Asia/Seoul
     volumes:
       - ./nginx/:/etc/nginx/
       - ./data/certbot/conf:/etc/letsencrypt
       - ./data/certbot/www:/var/www/certbot
+      -  /var/lib/GeoIP/GeoLite2-Country.mmdb:/var/lib/GeoIP/GeoLite2-Country.mmdb
     ports:
       - "80:80"
       - "443:443"

src/main/java/com/clubber/ClubberServer/domain/admin/controller/AdminReviewController.java

@@ -11,11 +11,11 @@
 import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 
-import com.clubber.ClubberServer.domain.admin.dto.GetAdminPendingReviewsWithSliceResponse;
-import com.clubber.ClubberServer.domain.admin.dto.GetAdminsReviewByStatusResponse;
+import com.clubber.ClubberServer.domain.admin.dto.GetAdminPendingReviewsSliceResponse;
+import com.clubber.ClubberServer.domain.admin.dto.GetAdminsPendingReviews;
 import com.clubber.ClubberServer.domain.admin.dto.GetAdminsReviewsResponse;
 import com.clubber.ClubberServer.domain.admin.dto.UpdateAdminsReviewApprovedStatusResponse;
-import com.clubber.ClubberServer.domain.admin.dto.UpdateAdminsReviewStatusRequest;
+import com.clubber.ClubberServer.domain.admin.dto.UpdateAdminsReviewApprovedStatusRequest;
 import com.clubber.ClubberServer.domain.admin.service.AdminReviewService;
 
 import io.swagger.v3.oas.annotations.Operation;
@@ -33,22 +33,23 @@ public class AdminReviewController {
 
 	@Operation(summary = "동아리 계정에서 승인 대기 목록 조회", description = "승인 대기 중인 리뷰의 한줄평 목록 반환")
 	@GetMapping("/pending")
-	public List<GetAdminsReviewByStatusResponse> getAdminReviewsByApprovedStatus() {
-		return adminReviewService.getAdminReviewsByApprovedStatus();
+	public List<GetAdminsPendingReviews> getAdminPendingReviews() {
+		return adminReviewService.getAdminPendingReviews();
 	}
 
 	@Operation(summary = "동아리 계정에서 승인 대기 목록 조회 (더보기)", description = "추후 적용해주세요")
 	@GetMapping("/pending/slice")
-	public GetAdminPendingReviewsWithSliceResponse getAdminPendingReviewsWithSliceResponses(
+	public GetAdminPendingReviewsSliceResponse getAdminPendingReviewsWithSliceResponses(
 		@PageableDefault Pageable pageable, @RequestParam(required = false) Long lastReviewId){
 		return adminReviewService.getAdminPendingReviewsWithSliceResponse(pageable, lastReviewId);
 	}
 
 	@Operation(summary = "동아리 계정에서 리뷰 승인 / 거절 요청")
 	@PatchMapping("/decision")
 	public UpdateAdminsReviewApprovedStatusResponse updateAdminsReviewsApprovedStatusResponse(@Valid @RequestBody
-	UpdateAdminsReviewStatusRequest updateAdminsReviewStatusRequest) {
-		return adminReviewService.updateAdminsReviewsApprovedStatus(updateAdminsReviewStatusRequest);
+	UpdateAdminsReviewApprovedStatusRequest updateAdminsReviewApprovedStatusRequest) {
+		return adminReviewService.updateAdminsReviewsApprovedStatus(
+			updateAdminsReviewApprovedStatusRequest);
 	}
 
 	@Operation(summary = "동아리 계정 마이페이지 리뷰 목록")

src/main/java/com/clubber/ClubberServer/domain/review/dto/ClubReviewsWithContentDetailResponse.java → src/main/java/com/clubber/ClubberServer/domain/admin/dto/AdminReviewResponse.java

@@ -1,15 +1,11 @@
-package com.clubber.ClubberServer.domain.review.dto;
-
-import java.time.LocalDateTime;
-import java.util.Set;
+package com.clubber.ClubberServer.domain.admin.dto;
 
 import com.clubber.ClubberServer.domain.review.domain.ApprovedStatus;
-import com.clubber.ClubberServer.domain.review.domain.Keyword;
 import com.clubber.ClubberServer.domain.review.domain.Review;
-import com.clubber.ClubberServer.domain.review.domain.ReviewKeyword;
 import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.v3.oas.annotations.media.Schema;
+import java.time.LocalDateTime;
+import java.util.Set;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;
@@ -18,32 +14,32 @@
 @Getter
 @Builder(access = AccessLevel.PRIVATE)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class ClubReviewsWithContentDetailResponse {
+public class AdminReviewResponse {
 
 	@Schema(description = "리뷰 id", example = "1")
 	private final Long reviewId;
 
-	@Schema(description = "유저 id", example = "1")
-	private final Long userId;
-
-	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
-	@Schema(description = "리뷰 작성 일자", example = "2024.01.01", type = "string")
-	private final LocalDateTime dateTime;
+	@Schema(description = "리뷰 상태", example = "APPROVED")
+	private final ApprovedStatus approvedStatus;
 
 	@Schema(description = "작성한 리뷰 키워드",
 		example = "[\"CULTURE\", \"FEE\", \"ACTIVITY\", \"CAREER\", \"MANAGE\"]")
 	private final Set<String> keywords;
 
-	@Schema(description = "해당 동아리 된 한줄평 중 승인된 한줄평의 내용", example = "활동이 재밌어요")
+	@Schema(description = "리뷰 한줄평", example = "분위기가 좋아요")
 	private final String content;
 
-	public static ClubReviewsWithContentDetailResponse of(Review review) {
-		return ClubReviewsWithContentDetailResponse.builder()
-			.keywords(ReviewKeyword.from(review.getReviewKeywords()))
+	@Schema(description = "리뷰 작성 일자", example = "2024.01.01", type = "string")
+	@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
+	private final LocalDateTime dateTime;
+
+	public static AdminReviewResponse of(Review review, Set<String> keywords) {
+		return AdminReviewResponse.builder()
 			.reviewId(review.getId())
-			.userId(review.getUser().getId())
+			.approvedStatus(review.getApprovedStatus())
+			.keywords(keywords)
+			.content(review.getContent())
 			.dateTime(review.getCreatedAt())
-			.content(review.getApprovedStatus() == ApprovedStatus.APPROVED ? review.getContent() : null)
 			.build();
 	}
 }

src/main/java/com/clubber/ClubberServer/domain/admin/dto/CreateAdminsLoginRequest.java

@@ -2,9 +2,7 @@
 
 import io.swagger.v3.oas.annotations.media.Schema;
 import jakarta.validation.constraints.NotBlank;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
-import lombok.Builder;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 

src/main/java/com/clubber/ClubberServer/domain/admin/dto/GetAdminPendingReviewsSliceResponse.java

@@ -0,0 +1,24 @@
+package com.clubber.ClubberServer.domain.admin.dto;
+
+import com.clubber.ClubberServer.global.common.slice.SliceResponse;
+import lombok.AccessLevel;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Getter;
+
+@Getter
+@Builder(access = AccessLevel.PRIVATE)
+@AllArgsConstructor(access = AccessLevel.PRIVATE)
+public class GetAdminPendingReviewsSliceResponse {
+
+	private final Long lastReviewId; 
+
+	private final SliceResponse<GetAdminsPendingReviews> reviews;
+
+	public static GetAdminPendingReviewsSliceResponse of(SliceResponse<GetAdminsPendingReviews> reviews, Long lastReviewId){
+		return GetAdminPendingReviewsSliceResponse.builder()
+			.lastReviewId(lastReviewId)
+			.reviews(reviews)
+			.build();
+	}
+}

src/main/java/com/clubber/ClubberServer/domain/admin/dto/GetAdminsReviewByStatusResponse.java → src/main/java/com/clubber/ClubberServer/domain/admin/dto/GetAdminsPendingReviews.java

@@ -1,10 +1,8 @@
 package com.clubber.ClubberServer.domain.admin.dto;
 
-import com.clubber.ClubberServer.domain.review.domain.Keyword;
 import com.clubber.ClubberServer.domain.review.domain.Review;
 import com.fasterxml.jackson.annotation.JsonFormat;
 import io.swagger.v3.oas.annotations.media.Schema;
-
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.stream.Collectors;
@@ -16,7 +14,7 @@
 @Getter
 @Builder(access = AccessLevel.PRIVATE)
 @AllArgsConstructor(access = AccessLevel.PRIVATE)
-public class GetAdminsReviewByStatusResponse {
+public class GetAdminsPendingReviews {
 
     @Schema(description = "리뷰 id", example = "1")
     private final Long reviewId;
@@ -29,15 +27,8 @@ public class GetAdminsReviewByStatusResponse {
     @Schema(description = "한줄평", example = "분위기가 좋아요")
     private final String content;
 
-    public static List<GetAdminsReviewByStatusResponse> from(List<Review> reviews){
-        return reviews.stream()
-                .map((r) ->GetAdminsReviewByStatusResponse.from(r))
-                .collect(Collectors.toList());
-
-    }
-
-    private static GetAdminsReviewByStatusResponse from(Review review){
-        return GetAdminsReviewByStatusResponse.builder()
+    public static GetAdminsPendingReviews from(Review review){
+        return GetAdminsPendingReviews.builder()
                 .reviewId(review.getId())
                 .writtenDate(review.getCreatedAt())
                 .content(review.getContent())

src/main/java/com/clubber/ClubberServer/domain/admin/dto/GetAdminsReviewsResponse.java

@@ -1,18 +1,8 @@
 package com.clubber.ClubberServer.domain.admin.dto;
 
-import java.time.LocalDateTime;
-import java.util.Set;
-
-import org.springframework.data.domain.Page;
-
 import com.clubber.ClubberServer.domain.admin.domain.Admin;
 import com.clubber.ClubberServer.domain.club.domain.Club;
-import com.clubber.ClubberServer.domain.review.domain.ApprovedStatus;
-import com.clubber.ClubberServer.domain.review.domain.Review;
-import com.clubber.ClubberServer.domain.review.domain.ReviewKeyword;
 import com.clubber.ClubberServer.global.common.page.PageResponse;
-import com.fasterxml.jackson.annotation.JsonFormat;
-
 import io.swagger.v3.oas.annotations.media.Schema;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
@@ -34,47 +24,14 @@ public class GetAdminsReviewsResponse {
 	private final String clubName;
 
 	@Schema(description = "리뷰 목록")
-	private final PageResponse<GetAdminsReviewDetailsResponse> clubReviews;
-
-	@Getter
-	@Builder(access = AccessLevel.PRIVATE)
-	@AllArgsConstructor(access = AccessLevel.PRIVATE)
-	private static class GetAdminsReviewDetailsResponse {
-
-		@Schema(description = "리뷰 id", example = "1")
-		private final Long reviewId;
-
-		@Schema(description = "리뷰 상태", example = "APPROVED")
-		private final ApprovedStatus approvedStatus;
-
-		@Schema(description = "작성한 리뷰 키워드",
-			example = "[\"CULTURE\", \"FEE\", \"ACTIVITY\", \"CAREER\", \"MANAGE\"]")
-		private final Set<String> keywords;
-
-		@Schema(description = "리뷰 한줄평", example = "분위기가 좋아요")
-		private final String content;
-
-		@Schema(description = "리뷰 작성 일자", example = "2024.01.01", type = "string")
-		@JsonFormat(shape = JsonFormat.Shape.STRING, pattern = "yyyy.MM.dd", timezone = "Asia/Seoul")
-		private final LocalDateTime dateTime;
-
-		private static GetAdminsReviewDetailsResponse from(Review review) {
-			return GetAdminsReviewDetailsResponse.builder()
-				.reviewId(review.getId())
-				.approvedStatus(review.getApprovedStatus())
-				.keywords(ReviewKeyword.from(review.getReviewKeywords()))
-				.content(review.getContent())
-				.dateTime(review.getCreatedAt())
-				.build();
-		}
-	}
+	private final PageResponse<AdminReviewResponse> clubReviews;
 
-	public static GetAdminsReviewsResponse of(Admin admin, Club club, Page<Review> reviews) {
+	public static GetAdminsReviewsResponse of(Admin admin, Club club, PageResponse<AdminReviewResponse> clubReviews) {
 		return GetAdminsReviewsResponse.builder()
 			.adminId(admin.getId())
 			.clubId(club.getId())
 			.clubName(club.getName())
-			.clubReviews(PageResponse.of(reviews.map(GetAdminsReviewDetailsResponse::from)))
+			.clubReviews(clubReviews)
 			.build();
 	}
 }

src/main/java/com/clubber/ClubberServer/domain/admin/dto/UpdateAdminsReviewStatusRequest.java → src/main/java/com/clubber/ClubberServer/domain/admin/dto/UpdateAdminsReviewApprovedStatusRequest.java

@@ -5,15 +5,14 @@
 import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Size;
 import java.util.List;
-import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 import lombok.NoArgsConstructor;
 
 @Getter
 @AllArgsConstructor
 @NoArgsConstructor
-public class UpdateAdminsReviewStatusRequest {
+public class UpdateAdminsReviewApprovedStatusRequest {
 
     @Size(min = 1, message = "1개 이상 수정해야합니다")
     @Size(max = 10, message = "10개 이하로 수정해야합니다.")

src/main/java/com/clubber/ClubberServer/domain/admin/dto/UpdateAdminsReviewApprovedStatusResponse.java

@@ -1,12 +1,9 @@
 package com.clubber.ClubberServer.domain.admin.dto;
 
-
 import com.clubber.ClubberServer.domain.admin.domain.Admin;
 import com.clubber.ClubberServer.domain.review.domain.ApprovedStatus;
-import com.clubber.ClubberServer.domain.review.domain.Review;
 import io.swagger.v3.oas.annotations.media.Schema;
 import java.util.List;
-import java.util.stream.Collectors;
 import lombok.AccessLevel;
 import lombok.AllArgsConstructor;
 import lombok.Builder;