[release] v1.1.0 릴리즈

.github/workflows/dev-CI.yml

@@ -53,6 +53,10 @@ jobs:
           DEV_COOLSMS_KEY: ${{ secrets.DEV_COOLSMS_KEY }}
           DEV_COOLSMS_NUMBER: ${{ secrets.DEV_COOLSMS_NUMBER }}
           DEV_COOLSMS_SECRET: ${{ secrets.DEV_COOLSMS_SECRET }}
+          DEV_ACCESS_TOKEN_EXPIRE_TIME: ${{ secrets.DEV_ACCESS_TOKEN_EXPIRE_TIME }}
+          DEV_REFRESH_TOKEN_EXPIRE_TIME: ${{ secrets.DEV_REFRESH_TOKEN_EXPIRE_TIME }}
+          DEV_ALLOWED_ORIGINS: ${{ secrets.DEV_ALLOWED_ORIGINS }}
+          DEV_SERVER_URL: ${{ secrets.DEV_SERVER_URL }}
         run: |
           cd ./src/main/resources
           envsubst < application-dev.yml > application-dev.tmp.yml && mv application-dev.tmp.yml application-dev.yml
@@ -81,11 +85,11 @@ jobs:
           docker build -f Dockerfile-dev --platform linux/amd64 -t hoonyworld/beat-dev .
           docker push hoonyworld/beat-dev
 
-      # Trigger Jenkins job - Jenkins 작업 트리거
-      - name: Trigger Jenkins job
-        uses: appleboy/jenkins-action@master
-        with:
-          url: ${{ secrets.DEV_WEBHOOK_URL }}
-          user: "beat"
-          token: ${{ secrets.DEV_JENKINS_API_TOKEN }}
-          job: "beat-project"
+#      # Trigger Jenkins job - Jenkins 작업 트리거
+#      - name: Trigger Jenkins job
+#        uses: appleboy/jenkins-action@master
+#        with:
+#          url: ${{ secrets.DEV_WEBHOOK_URL }}
+#          user: "beat"
+#          token: ${{ secrets.DEV_JENKINS_API_TOKEN }}
+#          job: "beat-project"

.github/workflows/prod-CI.yml

@@ -53,6 +53,10 @@ jobs:
           PROD_COOLSMS_KEY: ${{ secrets.PROD_COOLSMS_KEY }}
           PROD_COOLSMS_NUMBER: ${{ secrets.PROD_COOLSMS_NUMBER }}
           PROD_COOLSMS_SECRET: ${{ secrets.PROD_COOLSMS_SECRET }}
+          PROD_ACCESS_TOKEN_EXPIRE_TIME: ${{ secrets.PROD_ACCESS_TOKEN_EXPIRE_TIME }}
+          PROD_REFRESH_TOKEN_EXPIRE_TIME: ${{ secrets.PROD_REFRESH_TOKEN_EXPIRE_TIME }}
+          PROD_ALLOWED_ORIGINS: ${{ secrets.PROD_ALLOWED_ORIGINS }}
+          PROD_SERVER_URL: ${{ secrets.PROD_SERVER_URL }}
         run: |
           cd ./src/main/resources
           envsubst < application-prod.yml > application-prod.tmp.yml && mv application-prod.tmp.yml application-prod.yml
@@ -81,11 +85,11 @@ jobs:
           docker build --platform linux/amd64 -t donghoon0203/beat-prod .
           docker push donghoon0203/beat-prod
 
-      # Trigger Jenkins job - Jenkins 작업 트리거
-      - name: Trigger Jenkins job
-        uses: appleboy/jenkins-action@master
-        with:
-          url: ${{ secrets.PROD_WEBHOOK_URL }}
-          user: "beat"
-          token: ${{ secrets.PROD_JENKINS_API_TOKEN }}
-          job: "beat-project"
+#      # Trigger Jenkins job - Jenkins 작업 트리거
+#      - name: Trigger Jenkins job
+#        uses: appleboy/jenkins-action@master
+#        with:
+#          url: ${{ secrets.PROD_WEBHOOK_URL }}
+#          user: "beat"
+#          token: ${{ secrets.PROD_JENKINS_API_TOKEN }}
+#          job: "beat-project"

.gitignore

@@ -178,3 +178,6 @@ Temporary Items
 
 # End of https://www.toptal.com/developers/gitignore/api/intellij,java,macos.gradle/
 .idea/
+
+# Ignore application-local.yml
+src/main/resources/application-local.yml

README.md

@@ -114,4 +114,4 @@ BEAT와 함께 효율적이고 체계적으로 공연을 관리해 볼까요? 
 <img src="https://github.com/user-attachments/assets/35b618b6-932e-4ef8-99bc-857f4e45d610">
 
 ## 👥 Contributors
-- [BEAT Client Repository](https://github.com/TEAM-BEAT/BEAT-Client)
+- [BEAT Client Repository](https://github.com/TEAM-BEAT/BEAT-Client)

build.gradle

@@ -28,7 +28,7 @@ repositories {
 dependencies {
 	// Spring
 	implementation 'org.springframework.boot:spring-boot-starter-web'
-	developmentOnly 'org.springframework.boot:spring-boot-devtools'
+//	developmentOnly 'org.springframework.boot:spring-boot-devtools'
 	implementation 'org.springframework.boot:spring-boot-starter-actuator'
 
 	// Database

src/main/java/com/beat/BeatApplication.java

@@ -5,9 +5,13 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.openfeign.EnableFeignClients;
 import org.springframework.cloud.openfeign.FeignAutoConfiguration;
+import org.springframework.scheduling.annotation.EnableAsync;
+import org.springframework.scheduling.annotation.EnableScheduling;
 
 @SpringBootApplication
 @EnableFeignClients
+@EnableScheduling
+@EnableAsync
 @ImportAutoConfiguration({FeignAutoConfiguration.class})
 public class BeatApplication {
 

src/main/java/com/beat/admin/adapter/in/api/AdminApi.java

@@ -0,0 +1,134 @@
+package com.beat.admin.adapter.in.api;
+
+import com.beat.admin.application.dto.response.CarouselFindAllResponse;
+import com.beat.admin.application.dto.response.UserFindAllResponse;
+import com.beat.admin.application.dto.request.CarouselHandleRequest;
+import com.beat.admin.application.dto.response.CarouselHandleAllResponse;
+import com.beat.global.auth.annotation.CurrentMember;
+import com.beat.global.common.dto.ErrorResponse;
+import com.beat.global.common.dto.SuccessResponse;
+import com.beat.global.external.s3.application.dto.BannerPresignedUrlFindResponse;
+import com.beat.global.external.s3.application.dto.CarouselPresignedUrlFindAllResponse;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.media.Content;
+import io.swagger.v3.oas.annotations.media.Schema;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestParam;
+
+import java.util.List;
+
+@Tag(name = "Admin", description = "관리자 제어 API")
+public interface AdminApi {
+
+    @Operation(summary = "유저 정보 조회", description = "관리자가 유저들의 정보를 조회하는 GET API")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "관리자 권한으로 모든 유저 조회에 성공하였습니다.",
+                            content = @Content(schema = @Schema(implementation = SuccessResponse.class))
+                    ),
+                    @ApiResponse(
+                            responseCode = "404",
+                            description = "회원이 없습니다",
+                            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+                    )
+            }
+    )
+    ResponseEntity<SuccessResponse<UserFindAllResponse>> readAllUsers(
+            @CurrentMember Long memberId
+    );
+
+    @Operation(summary = "캐러셀에 업로드 할 이미지에 대한 presigned URL 발급", description = "관리자가 캐러셀에 업로드 할 이미지에 대한 presigned URL을 발급 받는 GET API")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "캐러셀 Presigned URL 발급 성공",
+                            content = @Content(schema = @Schema(implementation = SuccessResponse.class))
+                    ),
+                    @ApiResponse(
+                            responseCode = "404",
+                            description = "회원이 없습니다.",
+                            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+                    )
+            }
+    )
+    ResponseEntity<SuccessResponse<CarouselPresignedUrlFindAllResponse>> createAllCarouselPresignedUrls(
+            @CurrentMember Long memberId,
+            @RequestParam List<String> carouselImages
+    );
+
+    @Operation(summary = "배너에 업로드 할 이미지에 대한 presigned URL 발급", description = "관리자가 배너에 업로드 할 이미지에 대한 presigned URL을 발급 받는 GET API")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "배너 Presigned URL 발급 성공",
+                            content = @Content(schema = @Schema(implementation = SuccessResponse.class))
+                    ),
+                    @ApiResponse(
+                            responseCode = "404",
+                            description = "회원이 없습니다.",
+                            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+                    )
+            }
+    )
+    ResponseEntity<SuccessResponse<BannerPresignedUrlFindResponse>> createBannerPresignedUrl(
+            @CurrentMember Long memberId,
+            @RequestParam String bannerImage
+    );
+
+    @Operation(summary = "캐러셀에 등록된 모든 공연 정보 조회", description = "관리자가 현재 캐러셀에 등록된 모든 공연 정보를 조회하는 GET API")
+    @ApiResponses(
+            value = {
+                    @ApiResponse(
+                            responseCode = "200",
+                            description = "관리자 권한으로 현재 캐러셀에 등록된 모든 공연 조회에 성공하였습니다.",
+                            content = @Content(schema = @Schema(implementation = SuccessResponse.class))
+                    ),
+                    @ApiResponse(
+                            responseCode = "404",
+                            description = "회원이 없습니다.",
+                            content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+                    )
+            }
+    )
+    ResponseEntity<SuccessResponse<CarouselFindAllResponse>> readAllCarouselImages(
+            @CurrentMember Long memberId
+    );
+
+    @Operation(summary = "캐러셀 이미지 수정", description = "관리자가 캐러셀 이미지를 수정하는 PUT API")
+    @ApiResponses(
+        value = {
+            @ApiResponse(
+                responseCode = "200",
+                description = "캐러셀 이미지 수정 성공",
+                content = @Content(schema = @Schema(implementation = SuccessResponse.class))
+            ),
+            @ApiResponse(
+                responseCode = "404",
+                description = "회원이 없습니다.",
+                content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+            ),
+            @ApiResponse(
+                responseCode = "404",
+                description = "해당 홍보 정보를 찾을 수 없습니다.",
+                content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+            ),
+            @ApiResponse(
+                responseCode = "404",
+                description = "해당 공연 정보를 찾을 수 없습니다.",
+                content = @Content(schema = @Schema(implementation = ErrorResponse.class))
+            )
+        }
+    )
+    ResponseEntity<SuccessResponse<CarouselHandleAllResponse>> processCarouselImages(
+        @CurrentMember Long memberId,
+        @RequestBody CarouselHandleRequest request
+    );
+}

src/main/java/com/beat/admin/adapter/in/api/AdminController.java

@@ -0,0 +1,79 @@
+package com.beat.admin.adapter.in.api;
+
+import com.beat.admin.application.dto.response.CarouselFindAllResponse;
+import com.beat.admin.application.dto.request.CarouselHandleRequest;
+import com.beat.admin.application.dto.response.CarouselHandleAllResponse;
+import com.beat.admin.exception.AdminSuccessCode;
+import com.beat.admin.application.dto.response.UserFindAllResponse;
+import com.beat.admin.facade.AdminFacade;
+import com.beat.global.auth.annotation.CurrentMember;
+import com.beat.global.common.dto.SuccessResponse;
+import com.beat.global.external.s3.application.dto.BannerPresignedUrlFindResponse;
+import com.beat.global.external.s3.application.dto.CarouselPresignedUrlFindAllResponse;
+
+import lombok.RequiredArgsConstructor;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PutMapping;
+import org.springframework.web.bind.annotation.RequestBody;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+import java.util.List;
+
+@RestController
+@RequestMapping("/api/admin")
+@RequiredArgsConstructor
+public class AdminController implements AdminApi {
+
+	private final AdminFacade adminFacade;
+
+	@Override
+	@GetMapping("/users")
+	public ResponseEntity<SuccessResponse<UserFindAllResponse>> readAllUsers(@CurrentMember Long memberId) {
+		UserFindAllResponse response = adminFacade.checkMemberAndFindAllUsers(memberId);
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(SuccessResponse.of(AdminSuccessCode.FETCH_ALL_USERS_SUCCESS, response));
+	}
+
+	@Override
+	@GetMapping("/carousels/presigned-url")
+	public ResponseEntity<SuccessResponse<CarouselPresignedUrlFindAllResponse>> createAllCarouselPresignedUrls(
+		@CurrentMember Long memberId, @RequestParam List<String> carouselImages) {
+		CarouselPresignedUrlFindAllResponse response = adminFacade.checkMemberAndIssueAllPresignedUrlsForCarousel(
+			memberId, carouselImages);
+		return ResponseEntity.ok(SuccessResponse.of(AdminSuccessCode.CAROUSEL_PRESIGNED_URL_ISSUED, response));
+	}
+
+	@Override
+	@GetMapping("/banner/presigned-url")
+	public ResponseEntity<SuccessResponse<BannerPresignedUrlFindResponse>> createBannerPresignedUrl(
+		@CurrentMember Long memberId, @RequestParam String bannerImage) {
+		BannerPresignedUrlFindResponse response = adminFacade.checkMemberAndIssuePresignedUrlForBanner(memberId,
+			bannerImage);
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(SuccessResponse.of(AdminSuccessCode.BANNER_PRESIGNED_URL_ISSUED, response));
+	}
+
+	@Override
+	@GetMapping("/carousels")
+	public ResponseEntity<SuccessResponse<CarouselFindAllResponse>> readAllCarouselImages(
+		@CurrentMember Long memberId) {
+		CarouselFindAllResponse response = adminFacade.checkMemberAndFindAllPromotionsSortedByCarouselNumber(memberId);
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(SuccessResponse.of(AdminSuccessCode.FETCH_ALL_CAROUSEL_PROMOTIONS_SUCCESS, response));
+	}
+
+	@Override
+	@PutMapping("/carousels")
+	public ResponseEntity<SuccessResponse<CarouselHandleAllResponse>> processCarouselImages(
+		@CurrentMember Long memberId,
+		@RequestBody CarouselHandleRequest request) {
+		CarouselHandleAllResponse response = adminFacade.checkMemberAndProcessAllPromotionsSortedByCarouselNumber(memberId, request);
+		return ResponseEntity.status(HttpStatus.OK)
+			.body(SuccessResponse.of(AdminSuccessCode.UPDATE_ALL_CAROUSEL_PROMOTIONS_SUCCESS, response));
+	}
+}