Skip to content

Commit aa8f7ae

Browse files
author
kpeel
committed
feat: Admin, 서버드리븐, 로그아웃, 이미지 기능 구현
1 parent 0609735 commit aa8f7ae

File tree

67 files changed

+1186
-108
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

67 files changed

+1186
-108
lines changed

‎Dockerfile

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
1-
FROM openjdk:17
1+
FROM openjdk:21
22
COPY app/build/libs/app-1.0.0.jar app.jar
33
ENTRYPOINT ["java", "-jar","-Dspring.profiles.active=dev", "app.jar"]

‎app/build.gradle.kts

-2
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,6 @@ dependencies {
1818
testImplementation("io.jsonwebtoken:jjwt-api:0.11.2")
1919
testImplementation("io.jsonwebtoken:jjwt-impl:0.11.2")
2020
testImplementation("io.jsonwebtoken:jjwt-jackson:0.11.2")
21-
2221
testImplementation("io.rest-assured:rest-assured")
2322

24-
2523
}

‎app/src/main/kotlin/com/wespot/admin/AdminController.kt

+34-11
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.wespot.admin
22

3-
import com.wespot.admin.dto.CreatedVoteOptionRequest
4-
import com.wespot.admin.dto.UpdateVoteOptionRequest
5-
import com.wespot.admin.dto.VoteOptionResponses
3+
import com.wespot.admin.dto.*
64
import com.wespot.admin.port.`in`.AdminVoteOptionUseCase
5+
import com.wespot.admin.port.`in`.FirebaseUseCase
76
import com.wespot.admin.swagger.AdminSwagger
87
import com.wespot.notification.dto.NotificationPublishingRequest
8+
import com.wespot.notification.dto.PublishNotificationTypeResponse
99
import com.wespot.notification.port.`in`.PublishNotificationUseCase
1010
import org.springframework.http.HttpStatus
1111
import org.springframework.http.ResponseEntity
1212
import org.springframework.stereotype.Controller
13+
import org.springframework.web.bind.annotation.DeleteMapping
1314
import org.springframework.web.bind.annotation.GetMapping
1415
import org.springframework.web.bind.annotation.PathVariable
1516
import org.springframework.web.bind.annotation.PostMapping
@@ -21,7 +22,8 @@ import org.springframework.web.bind.annotation.RequestMapping
2122
@RequestMapping("/admin")
2223
class AdminController(
2324
private val adminVoteOptionUseCase: AdminVoteOptionUseCase,
24-
private val publishNotificationUseCase: PublishNotificationUseCase
25+
private val publishNotificationUseCase: PublishNotificationUseCase,
26+
private val firebaseUseCase: FirebaseUseCase,
2527
) : AdminSwagger {
2628

2729
@GetMapping("/vote-options")
@@ -61,6 +63,13 @@ class AdminController(
6163
return ResponseEntity.ok(response)
6264
}
6365

66+
@GetMapping("/push-notification/publish")
67+
override fun getNotificationPublishingScreen(): ResponseEntity<List<PublishNotificationTypeResponse>> {
68+
val response = publishNotificationUseCase.viewAllOfPossibleToPublishTypes()
69+
70+
return ResponseEntity.ok(response)
71+
}
72+
6473
@PostMapping("/push-notification/publish")
6574
override fun publishNotification(
6675
@RequestBody notificationPublishingRequest: NotificationPublishingRequest
@@ -71,21 +80,35 @@ class AdminController(
7180
.build()
7281
}
7382

74-
@GetMapping("") // Notific
75-
override fun getRemoteConfigsVariable(): ResponseEntity<List<RemoteConfigVariableResponse>> {
83+
@GetMapping("/remote-config")
84+
override fun getRemoteConfigsVariables(): ResponseEntity<List<RemoteConfigVariableResponse>> {
85+
val response = firebaseUseCase.findAllVariableInRemoteConfig()
7686

77-
publishNotificationUseCase.publishProfileUpdate(notificationPublishingRequest)
87+
return ResponseEntity.ok(response)
88+
}
7889

79-
return ResponseEntity.status(HttpStatus.CREATED)
90+
@PutMapping("/remote-config")
91+
override fun setRemoteConfigVariables(@RequestBody request: ModifiedRemoteConfigVariableRequest): ResponseEntity<Unit> {
92+
firebaseUseCase.modifyRemoteConfigVariables(request)
93+
94+
return ResponseEntity.status(HttpStatus.OK)
8095
.build()
8196
}
8297

83-
@PutMapping("") // Notific
84-
override fun getNotification(): ResponseEntity<Unit> {
85-
publishNotificationUseCase.publishProfileUpdate(notificationPublishingRequest)
98+
@PostMapping("/remote-config")
99+
override fun addRemoteConfigVariables(@RequestBody request: SavedRemoteConfigVariableRequest): ResponseEntity<Unit> {
100+
firebaseUseCase.addRemoteConfigVariables(request)
86101

87102
return ResponseEntity.status(HttpStatus.CREATED)
88103
.build()
89104
}
90105

106+
@DeleteMapping("/remote-config/{key}")
107+
override fun deleteRemoteConfigVariables(@PathVariable key: String): ResponseEntity<Unit> {
108+
firebaseUseCase.remoteRemoteConfigVariables(key)
109+
110+
return ResponseEntity.noContent()
111+
.build()
112+
}
113+
91114
}

‎app/src/main/kotlin/com/wespot/admin/swagger/AdminSwagger.kt

+19-7
Original file line numberDiff line numberDiff line change
@@ -1,17 +1,14 @@
11
package com.wespot.admin.swagger
22

3-
import com.wespot.admin.dto.CreatedVoteOptionRequest
4-
import com.wespot.admin.dto.UpdateVoteOptionRequest
5-
import com.wespot.admin.dto.VoteOptionResponses
3+
import com.wespot.admin.dto.*
64
import com.wespot.notification.dto.NotificationPublishingRequest
5+
import com.wespot.notification.dto.PublishNotificationTypeResponse
76
import io.swagger.v3.oas.annotations.Operation
87
import io.swagger.v3.oas.annotations.Parameter
98
import io.swagger.v3.oas.annotations.tags.Tag
109
import org.springframework.http.HttpStatus
1110
import org.springframework.http.ResponseEntity
12-
import org.springframework.web.bind.annotation.PathVariable
13-
import org.springframework.web.bind.annotation.PostMapping
14-
import org.springframework.web.bind.annotation.RequestBody
11+
import org.springframework.web.bind.annotation.*
1512

1613
@Tag(name = "Admin API", description = "혜연짱을 위한 API 입니다.")
1714
interface AdminSwagger {
@@ -35,9 +32,24 @@ interface AdminSwagger {
3532
request: UpdateVoteOptionRequest
3633
): ResponseEntity<Long>
3734

35+
@Operation(summary = "푸시 알림 타입을 조회할 수 있는 API")
36+
fun getNotificationPublishingScreen(): ResponseEntity<List<PublishNotificationTypeResponse>>
37+
3838
@Operation(summary = "푸시 알림 전송 API")
3939
fun publishNotification(
40-
@RequestBody notificationPublishingRequest: NotificationPublishingRequest
40+
notificationPublishingRequest: NotificationPublishingRequest
4141
): ResponseEntity<Unit>
4242

43+
@Operation(summary = "Remote Config 변수 목록 조회 API")
44+
fun getRemoteConfigsVariables(): ResponseEntity<List<RemoteConfigVariableResponse>>
45+
46+
@Operation(summary = "Remote Config 변수 수정 API")
47+
fun setRemoteConfigVariables(request: ModifiedRemoteConfigVariableRequest): ResponseEntity<Unit>
48+
49+
@Operation(summary = "Remote Config 변수 생성 API")
50+
fun addRemoteConfigVariables(request: SavedRemoteConfigVariableRequest): ResponseEntity<Unit>
51+
52+
@Operation(summary = "Remote Config 변수 삭제 API")
53+
fun deleteRemoteConfigVariables(key: String): ResponseEntity<Unit>
54+
4355
}

‎app/src/main/kotlin/com/wespot/auth/AuthController.kt

+14-6
Original file line numberDiff line numberDiff line change
@@ -8,18 +8,18 @@ import com.wespot.auth.dto.response.SignUpResponse
88
import com.wespot.auth.dto.response.TokenAndUserDetailResponse
99
import com.wespot.auth.dto.response.TokenResponse
1010
import com.wespot.auth.port.`in`.AuthUseCase
11+
import com.wespot.auth.port.`in`.LogoutUsecase
12+
import com.wespot.auth.swagger.AuthSwagger
1113
import org.springframework.http.HttpStatus
1214
import org.springframework.http.ResponseEntity
13-
import org.springframework.web.bind.annotation.PostMapping
14-
import org.springframework.web.bind.annotation.RequestBody
15-
import org.springframework.web.bind.annotation.RequestMapping
16-
import org.springframework.web.bind.annotation.RestController
15+
import org.springframework.web.bind.annotation.*
1716

1817
@RestController
1918
@RequestMapping("/api/v1/auth")
2019
class AuthController(
21-
private val authUseCase: AuthUseCase
22-
) {
20+
private val authUseCase: AuthUseCase,
21+
private val logoutUsecase: LogoutUsecase
22+
) : AuthSwagger {
2323

2424
@PostMapping("/login")
2525
fun signIn(
@@ -73,4 +73,12 @@ class AuthController(
7373
.body(response)
7474
}
7575

76+
@PatchMapping("/logout")
77+
override fun logout(): ResponseEntity<Unit> {
78+
logoutUsecase.logout()
79+
80+
return ResponseEntity.noContent()
81+
.build()
82+
}
83+
7684
}

‎app/src/main/kotlin/com/wespot/auth/swagger/AuthSwagger.kt

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.wespot.auth.swagger
2+
3+
import io.swagger.v3.oas.annotations.Operation
4+
import io.swagger.v3.oas.annotations.tags.Tag
5+
import org.springframework.http.ResponseEntity
6+
7+
@Tag(name = "Auth API", description = "Auth API")
8+
interface AuthSwagger {
9+
10+
@Operation(
11+
summary = "Logout API 입니다.",
12+
description = "현재로써는 FCM만 날리고 있습니다"
13+
)
14+
fun logout(): ResponseEntity<Unit>
15+
16+
}

‎app/src/main/kotlin/com/wespot/common/update/UpdateModalController.kt

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
package com.wespot.common.update
2+
3+
import com.wespot.common.dto.UpdatedModalComponentResponse
4+
import com.wespot.common.`in`.UpdatedFeatureUseCase
5+
import com.wespot.common.update.swagger.UpdateModalSwagger
6+
import com.wespot.notification.NotificationType
7+
import com.wespot.notification.PublishNotificationType
8+
import org.springframework.http.ResponseEntity
9+
import org.springframework.web.bind.annotation.GetMapping
10+
import org.springframework.web.bind.annotation.RequestMapping
11+
import org.springframework.web.bind.annotation.RestController
12+
13+
@RestController
14+
@RequestMapping("/api/v1/update-modal")
15+
class UpdateModalController(
16+
private val updatedFeatureUseCase: UpdatedFeatureUseCase
17+
) : UpdateModalSwagger {
18+
19+
@GetMapping
20+
override fun getProfileUpdateScreen(publishNotificationType: PublishNotificationType): ResponseEntity<UpdatedModalComponentResponse> {
21+
val response = updatedFeatureUseCase.getUpdatedFeatureScreen(publishNotificationType)
22+
23+
return ResponseEntity.ok(response)
24+
}
25+
26+
}

‎app/src/main/kotlin/com/wespot/common/update/swagger/UpdateModalSwagger.kt

+16
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
package com.wespot.common.update.swagger
2+
3+
import com.wespot.common.dto.UpdatedModalComponentResponse
4+
import com.wespot.notification.NotificationType
5+
import com.wespot.notification.PublishNotificationType
6+
import io.swagger.v3.oas.annotations.Operation
7+
import io.swagger.v3.oas.annotations.tags.Tag
8+
import org.springframework.http.ResponseEntity
9+
10+
@Tag(name = "Update Modal API", description = "Update Modal API 관련 문서입니다.")
11+
interface UpdateModalSwagger {
12+
13+
@Operation(summary = "알림을 클라이언트에서 넘겨주면 그에 맞는 업데이트 모달 UI를 반환합니다.")
14+
fun getProfileUpdateScreen(publishNotificationType: PublishNotificationType): ResponseEntity<UpdatedModalComponentResponse>
15+
16+
}

‎app/src/main/kotlin/com/wespot/config/security/JwtAuthenticationFilter.kt

+7-7
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,13 @@ class JwtAuthenticationFilter(
3434
filterChain.doFilter(request, response)
3535
}
3636

37+
private fun extractToken(request: HttpServletRequest): String? {
38+
val bearerToken = request.getHeader(JwtTokenInfo.AUTHORIZATION_HEADER)
39+
return if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(JwtTokenInfo.BEARER_TYPE)) {
40+
bearerToken.substring(JwtTokenInfo.BEARER_TYPE.length).trim()
41+
} else null
42+
}
43+
3744
private fun authenticateUserByToken(token: String) {
3845
try {
3946
val authentication = authenticationUseCase.getAuthentication(token)
@@ -42,11 +49,4 @@ class JwtAuthenticationFilter(
4249
SecurityContextHolder.clearContext()
4350
}
4451
}
45-
46-
private fun extractToken(request: HttpServletRequest): String? {
47-
val bearerToken = request.getHeader(JwtTokenInfo.AUTHORIZATION_HEADER)
48-
return if (StringUtils.hasText(bearerToken) && bearerToken.startsWith(JwtTokenInfo.BEARER_TYPE)) {
49-
bearerToken.substring(JwtTokenInfo.BEARER_TYPE.length).trim()
50-
} else null
51-
}
5252
}

‎app/src/main/kotlin/com/wespot/config/security/SecurityConfig.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ class SecurityConfig(
7979
"/wespot/**",
8080
"/v3/api-docs/**",
8181
"/api/v1/image/sign-up",
82-
"/api/v1/image/presigned-url",
82+
"/api/v1/image/presigned-url"
8383
).permitAll()
8484
.anyRequest().authenticated()
8585
}

‎app/src/main/kotlin/com/wespot/image/ImageController.kt

+3-3
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ package com.wespot.image
22

33
import com.wespot.image.dto.ImageResponse
44
import com.wespot.image.dto.PresignedResponse
5+
import com.wespot.image.dto.ProfileUpdateRequest
56
import com.wespot.image.`in`.ImageUseCase
67
import org.springframework.http.ResponseEntity
78
import org.springframework.web.bind.annotation.GetMapping
@@ -24,9 +25,8 @@ class ImageController(
2425
}
2526

2627
@PostMapping("/update-profile")
27-
fun saveImageProfile(url: String?): ResponseEntity<ImageResponse> {
28-
val response = imageUseCase.saveWithUpdateProfile(url)
29-
28+
fun saveImageProfile(request: ProfileUpdateRequest): ResponseEntity<ImageResponse> {
29+
val response = imageUseCase.saveWithUpdateProfile(request)
3030
return ResponseEntity.ok(response)
3131
}
3232

‎app/src/main/kotlin/com/wespot/message/MessageOnBoardingController.kt

+24
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package com.wespot.message
2+
3+
import com.wespot.message.dto.response.view.MessageOnBoardingResponse
4+
import com.wespot.message.port.`in`.MessageOnBoardingUseCase
5+
import com.wespot.message.swagger.MessageOnBoardingSwagger
6+
import org.springframework.http.ResponseEntity
7+
import org.springframework.web.bind.annotation.GetMapping
8+
import org.springframework.web.bind.annotation.RequestMapping
9+
import org.springframework.web.bind.annotation.RestController
10+
11+
@RestController
12+
@RequestMapping("/api/v1/messages")
13+
class MessageOnBoardingController(
14+
private val messageOnBoardingUseCase: MessageOnBoardingUseCase
15+
) : MessageOnBoardingSwagger {
16+
17+
@GetMapping("/on-boarding")
18+
override fun getOnBoardingComponents(): ResponseEntity<MessageOnBoardingResponse> {
19+
val response = messageOnBoardingUseCase.getOnBoardingComponents()
20+
21+
return ResponseEntity.ok(response)
22+
}
23+
24+
}

‎app/src/main/kotlin/com/wespot/message/swagger/MessageOnBoardingSwagger.kt

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
package com.wespot.message.swagger
2+
3+
import com.wespot.message.dto.response.view.MessageOnBoardingResponse
4+
import io.swagger.v3.oas.annotations.Operation
5+
import io.swagger.v3.oas.annotations.tags.Tag
6+
import org.springframework.http.ResponseEntity
7+
8+
@Tag(name = "온보딩 시트 서버드리븐 API", description = "마음 온보딩 시트를 받는 서버드리븐 API 입니다.")
9+
interface MessageOnBoardingSwagger {
10+
11+
@Operation(summary = "마음 온보딩 시트를 받는 서버드리븐 API 입니다.")
12+
fun getOnBoardingComponents(): ResponseEntity<MessageOnBoardingResponse>
13+
14+
}

‎app/src/test/kotlin/com/wespot/user/domain/UserVersionTest.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ class UserVersionTest {
4444
)
4545

4646
// when
47-
val actual = userVersion.isPossibleToSendUpdateNotification("1.3.0", "1.3.0")
47+
val actual = userVersion.hasLatestVersion("1.3.0", "1.3.0")
4848

4949
// then
5050
actual shouldBe expected

‎build.gradle.kts

+2-3
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ extra["springCloudVersion"] = "2023.0.2"
1414

1515
java {
1616
toolchain {
17-
languageVersion = JavaLanguageVersion.of(17)
17+
languageVersion = JavaLanguageVersion.of(21)
1818
}
1919
}
2020

@@ -93,7 +93,6 @@ subprojects {
9393

9494
}
9595

96-
9796
dependencyManagement {
9897
imports {
9998
mavenBom("org.springframework.cloud:spring-cloud-dependencies:${property("springCloudVersion")}")
@@ -104,7 +103,7 @@ subprojects {
104103
tasks.withType<KotlinCompile> {
105104
kotlinOptions {
106105
freeCompilerArgs += "-Xjsr305=strict"
107-
jvmTarget = "17"
106+
jvmTarget = "21"
108107
}
109108
}
110109

‎core/src/main/kotlin/com/wespot/admin/dto/ModifiedRemoteConfigVariableRequest.kt

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
package com.wespot.admin.dto
2+
3+
data class ModifiedRemoteConfigVariableRequest(
4+
val key: String,
5+
val value: String
6+
) {
7+
}

0 commit comments

Comments
 (0)