Merge branch 'develop'

.github/workflows/xquare-cd-dev.yml

@@ -49,4 +49,5 @@ jobs:
             S3_BUCKET_NAME=${{ secrets.S3_BUCKET_NAME }}
             FCM_FILE_URL=${{ secrets.FCM_FILE_URL }}
             FLYWAY_ENABLED=${{ secrets.FLYWAY_ENABLED }}
-            BASELINE_ON_MIGRATE=${{ secrets.BASELINE_ON_MIGRATE }}
+            BASELINE_ON_MIGRATE=${{ secrets.BASELINE_ON_MIGRATE }}
+#            SLACK_WEBHOOK_URL=${{ secrets.SLACK_STAG_WEBHOOK_URL }}

.github/workflows/xquare-cd-prod.yml

@@ -48,4 +48,5 @@ jobs:
             S3_BUCKET_NAME=${{ secrets.S3_BUCKET_NAME }}
             FCM_FILE_URL=${{ secrets.FCM_FILE_URL }}
             FLYWAY_ENABLED=${{ secrets.FLYWAY_ENABLED }}
-            BASELINE_ON_MIGRATE=${{ secrets.BASELINE_ON_MIGRATE }}
+            BASELINE_ON_MIGRATE=${{ secrets.BASELINE_ON_MIGRATE }}
+            SLACK_WEBHOOK_URL=${{ secrets.SLACK_PROD_WEBHOOK_URL }}

Dockerfile

@@ -47,5 +47,8 @@ ENV FLYWAY_ENABLED ${FLYWAY_ENABLED}
 ARG BASELINE_ON_MIGRATE
 ENV BASELINE_ON_MIGRATE ${BASELINE_ON_MIGRATE}
 
+ARG SLACK_WEBHOOK_URL
+ENV SLACK_WEBHOOK_URL ${SLACK_WEBHOOK_URL}
+
 COPY ./dms-infrastructure/build/libs/*.jar app.jar
 ENTRYPOINT ["java","-jar","/app.jar"]

buildSrc/src/main/kotlin/Dependencies.kt

@@ -83,4 +83,8 @@ object Dependencies {
     // flyway
     const val FLYWAY = "org.flywaydb:flyway-mysql:${DependencyVersions.FLYWAY_VERSION}"
 
+    // slack
+    const val SLACK = "com.slack.api:slack-api-client:${DependencyVersions.SLACK_VERSION}"
+
+    const val CACHE = "org.springframework.boot:spring-boot-starter-cache"
 }

buildSrc/src/main/kotlin/DependencyVersions.kt

@@ -20,4 +20,5 @@ object DependencyVersions {
     const val ASPECTJ_VERSION = "1.9.7"
     const val FCM_VERSION = "8.1.0"
     const val FLYWAY_VERSION = "10.8.1"
+    const val SLACK_VERSION = "1.40.3"
 }

dms-core/src/main/kotlin/team/aliens/dms/domain/auth/dto/SignInRequest.kt

@@ -3,5 +3,5 @@ package team.aliens.dms.domain.auth.dto
 data class SignInRequest(
     val accountId: String,
     val password: String,
-    val deviceToken: String
+    val deviceToken: String?
 )

dms-core/src/main/kotlin/team/aliens/dms/domain/auth/usecase/SignInUseCase.kt

@@ -29,16 +29,18 @@ class SignInUseCase(
         )
         val availableFeatures = schoolService.getAvailableFeaturesBySchoolId(user.schoolId)
 
-        if (notificationService.checkDeviceTokenByUserId(user.id))
-            notificationService.deleteDeviceTokenByUserId(user.id)
-
-        notificationService.saveDeviceToken(
-            DeviceToken(
-                userId = user.id,
-                schoolId = user.schoolId,
-                token = request.deviceToken
+        if (!request.deviceToken.isNullOrBlank()) {
+            if (notificationService.checkDeviceTokenByUserId(user.id))
+                notificationService.deleteDeviceTokenByUserId(user.id)
+
+            notificationService.saveDeviceToken(
+                DeviceToken(
+                    userId = user.id,
+                    schoolId = user.schoolId,
+                    token = request.deviceToken
+                )
             )
-        )
+        }
 
         return TokenFeatureResponse.of(tokenResponse, availableFeatures)
     }

dms-core/src/main/kotlin/team/aliens/dms/domain/bug/service/BugService.kt

@@ -4,5 +4,7 @@ import team.aliens.dms.common.annotation.Service
 
 @Service
 class BugService(
-    commandBugService: CommandBugService
-) : CommandBugService by commandBugService
+    commandBugService: CommandBugService,
+    sendBugService: SendBugService
+) : CommandBugService by commandBugService,
+    SendBugService by sendBugService

dms-core/src/main/kotlin/team/aliens/dms/domain/bug/service/SendBugService.kt

@@ -0,0 +1,8 @@
+package team.aliens.dms.domain.bug.service
+
+import team.aliens.dms.domain.bug.model.BugReport
+
+interface SendBugService {
+
+    fun sendBugReport(bugReport: BugReport)
+}

dms-core/src/main/kotlin/team/aliens/dms/domain/bug/service/SendBugServiceImpl.kt

@@ -0,0 +1,15 @@
+package team.aliens.dms.domain.bug.service
+
+import team.aliens.dms.common.annotation.Service
+import team.aliens.dms.domain.bug.model.BugReport
+import team.aliens.dms.domain.bug.spi.SendBugPort
+
+@Service
+class SendBugServiceImpl(
+    private val sendBugPort: SendBugPort
+) : SendBugService {
+
+    override fun sendBugReport(bugReport: BugReport) {
+        sendBugPort.sendBugReport(bugReport)
+    }
+}

dms-core/src/main/kotlin/team/aliens/dms/domain/bug/spi/SendBugPort.kt

@@ -0,0 +1,8 @@
+package team.aliens.dms.domain.bug.spi
+
+import team.aliens.dms.domain.bug.model.BugReport
+
+interface SendBugPort {
+
+    fun sendBugReport(bugReport: BugReport)
+}

dms-core/src/main/kotlin/team/aliens/dms/domain/bug/usecase/CreateBugReportUseCase.kt

@@ -20,13 +20,15 @@ class CreateBugReportUseCase(
 
         val attachmentUrls = request.attachmentUrls ?: emptyList()
 
-        bugService.saveBugReport(
-            BugReport(
-                studentId = student.id,
-                content = request.content,
-                developmentArea = DevelopmentArea.valueOf(request.developmentArea),
-                createdAt = LocalDateTime.now(),
-                attachmentUrls = BugAttachment(attachmentUrls)
+        bugService.sendBugReport(
+            bugService.saveBugReport(
+                BugReport(
+                    studentId = student.id,
+                    content = request.content,
+                    developmentArea = DevelopmentArea.valueOf(request.developmentArea),
+                    createdAt = LocalDateTime.now(),
+                    attachmentUrls = BugAttachment(attachmentUrls)
+                )
             )
         )
     }

dms-core/src/main/kotlin/team/aliens/dms/domain/notification/service/NotificationService.kt

@@ -25,4 +25,6 @@ interface NotificationService :
     fun sendMessagesByTopic(
         notification: Notification
     )
+
+    fun toggleSubscription(token: String, topic: Topic)
 }

dms-core/src/main/kotlin/team/aliens/dms/domain/notification/service/NotificationServiceImpl.kt

@@ -8,6 +8,7 @@ import team.aliens.dms.domain.notification.model.TopicSubscription
 import team.aliens.dms.domain.notification.spi.CommandNotificationOfUserPort
 import team.aliens.dms.domain.notification.spi.CommandTopicSubscriptionPort
 import team.aliens.dms.domain.notification.spi.NotificationPort
+import team.aliens.dms.domain.notification.spi.QueryTopicSubscriptionPort
 import team.aliens.dms.domain.user.spi.QueryUserPort
 
 @Service
@@ -16,6 +17,7 @@ class NotificationServiceImpl(
     private val queryUserPort: QueryUserPort,
     private val commandTopicSubscriptionPort: CommandTopicSubscriptionPort,
     private val notificationOfUserPort: CommandNotificationOfUserPort,
+    private val queryTopicSubscriptionPort: QueryTopicSubscriptionPort,
     getNotificationService: GetNotificationService,
     checkNotificationService: CheckNotificationService,
     commandNotificationService: CommandNotificationService
@@ -118,4 +120,25 @@ class NotificationServiceImpl(
             notification = notification
         )
     }
+
+    override fun toggleSubscription(token: String, topic: Topic) {
+        val deviceToken = this.getDeviceTokenByToken(token)
+        val currentSubscribe = queryTopicSubscriptionPort.queryDeviceTokenIdAndTopic(deviceToken.id, topic)
+
+        currentSubscribe?.let {
+            if (it.isSubscribed) {
+                notificationPort.unsubscribeTopic(token, topic)
+            } else {
+                notificationPort.subscribeTopic(token, topic)
+            }
+
+            commandTopicSubscriptionPort.saveTopicSubscription(
+                TopicSubscription(
+                    deviceTokenId = deviceToken.id,
+                    topic = topic,
+                    isSubscribed = !it.isSubscribed
+                )
+            )
+        }
+    }
 }

dms-core/src/main/kotlin/team/aliens/dms/domain/notification/spi/QueryTopicSubscriptionPort.kt

@@ -1,9 +1,12 @@
 package team.aliens.dms.domain.notification.spi
 
+import team.aliens.dms.domain.notification.model.Topic
 import team.aliens.dms.domain.notification.model.TopicSubscription
 import java.util.UUID
 
 interface QueryTopicSubscriptionPort {
 
     fun queryTopicSubscriptionsByDeviceTokenId(deviceTokenId: UUID): List<TopicSubscription>
+
+    fun queryDeviceTokenIdAndTopic(deviceTokenId: UUID, topic: Topic): TopicSubscription?
 }

dms-core/src/main/kotlin/team/aliens/dms/domain/notification/usecase/ToggleSubscriptionUseCase.kt

@@ -0,0 +1,18 @@
+package team.aliens.dms.domain.notification.usecase
+
+import team.aliens.dms.common.annotation.UseCase
+import team.aliens.dms.domain.notification.model.Topic
+import team.aliens.dms.domain.notification.service.NotificationService
+
+@UseCase
+class ToggleSubscriptionUseCase(
+    private val notificationService: NotificationService
+) {
+
+    fun execute(deviceToken: String, topic: Topic) {
+        notificationService.toggleSubscription(
+            token = deviceToken,
+            topic = topic
+        )
+    }
+}

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/model/OutingAvailableTime.kt

@@ -25,11 +25,10 @@ data class OutingAvailableTime(
 ) : SchoolIdDomain {
 
     fun checkAvailable(
-        dayOfWeek: DayOfWeek,
         outingTime: LocalTime,
         arrivalTime: LocalTime,
     ) {
-        if (this.dayOfWeek != dayOfWeek ||
+        if (
             this.outingTime.isAfter(outingTime) ||
             this.arrivalTime.isBefore(arrivalTime)
         ) {

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/service/CheckOutingServiceImpl.kt

@@ -43,8 +43,8 @@ class CheckOutingServiceImpl(
         arrivalTime: LocalTime
     ) {
         queryOutingAvailableTimePort.queryOutingAvailableTimeByDayOfWeek(outingDate.dayOfWeek)
-            ?.checkAvailable(outingDate.dayOfWeek, outingTime, arrivalTime)
-            ?: throw OutingAvailableTimeMismatchException
+            ?.checkAvailable(outingTime, arrivalTime)
+            ?:throw OutingAvailableTimeMismatchException
     }
 
     override fun checkOutingTypeExists(outingType: OutingType) {

dms-core/src/main/kotlin/team/aliens/dms/domain/outing/usecase/UpdateOutingAvailableTimeUseCase.kt

@@ -14,12 +14,6 @@ class UpdateOutingAvailableTimeUseCase(
     fun execute(outingAvailableTimeId: UUID, outingTime: LocalTime, arrivalTime: LocalTime) {
         val currentOutingAvailableTime = outingService.getOutingAvailableTimeById(outingAvailableTimeId)
 
-        outingService.checkOutingAvailableTimeOverlap(
-            dayOfWeek = currentOutingAvailableTime.dayOfWeek,
-            outingTime = outingTime,
-            arrivalTime = arrivalTime
-        )
-
         val updatedOutingAvailableTime = OutingAvailableTime(
             id = outingAvailableTimeId,
             schoolId = currentOutingAvailableTime.schoolId,

dms-core/src/main/kotlin/team/aliens/dms/domain/student/service/GetStudentServiceImpl.kt

@@ -6,7 +6,6 @@ import team.aliens.dms.domain.file.spi.vo.ExcelStudentVO
 import team.aliens.dms.domain.manager.dto.PointFilter
 import team.aliens.dms.domain.manager.dto.Sort
 import team.aliens.dms.domain.outing.spi.QueryOutingApplicationPort
-import team.aliens.dms.domain.point.spi.QueryPointHistoryPort
 import team.aliens.dms.domain.room.exception.RoomNotFoundException
 import team.aliens.dms.domain.room.model.Room
 import team.aliens.dms.domain.student.exception.StudentNotFoundException

dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/CreateVolunteerRequest.kt

@@ -0,0 +1,11 @@
+package team.aliens.dms.domain.volunteer.dto.request
+
+data class CreateVolunteerRequest(
+    val name: String,
+    val content: String,
+    val availableSex: String,
+    val availableGrade: String,
+    val score: Int,
+    val optionalScore: Int,
+    val maxApplicants: Int
+)

dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/request/UpdateVolunteerRequest.kt

@@ -0,0 +1,14 @@
+package team.aliens.dms.domain.volunteer.dto.request
+
+import java.util.UUID
+
+data class UpdateVolunteerRequest(
+    val name: String,
+    val content: String,
+    val availableSex: String,
+    val availableGrade: String,
+    val score: Int,
+    val optionalScore: Int,
+    val maxApplicants: Int,
+    val volunteerId: UUID
+)

dms-core/src/main/kotlin/team/aliens/dms/domain/volunteer/dto/response/ApplyVolunteerResponse.kt

@@ -0,0 +1,7 @@
+package team.aliens.dms.domain.volunteer.dto.response
+
+import java.util.UUID
+
+data class ApplyVolunteerResponse(
+    val volunteerApplicationId: UUID
+)