[♻️ refactor] 컨트롤러에 @AuthenticationPrincipal을 사용하여 인증된 사용자 ID 연동

build.gradle.kts

@@ -71,6 +71,7 @@ dependencies {
     testImplementation("io.mockk:mockk:1.13.10")
     testImplementation("org.springframework.security:spring-security-test")
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
+    testImplementation("org.springframework.security:spring-security-test")
 }
 
 kapt {

src/main/kotlin/com/terning/server/kotlin/ui/api/AnnouncementController.kt

@@ -4,6 +4,7 @@ import com.terning.server.kotlin.application.announcement.AnnouncementService
 import com.terning.server.kotlin.application.announcement.dto.DetailAnnouncementResponse
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PathVariable
 import org.springframework.web.bind.annotation.RequestMapping
@@ -16,11 +17,9 @@ class AnnouncementController(
 ) {
     @GetMapping("/{internshipAnnouncementId}")
     fun getDetailInternshipAnnouncement(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @PathVariable internshipAnnouncementId: Long,
     ): ResponseEntity<ApiResponse<DetailAnnouncementResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response =
             announcementService.getDetailAnnouncement(
                 userId = userId,

src/main/kotlin/com/terning/server/kotlin/ui/api/CalendarController.kt

@@ -7,6 +7,7 @@ import com.terning.server.kotlin.application.calendar.dto.MonthlyViewResponse
 import org.springframework.format.annotation.DateTimeFormat
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
@@ -20,10 +21,9 @@ class CalendarController(
 ) {
     @GetMapping("/daily")
     fun getDailyScraps(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestParam("date") @DateTimeFormat(iso = DateTimeFormat.ISO.DATE) date: LocalDate,
     ): ResponseEntity<ApiResponse<List<DailyScrapsResponse>>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 교체
         val dailyScrapsResponse = calendarService.getDailyScraps(userId, date)
         return ResponseEntity.ok(
             ApiResponse.success(
@@ -36,11 +36,10 @@ class CalendarController(
 
     @GetMapping("/monthly-list")
     fun getDetailedMonthlyScraps(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestParam("year") year: Int,
         @RequestParam("month") month: Int,
     ): ResponseEntity<ApiResponse<List<DetailedMonthlyScrapsResponse>>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
         val detailedMonthlyScrapsResponse = calendarService.getDetailedMonthlyScraps(userId, year, month)
         return ResponseEntity.ok(
             ApiResponse.success(
@@ -53,11 +52,10 @@ class CalendarController(
 
     @GetMapping("/monthly-default")
     fun getMonthlyScraps(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestParam("year") year: Int,
         @RequestParam("month") month: Int,
     ): ResponseEntity<ApiResponse<MonthlyViewResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
         val monthlyViewResponse = calendarService.getMonthlyScraps(userId, year, month)
         return ResponseEntity.ok(
             ApiResponse.success(

src/main/kotlin/com/terning/server/kotlin/ui/api/FilterController.kt

@@ -6,6 +6,7 @@ import com.terning.server.kotlin.application.filter.dto.GetFilterResponse
 import com.terning.server.kotlin.application.filter.dto.UpdateFilterRequest
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PostMapping
 import org.springframework.web.bind.annotation.PutMapping
@@ -20,11 +21,9 @@ class FilterController(
 ) {
     @PostMapping("auth/sign-up/filter")
     fun createUserFilter(
-        // TODO : @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestBody createFilterRequest: CreateFilterRequest,
     ): ResponseEntity<ApiResponse<Unit>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         filterService.createUserFilter(
             userId = userId,
             createFilterRequest = createFilterRequest,
@@ -41,10 +40,8 @@ class FilterController(
 
     @GetMapping("filters")
     fun getUserFilter(
-        // TODO : @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
     ): ResponseEntity<ApiResponse<GetFilterResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response = filterService.getUserFilter(userId)
 
         return ResponseEntity.ok(
@@ -58,11 +55,9 @@ class FilterController(
 
     @PutMapping("filters")
     fun updateUserFilter(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestBody updateFilterRequest: UpdateFilterRequest,
     ): ResponseEntity<ApiResponse<Unit>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         filterService.updateUserFilter(
             userId = userId,
             updateFilterRequest = updateFilterRequest,

src/main/kotlin/com/terning/server/kotlin/ui/api/HomeController.kt

@@ -7,6 +7,7 @@ import org.springframework.data.domain.Pageable
 import org.springframework.data.web.PageableDefault
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
@@ -19,17 +20,14 @@ class HomeController(
 ) {
     @GetMapping
     fun getInternshipAnnouncementsFilteredByUserFilter(
-        // TODO: 실제 로그인된 사용자의 인증 정보 주입 필요
-        // @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestParam(name = "sortBy", required = false, defaultValue = "deadlineSoon")
         sortingCondition: String,
         @PageableDefault(size = 10) pageable: Pageable,
     ): ResponseEntity<ApiResponse<HomeResponse>> {
-        val authenticatedUserId: Long = 1L // TODO: 인증 시스템 연동 시 실제 유저 ID로 대체
-
         val internshipAnnouncementResponse: HomeResponse =
             homeService.getFilteredAnnouncements(
-                userId = authenticatedUserId,
+                userId = userId,
                 sortBy = sortingCondition,
                 pageable = pageable,
             )
@@ -45,9 +43,8 @@ class HomeController(
 
     @GetMapping("/upcoming")
     fun getUpcomingDeadlineScraps(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
     ): ResponseEntity<ApiResponse<UpcomingDeadlineScrapResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 교체
         val response = homeService.findUpcomingDeadlineScraps(userId)
 
         return ResponseEntity.ok(

src/main/kotlin/com/terning/server/kotlin/ui/api/MyPageController.kt

@@ -5,6 +5,7 @@ import com.terning.server.kotlin.application.mypage.ProfileRequest
 import com.terning.server.kotlin.application.mypage.ProfileResponse
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.PatchMapping
 import org.springframework.web.bind.annotation.RequestBody
@@ -18,30 +19,24 @@ class MyPageController(
 ) {
     @GetMapping("/profile")
     fun getProfile(
-        // TODO : @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
     ): ResponseEntity<ApiResponse<ProfileResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response = mypageService.getUserProfile(userId)
 
-        return ResponseEntity
-            .status(HttpStatus.CREATED)
-            .body(
-                ApiResponse.success(
-                    status = HttpStatus.OK,
-                    message = "마이페이지 > 프로필 정보 불러오기를 성공했습니다",
-                    result = response,
-                ),
-            )
+        return ResponseEntity.ok(
+            ApiResponse.success(
+                status = HttpStatus.OK,
+                message = "마이페이지 > 프로필 정보 불러오기를 성공했습니다",
+                result = response,
+            ),
+        )
     }
 
     @PatchMapping("/profile")
     fun updateProfile(
-        // TODO : @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestBody profileRequest: ProfileRequest,
     ): ResponseEntity<ApiResponse<Unit>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         mypageService.updateUserProfile(
             userId = userId,
             profileRequest = profileRequest,

src/main/kotlin/com/terning/server/kotlin/ui/api/ScrapController.kt

@@ -5,6 +5,7 @@ import com.terning.server.kotlin.application.scrap.dto.ScrapRequest
 import com.terning.server.kotlin.application.scrap.dto.ScrapUpdateRequest
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.DeleteMapping
 import org.springframework.web.bind.annotation.PatchMapping
 import org.springframework.web.bind.annotation.PathVariable
@@ -20,12 +21,10 @@ class ScrapController(
 ) {
     @PostMapping("/{internshipAnnouncementId}")
     fun scrap(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @PathVariable internshipAnnouncementId: Long,
         @RequestBody scrapRequest: ScrapRequest,
     ): ResponseEntity<ApiResponse<Unit>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         scrapService.scrap(
             userId = userId,
             internshipAnnouncementId = internshipAnnouncementId,
@@ -45,12 +44,10 @@ class ScrapController(
 
     @PatchMapping("/{internshipAnnouncementId}")
     fun updateScrap(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @PathVariable internshipAnnouncementId: Long,
         @RequestBody scrapUpdateRequest: ScrapUpdateRequest,
     ): ResponseEntity<ApiResponse<Unit>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         scrapService.updateScrap(
             userId = userId,
             internshipAnnouncementId = internshipAnnouncementId,
@@ -68,11 +65,9 @@ class ScrapController(
 
     @DeleteMapping("/{internshipAnnouncementId}")
     fun cancelScrap(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @PathVariable internshipAnnouncementId: Long,
     ): ResponseEntity<ApiResponse<Unit>> {
-        val userId: Long = 1 // 임시 userId
-
         scrapService.cancelScrap(
             userId = userId,
             internshipAnnouncementId = internshipAnnouncementId,

src/main/kotlin/com/terning/server/kotlin/ui/api/SearchController.kt

@@ -9,6 +9,7 @@ import org.springframework.data.domain.Pageable
 import org.springframework.data.web.PageableDefault
 import org.springframework.http.HttpStatus
 import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
 import org.springframework.web.bind.annotation.GetMapping
 import org.springframework.web.bind.annotation.RequestMapping
 import org.springframework.web.bind.annotation.RequestParam
@@ -21,13 +22,11 @@ class SearchController(
 ) {
     @GetMapping
     fun search(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
         @RequestParam(required = false) keyword: String?,
         @RequestParam(defaultValue = "DEADLINE_SOON") sortBy: String,
         @PageableDefault(size = 10) pageable: Pageable,
     ): ResponseEntity<ApiResponse<SearchPageResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response =
             searchService.search(
                 userId = userId,
@@ -47,10 +46,8 @@ class SearchController(
 
     @GetMapping("/views")
     fun getMostViewedAnnouncements(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
     ): ResponseEntity<ApiResponse<ViewCountResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response = searchService.getMostViewedAnnouncements(userId)
 
         return ResponseEntity.ok(
@@ -64,10 +61,8 @@ class SearchController(
 
     @GetMapping("/scraps")
     fun getMostScrappedAnnouncements(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
     ): ResponseEntity<ApiResponse<ScrapCountResponse>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response = searchService.getMostScrappedAnnouncements(userId)
 
         return ResponseEntity.ok(
@@ -81,10 +76,8 @@ class SearchController(
 
     @GetMapping("/banners")
     fun getBanners(
-        // TODO: @AuthenticationPrincipal userId: Long,
+        @AuthenticationPrincipal userId: Long,
     ): ResponseEntity<ApiResponse<BannersView>> {
-        val userId: Long = 1 // TODO: @AuthenticationPrincipal 구현 시 제거
-
         val response = searchService.getBanners(userId)
 
         return ResponseEntity.ok(

src/test/kotlin/com/terning/server/kotlin/support/WithMockCustomUser.kt

@@ -0,0 +1,10 @@
+package com.terning.server.kotlin.support
+
+import org.springframework.security.test.context.support.WithSecurityContext
+import kotlin.annotation.AnnotationRetention.RUNTIME
+
+@Retention(RUNTIME)
+@WithSecurityContext(factory = WithMockCustomUserSecurityContextFactory::class)
+annotation class WithMockCustomUser(
+    val userId: Long = 1L,
+)

src/test/kotlin/com/terning/server/kotlin/support/WithMockCustomUserSecurityContextFactory.kt

@@ -0,0 +1,16 @@
+package com.terning.server.kotlin.support
+
+import org.springframework.security.authentication.UsernamePasswordAuthenticationToken
+import org.springframework.security.core.context.SecurityContext
+import org.springframework.security.core.context.SecurityContextHolder
+import org.springframework.security.test.context.support.WithSecurityContextFactory
+
+class WithMockCustomUserSecurityContextFactory : WithSecurityContextFactory<WithMockCustomUser> {
+    override fun createSecurityContext(annotation: WithMockCustomUser): SecurityContext {
+        val context = SecurityContextHolder.createEmptyContext()
+        val principal = annotation.userId
+        val auth = UsernamePasswordAuthenticationToken(principal, "", emptyList())
+        context.authentication = auth
+        return context
+    }
+}

src/test/kotlin/com/terning/server/kotlin/ui/api/AnnouncementControllerTest.kt

@@ -3,18 +3,20 @@ package com.terning.server.kotlin.ui.api
 import com.ninjasquad.springmockk.MockkBean
 import com.terning.server.kotlin.application.announcement.AnnouncementService
 import com.terning.server.kotlin.application.announcement.dto.DetailAnnouncementResponse
+import com.terning.server.kotlin.config.TestSecurityConfig
+import com.terning.server.kotlin.support.WithMockCustomUser
 import io.mockk.every
 import org.junit.jupiter.api.DisplayName
 import org.junit.jupiter.api.Test
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.boot.test.autoconfigure.web.servlet.WebMvcTest
-import org.springframework.security.test.context.support.WithMockUser
+import org.springframework.context.annotation.Import
 import org.springframework.test.context.ActiveProfiles
 import org.springframework.test.web.servlet.MockMvc
 import org.springframework.test.web.servlet.get
 
 @WebMvcTest(AnnouncementController::class)
-@WithMockUser
+@Import(TestSecurityConfig::class)
 @ActiveProfiles("test")
 class AnnouncementControllerTest {
     @Autowired
@@ -25,6 +27,7 @@ class AnnouncementControllerTest {
 
     @Test
     @DisplayName("사용자가 원하는 특정 인턴공고 상세 페이지를 조회한다")
+    @WithMockCustomUser(userId = 1L)
     fun getDetailInternshipAnnouncement() {
         // given
         val internshipAnnouncementId = 1L