Skip to content

Commit 71c4816

Browse files
authored
Merge branch 'develop' into URECA-58/Feat/withdrawal-oauth-unlink
2 parents a8c3926 + 7590181 commit 71c4816

9 files changed

Lines changed: 74 additions & 0 deletions

File tree

‎src/main/java/com/ureca/unity/domain/auth/controller/AuthSessionController.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
import com.ureca.unity.domain.auth.dto.MeResponse;
44
import com.ureca.unity.domain.auth.service.AuthSessionService;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
56
import jakarta.servlet.http.HttpServletRequest;
67
import lombok.RequiredArgsConstructor;
78
import org.springframework.web.bind.annotation.GetMapping;
89
import org.springframework.web.bind.annotation.RequestMapping;
910
import org.springframework.web.bind.annotation.RestController;
1011

12+
@Tag(
13+
name = "1. Auth",
14+
description = "회원가입 및 로그인 관련 API"
15+
)
1116
@RestController
1217
@RequestMapping("/api/auth")
1318
@RequiredArgsConstructor

‎src/main/java/com/ureca/unity/domain/auth/controller/LogoutController.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,17 @@
22

33
import com.ureca.unity.domain.auth.service.LogoutService;
44
import com.ureca.unity.global.util.CookieUtils;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
56
import jakarta.servlet.http.HttpServletResponse;
67
import lombok.RequiredArgsConstructor;
78
import org.springframework.beans.factory.annotation.Value;
89
import org.springframework.http.HttpStatus;
910
import org.springframework.web.bind.annotation.*;
1011

12+
@Tag(
13+
name = "1. Auth",
14+
description = "회원가입 및 로그인 관련 API"
15+
)
1116
@RestController
1217
@RequestMapping("/api/auth")
1318
@RequiredArgsConstructor

‎src/main/java/com/ureca/unity/domain/auth/controller/OAuthController.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import com.ureca.unity.domain.auth.dto.OAuthLoginResult;
77
import com.ureca.unity.domain.auth.service.OAuthService;
88
import com.ureca.unity.global.util.CookieUtils;
9+
import io.swagger.v3.oas.annotations.tags.Tag;
910
import jakarta.servlet.http.Cookie;
1011
import jakarta.servlet.http.HttpServletResponse;
1112
import jakarta.validation.constraints.NotBlank;
@@ -14,6 +15,10 @@
1415
import org.springframework.validation.annotation.Validated;
1516
import org.springframework.web.bind.annotation.*;
1617

18+
@Tag(
19+
name = "1. Auth",
20+
description = "회원가입 및 로그인 관련 API"
21+
)
1722
@RestController
1823
@RequestMapping("/api/auth")
1924
@RequiredArgsConstructor

‎src/main/java/com/ureca/unity/domain/auth/controller/RefreshTokenController.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,11 +2,16 @@
22

33
import com.ureca.unity.domain.auth.dto.TokenResponse;
44
import com.ureca.unity.domain.auth.service.RefreshTokenService;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
56
import jakarta.servlet.http.HttpServletRequest;
67
import jakarta.servlet.http.HttpServletResponse;
78
import lombok.RequiredArgsConstructor;
89
import org.springframework.web.bind.annotation.*;
910

11+
@Tag(
12+
name = "1. Auth",
13+
description = "회원가입 및 로그인 관련 API"
14+
)
1015
@RestController
1116
@RequestMapping("/api/auth")
1217
@RequiredArgsConstructor

‎src/main/java/com/ureca/unity/domain/example/controller/ExampleController.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,12 +2,14 @@
22

33
import com.ureca.unity.domain.example.dto.response.ExampleResponse;
44
import com.ureca.unity.domain.example.service.ExampleService;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
56
import lombok.RequiredArgsConstructor;
67
import org.springframework.web.bind.annotation.GetMapping;
78
import org.springframework.web.bind.annotation.RestController;
89

910
import java.util.List;
1011

12+
@Tag(name = "2. Exam")
1113
@RestController
1214
@RequiredArgsConstructor
1315
public class ExampleController {

‎src/main/java/com/ureca/unity/domain/stt/controller/SttController.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,14 @@
22

33
import com.ureca.unity.domain.stt.model.SttJob;
44
import com.ureca.unity.domain.stt.service.SttService;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
56
import lombok.RequiredArgsConstructor;
67
import org.springframework.web.bind.annotation.*;
78

9+
@Tag(
10+
name = "3. STT",
11+
description = "음성 인식(STT) API"
12+
)
813
@RestController
914
@RequiredArgsConstructor
1015
@RequestMapping("/counselings")

‎src/main/java/com/ureca/unity/domain/summary/controller/SummaryController.java‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,16 @@
33
import com.ureca.unity.domain.summary.dto.request.SummaryRequest;
44
import com.ureca.unity.domain.summary.dto.response.SummaryResponse;
55
import com.ureca.unity.domain.summary.service.SummaryService;
6+
import io.swagger.v3.oas.annotations.tags.Tag;
67
import jakarta.validation.Valid;
78
import lombok.RequiredArgsConstructor;
89
import org.springframework.web.bind.annotation.*;
910

11+
@Tag(
12+
name = "4. Summary",
13+
description = "요약 관련 API"
14+
)
15+
1016
@RestController
1117
@RequiredArgsConstructor
1218
@RequestMapping("/api/summaries")

‎src/main/java/com/ureca/unity/domain/user/controller/UserController.java‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,18 @@
22

33
import com.ureca.unity.domain.user.service.UserService;
44
import com.ureca.unity.global.util.CookieUtils;
5+
import io.swagger.v3.oas.annotations.tags.Tag;
56
import jakarta.servlet.http.HttpServletResponse;
67
import lombok.RequiredArgsConstructor;
78
import org.springframework.beans.factory.annotation.Value;
89
import org.springframework.http.HttpStatus;
910
import org.springframework.security.core.Authentication;
1011
import org.springframework.web.bind.annotation.*;
1112

13+
@Tag(
14+
name = "1. Auth",
15+
description = "회원가입 및 로그인 관련 API"
16+
)
1217
@RestController
1318
@RequestMapping("/api/users")
1419
@RequiredArgsConstructor
Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,36 @@
1+
package com.ureca.unity.global.config;
2+
3+
import io.swagger.v3.oas.models.OpenAPI;
4+
import io.swagger.v3.oas.models.Components;
5+
import io.swagger.v3.oas.models.security.SecurityScheme;
6+
import io.swagger.v3.oas.models.security.SecurityRequirement;
7+
import org.springframework.context.annotation.Bean;
8+
import org.springframework.context.annotation.Configuration;
9+
10+
import java.util.List;
11+
12+
@Configuration
13+
public class SwaggerConfig {
14+
15+
@Bean
16+
public OpenAPI openAPI() {
17+
return new OpenAPI()
18+
.tags(List.of(
19+
new io.swagger.v3.oas.models.tags.Tag().name("1. Auth"),
20+
new io.swagger.v3.oas.models.tags.Tag().name("2. Exam"),
21+
new io.swagger.v3.oas.models.tags.Tag().name("3. STT"),
22+
new io.swagger.v3.oas.models.tags.Tag().name("4. Summary")
23+
))
24+
.components(new Components()
25+
.addSecuritySchemes("bearerAuth",
26+
new SecurityScheme()
27+
.type(SecurityScheme.Type.HTTP)
28+
.scheme("bearer")
29+
.bearerFormat("JWT")
30+
)
31+
)
32+
.addSecurityItem(
33+
new SecurityRequirement().addList("bearerAuth")
34+
);
35+
}
36+
}

0 commit comments

Comments
 (0)