From 1bc15207767f22b87e5812b017f1c501f081faff Mon Sep 17 00:00:00 2001
From: DongHoon Lee <125895298+hoonyworld@users.noreply.github.com>
Date: Tue, 3 Dec 2024 22:19:36 +0900
Subject: [PATCH] =?UTF-8?q?[#282]=20fix:=20=EA=B7=B8=EB=A3=B9=ED=99=94?=
 =?UTF-8?q?=EB=A5=BC=20=EC=BD=94=EB=93=9C=20=EA=B8=B0=EB=B0=98=20=EC=84=A4?=
 =?UTF-8?q?=EC=A0=95=EC=9C=BC=EB=A1=9C=20=EB=B3=80=EA=B2=BD=20(#283)?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../global/swagger/config/SwaggerConfig.java  | 20 +++++++++++++++++++
 src/main/resources/application-dev.yml        |  7 +------
 src/main/resources/application-prod.yml       |  7 +------
 3 files changed, 22 insertions(+), 12 deletions(-)

diff --git a/src/main/java/com/beat/global/swagger/config/SwaggerConfig.java b/src/main/java/com/beat/global/swagger/config/SwaggerConfig.java
index 0a307427..fe4e57ab 100644
--- a/src/main/java/com/beat/global/swagger/config/SwaggerConfig.java
+++ b/src/main/java/com/beat/global/swagger/config/SwaggerConfig.java
@@ -10,6 +10,7 @@
 import io.swagger.v3.oas.models.servers.Server;
 
 import org.springdoc.core.customizers.OperationCustomizer;
+import org.springdoc.core.models.GroupedOpenApi;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
@@ -41,6 +42,25 @@ public OpenAPI openAPI() {
 			.addSecurityItem(securityRequirement);
 	}
 
+	@Bean
+	public GroupedOpenApi generalApi() {
+		return GroupedOpenApi.builder()
+			.group("general")
+			.pathsToMatch("/**")
+			.pathsToExclude("/api/admin/**")
+			.addOperationCustomizer(customize())
+			.build();
+	}
+
+	@Bean
+	public GroupedOpenApi adminApi() {
+		return GroupedOpenApi.builder()
+			.group("admin")
+			.pathsToMatch("/api/admin/**")
+			.addOperationCustomizer(customize())
+			.build();
+	}
+
 	@Bean
 	public OperationCustomizer customize() {
 		return (operation, handlerMethod) -> {
diff --git a/src/main/resources/application-dev.yml b/src/main/resources/application-dev.yml
index bbf1bb13..5d5151a1 100644
--- a/src/main/resources/application-dev.yml
+++ b/src/main/resources/application-dev.yml
@@ -86,13 +86,8 @@ springdoc:
   use-fqn: false
   default-consumes-media-type: application/json;charset=UTF-8
   default-produces-media-type: application/json;charset=UTF-8
-  group-configs:
-    - group: admin
-      paths-to-match: /api/admin/**
-    - group: general
-      paths-to-match: /**
-      paths-to-exclude: /api/admin/**
   swagger-ui:
     tags-sorter: alpha
     operations-sorter: alpha
     display-request-duration: true
+    urls-primary-name: general
diff --git a/src/main/resources/application-prod.yml b/src/main/resources/application-prod.yml
index 0a57539c..4b18549c 100644
--- a/src/main/resources/application-prod.yml
+++ b/src/main/resources/application-prod.yml
@@ -86,13 +86,8 @@ springdoc:
   use-fqn: false
   default-consumes-media-type: application/json;charset=UTF-8
   default-produces-media-type: application/json;charset=UTF-8
-  group-configs:
-    - group: admin
-      paths-to-match: /api/admin/**
-    - group: general
-      paths-to-match: /**
-      paths-to-exclude: /api/admin/**
   swagger-ui:
     tags-sorter: alpha
     operations-sorter: alpha
     display-request-duration: true
+    urls-primary-name: general