release(알림 기능 추가): 1.1.0

.github/workflows/CI.yml

@@ -3,10 +3,7 @@ name: CI
 on:
   push:
     branches:
-      - main
-  pull_request:
-    branches:
-      - main
+      - "*"
 
 jobs:
   build:

.github/workflows/build.yml

@@ -3,10 +3,7 @@ name: Build with Gradle
 on:
   push:
     branches:
-      - main
-  pull_request:
-    branches:
-      - main
+      - "*"
 
 jobs:
   build:

.github/workflows/stage-cd.yml → .github/workflows/dev-cd.yml

@@ -1,13 +1,15 @@
-name: CD for Stage
+name: CD for Dev
 
 on:
   push:
     branches:
+      - develop
       - main
 
 jobs:
   build:
-    environment: stage
+    environment: dev
+    if: github.event.pull_request.base.ref != 'develop'
     runs-on: ubuntu-latest
 
     steps:

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/AdminSignInRequest.kt

@@ -0,0 +1,15 @@
+package team.comit.simtong.domain.user.dto
+
+/**
+ *
+ * 관리자의 로그인을 정보를 전달하는 AdminSignInRequest
+ *
+ * @author kimbeomjin
+ * @date 2023/01/01
+ * @version 1.1.0
+ **/
+data class AdminSignInRequest(
+    val employeeNumber: Int,
+
+    val password: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/SignUpRequest.kt

@@ -20,5 +20,7 @@ data class SignUpRequest(
 
     val employeeNumber: Int,
 
-    val profileImagePath: String?
+    val profileImagePath: String?,
+
+    val deviceToken: String
 )

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/dto/UserSignInRequest.kt

@@ -0,0 +1,17 @@
+package team.comit.simtong.domain.user.dto
+
+/**
+ *
+ * 일반 사용자의 로그인을 정보를 전달하는 UserSignInRequest
+ *
+ * @author kimbeomjin
+ * @date 2022/09/08
+ * @version 1.0.0
+ **/
+data class UserSignInRequest(
+    val employeeNumber: Int,
+
+    val password: String,
+
+    val deviceToken: String
+)

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/CommandDeviceTokenPort.kt

@@ -0,0 +1,17 @@
+package team.comit.simtong.domain.user.spi
+
+import team.comit.simtong.domain.user.model.DeviceToken
+
+/**
+ *
+ * DeviceToken Domain에 관한 명령을 하는 CommandDeviceTokenPort
+ *
+ * @author kimbeomjin
+ * @date 2022/12/31
+ * @version 1.1.0
+ **/
+interface CommandDeviceTokenPort {
+
+    fun save(deviceToken: DeviceToken): DeviceToken
+
+}

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/spi/UserPort.kt

@@ -13,4 +13,4 @@ import team.comit.simtong.domain.schedule.spi.ScheduleQueryUserPort
  * @date 2022/09/18
  * @version 1.0.0
  **/
-interface UserPort : QueryUserPort, CommandUserPort, MenuQueryUserPort, ScheduleQueryUserPort, HolidayQueryUserPort, NotificationQueryUserPort
+interface UserPort : QueryUserPort, CommandUserPort, CommandDeviceTokenPort, MenuQueryUserPort, ScheduleQueryUserPort, HolidayQueryUserPort, NotificationQueryUserPort

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/AdminSignInUseCase.kt

@@ -1,7 +1,7 @@
 package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.auth.dto.TokenResponse
-import team.comit.simtong.domain.user.dto.SignInRequest
+import team.comit.simtong.domain.user.dto.AdminSignInRequest
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.spi.QueryUserPort
@@ -24,7 +24,7 @@ class AdminSignInUseCase(
     private val securityPort: UserSecurityPort
 ) {
 
-    fun execute(request: SignInRequest): TokenResponse {
+    fun execute(request: AdminSignInRequest): TokenResponse {
         val admin = queryUserPort.queryUserByEmployeeNumber(request.employeeNumber)
             ?: throw UserExceptions.NotFound("관리자가 존재하지 않습니다.")
 

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/SignInUseCase.kt

@@ -1,9 +1,11 @@
 package team.comit.simtong.domain.user.usecase
 
 import team.comit.simtong.domain.auth.dto.TokenResponse
-import team.comit.simtong.domain.user.dto.SignInRequest
+import team.comit.simtong.domain.user.dto.UserSignInRequest
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
+import team.comit.simtong.domain.user.model.DeviceToken
+import team.comit.simtong.domain.user.spi.CommandDeviceTokenPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.domain.user.spi.UserJwtPort
 import team.comit.simtong.domain.user.spi.UserSecurityPort
@@ -21,10 +23,11 @@ import team.comit.simtong.global.annotation.UseCase
 class SignInUseCase(
     private val queryUserPort: QueryUserPort,
     private val userSecurityPort: UserSecurityPort,
-    private val userJwtPort: UserJwtPort
+    private val userJwtPort: UserJwtPort,
+    private val commandDeviceTokenPort: CommandDeviceTokenPort
 ) {
 
-    fun execute(request: SignInRequest): TokenResponse {
+    fun execute(request: UserSignInRequest): TokenResponse {
         val user = queryUserPort.queryUserByEmployeeNumber(request.employeeNumber)
             ?: throw UserExceptions.NotFound()
 
@@ -36,6 +39,13 @@ class SignInUseCase(
             throw UserExceptions.DifferentPassword()
         }
 
+        commandDeviceTokenPort.save(
+            DeviceToken(
+                userId = user.id,
+                token = request.deviceToken
+            )
+        )
+
         return userJwtPort.receiveToken(
             userId = user.id,
             authority = Authority.ROLE_COMMON

simtong-application/src/main/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCase.kt

@@ -8,7 +8,9 @@ import team.comit.simtong.domain.team.exception.TeamExceptions
 import team.comit.simtong.domain.user.dto.SignUpRequest
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
+import team.comit.simtong.domain.user.model.DeviceToken
 import team.comit.simtong.domain.user.model.User
+import team.comit.simtong.domain.user.spi.CommandDeviceTokenPort
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.domain.user.spi.UserCommandAuthCodeLimitPort
@@ -33,6 +35,7 @@ import team.comit.simtong.global.annotation.UseCase
 class SignUpUseCase(
     private val jwtPort: UserJwtPort,
     private val commandUserPort: CommandUserPort,
+    private val commandDeviceTokenPort: CommandDeviceTokenPort,
     private val queryUserPort: QueryUserPort,
     private val queryAuthCodeLimitPort: UserQueryAuthCodeLimitPort,
     private val commandAuthCodeLimitPort: UserCommandAuthCodeLimitPort,
@@ -88,6 +91,13 @@ class SignUpUseCase(
 
         commandAuthCodeLimitPort.delete(authCodeLimit)
 
+        commandDeviceTokenPort.save(
+            DeviceToken(
+                userId = user.id,
+                token = request.deviceToken
+            )
+        )
+
         return jwtPort.receiveToken(
             userId = user.id,
             authority = user.authority

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/AdminSignInUseCaseTests.kt

@@ -7,7 +7,7 @@ import org.junit.jupiter.api.assertThrows
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
 import team.comit.simtong.domain.auth.dto.TokenResponse
-import team.comit.simtong.domain.user.dto.SignInRequest
+import team.comit.simtong.domain.user.dto.AdminSignInRequest
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.model.User
@@ -64,8 +64,8 @@ class AdminSignInUseCaseTests {
         )
     }
 
-    private val requestStub: SignInRequest by lazy {
-        SignInRequest(
+    private val requestStub: AdminSignInRequest by lazy {
+        AdminSignInRequest(
             employeeNumber = employeeNumber,
             password = "test password"
         )

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/SignInUseCaseTests.kt

@@ -7,10 +7,11 @@ import org.junit.jupiter.api.assertThrows
 import org.mockito.BDDMockito.given
 import org.springframework.boot.test.mock.mockito.MockBean
 import team.comit.simtong.domain.auth.dto.TokenResponse
-import team.comit.simtong.domain.user.dto.SignInRequest
+import team.comit.simtong.domain.user.dto.UserSignInRequest
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.model.User
+import team.comit.simtong.domain.user.spi.CommandDeviceTokenPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.domain.user.spi.UserJwtPort
 import team.comit.simtong.domain.user.spi.UserSecurityPort
@@ -30,6 +31,9 @@ class SignInUseCaseTests {
     @MockBean
     private lateinit var userJwtPort: UserJwtPort
 
+    @MockBean
+    private lateinit var commandDeviceTokenPort: CommandDeviceTokenPort
+
     private lateinit var signInUseCase: SignInUseCase
 
     private val employeeNumber: Int = 1234567891
@@ -64,10 +68,11 @@ class SignInUseCaseTests {
         )
     }
 
-    private val requestStub: SignInRequest by lazy {
-        SignInRequest(
+    private val requestStub: UserSignInRequest by lazy {
+        UserSignInRequest(
             employeeNumber = employeeNumber,
-            password = "test password"
+            password = "test password",
+            deviceToken = "test device token"
         )
     }
 
@@ -81,7 +86,7 @@ class SignInUseCaseTests {
 
     @BeforeEach
     fun setUp() {
-        signInUseCase = SignInUseCase(queryUserPort, userSecurityPort, userJwtPort)
+        signInUseCase = SignInUseCase(queryUserPort, userSecurityPort, userJwtPort, commandDeviceTokenPort)
     }
 
     @Test

simtong-application/src/test/kotlin/team/comit/simtong/domain/user/usecase/SignUpUseCaseTests.kt

@@ -19,6 +19,7 @@ import team.comit.simtong.domain.user.dto.SignUpRequest
 import team.comit.simtong.domain.user.exception.UserExceptions
 import team.comit.simtong.domain.user.model.Authority
 import team.comit.simtong.domain.user.model.User
+import team.comit.simtong.domain.user.spi.CommandDeviceTokenPort
 import team.comit.simtong.domain.user.spi.CommandUserPort
 import team.comit.simtong.domain.user.spi.QueryUserPort
 import team.comit.simtong.domain.user.spi.UserCommandAuthCodeLimitPort
@@ -41,6 +42,9 @@ class SignUpUseCaseTests {
     @MockBean
     private lateinit var commandUserPort: CommandUserPort
 
+    @MockBean
+    private lateinit var commandDeviceTokenPort: CommandDeviceTokenPort
+
     @MockBean
     private lateinit var userSecurityPort: UserSecurityPort
 
@@ -134,7 +138,8 @@ class SignUpUseCaseTests {
             email = email,
             password = "test password",
             employeeNumber = employeeNumber,
-            profileImagePath = profileImagePath
+            profileImagePath = profileImagePath,
+            deviceToken = "test device token"
         )
     }
 
@@ -151,6 +156,7 @@ class SignUpUseCaseTests {
         signUpUseCase = SignUpUseCase(
             userJwtPort,
             commandUserPort,
+            commandDeviceTokenPort,
             queryUserPort,
             userQueryAuthCodeLimitPort,
             commandAuthCodeLimitPort,
@@ -222,7 +228,8 @@ class SignUpUseCaseTests {
             email = email,
             password = "test password",
             employeeNumber = employeeNumber,
-            profileImagePath = null
+            profileImagePath = null,
+            deviceToken = "test device token"
         )
 
         val userStub = User(

simtong-domain/src/main/kotlin/team/comit/simtong/domain/user/model/DeviceToken.kt

@@ -0,0 +1,16 @@
+package team.comit.simtong.domain.user.model
+
+import java.util.UUID
+
+/**
+ *
+ * User Aggregate의 디바이스 토큰 관리를 담당하는 DeviceToken
+ *
+ * @author kimbeomjin
+ * @date 2023/01/01
+ * @version 1.1.0
+ **/
+data class DeviceToken(
+    val userId: UUID,
+    val token: String
+)

simtong-infrastructure/src/main/kotlin/team/comit/simtong/global/security/SecurityConfig.kt

@@ -109,6 +109,10 @@ class SecurityConfig(
             .antMatchers(HttpMethod.POST, "/admins/tokens").permitAll()
             .antMatchers(HttpMethod.GET, "/admins/information").hasAnyRole(ROLE_ADMIN.role, ROLE_SUPER.role)
 
+            // notifications
+            .antMatchers(HttpMethod.POST, "/notifications").permitAll()
+            .antMatchers(HttpMethod.POST, "/notifications/list").permitAll()
+
             .anyRequest().authenticated()
 
         http

simtong-infrastructure/src/main/kotlin/team/comit/simtong/persistence/user/UserPersistenceAdapter.kt

@@ -2,8 +2,10 @@ package team.comit.simtong.persistence.user
 
 import org.springframework.data.repository.findByIdOrNull
 import org.springframework.stereotype.Component
+import team.comit.simtong.domain.user.model.DeviceToken
 import team.comit.simtong.domain.user.model.User
 import team.comit.simtong.domain.user.spi.UserPort
+import team.comit.simtong.persistence.user.mapper.DeviceTokenMapper
 import team.comit.simtong.persistence.user.mapper.UserMapper
 import team.comit.simtong.persistence.user.repository.DeviceTokenJpaRepository
 import team.comit.simtong.persistence.user.repository.UserJpaRepository
@@ -22,6 +24,7 @@ import java.util.UUID
 class UserPersistenceAdapter(
     private val userMapper: UserMapper,
     private val userJpaRepository: UserJpaRepository,
+    private val deviceTokenMapper: DeviceTokenMapper,
     private val deviceTokenRepository: DeviceTokenJpaRepository
 ) : UserPort {
 
@@ -77,6 +80,12 @@ class UserPersistenceAdapter(
         ).let { userMapper.toDomain(it)!! }
     }
 
+    override fun save(deviceToken: DeviceToken): DeviceToken {
+        return deviceTokenRepository.save(
+            deviceTokenMapper.toEntity(deviceToken)
+        ).let { deviceTokenMapper.toDomain(it)!! }
+    }
+
     override fun queryDeviceTokenByUserId(userId: UUID): String? {
         return deviceTokenRepository.findByUserId(userId)?.token
     }