Merge branch 'develop' into feat/#25-1

Author: daeun084

.github/workflows/gat-deploy.yml

@@ -46,7 +46,12 @@ jobs:
         run: |
           mkdir -p src/main/resources
           echo "${{ secrets.GAT_SECRET_YML }}" > src/main/resources/application-secret.yml
-          
+
+      # FCM을 위한 자격 증명 파일 fcm-service-key.json 생성
+      - name: Create fcm-service-key.json before Docker build
+        run: |
+          echo "${{ secrets.FCM_SERVICE_KEY }}" | base64 --decode > src/main/resources/fcm-service-key.json
+
       # Docker 이미지 태그 준비 (SHA 해시와 latest 태그 포함)
       - name: Prepare image tags
         id: meta

.gitignore

@@ -42,4 +42,5 @@ out/
 .DS_Store
 
 ### secret yml ###
-src/main/resources/application-secret.yml
+src/main/resources/application-secret.yml
+src/main/resources/fcm-service-key.json

build.gradle.kts

@@ -49,10 +49,13 @@ dependencies {
 	implementation("org.springframework.boot:spring-boot-starter-thymeleaf")
 
 	// webClient
-	implementation ("org.springframework.boot:spring-boot-starter-webflux")
+	implementation("org.springframework.boot:spring-boot-starter-webflux")
 
 	// Aop
-	implementation ("org.springframework.boot:spring-boot-starter-aop")
+	implementation("org.springframework.boot:spring-boot-starter-aop")
+
+	// fcm
+	implementation("com.google.firebase:firebase-admin:9.2.0")
 
 	compileOnly("org.projectlombok:lombok")
 	runtimeOnly("com.mysql:mysql-connector-j")

src/main/kotlin/gat_be/dev/common/config/FirebaseConfig.kt

@@ -0,0 +1,38 @@
+package gat_be.dev.common.config
+
+import com.google.auth.oauth2.GoogleCredentials
+import com.google.firebase.FirebaseApp
+import com.google.firebase.FirebaseOptions
+import gat_be.dev.common.exception.GeneralException
+import gat_be.dev.common.status.ErrorStatus
+import jakarta.annotation.PostConstruct
+import org.springframework.beans.factory.annotation.Value
+import org.springframework.context.annotation.Configuration
+import org.springframework.core.io.Resource
+
+
+@Configuration
+class FirebaseConfig(
+    @Value("\${fcm.credentials.path}") private val accountKey: Resource
+) {
+
+    @PostConstruct
+    fun initialize() {
+        try {
+            val serviceAccount = accountKey.inputStream
+
+            val options = FirebaseOptions.builder()
+                .setCredentials(GoogleCredentials.fromStream(serviceAccount))
+                .build()
+
+            if (FirebaseApp.getApps().isEmpty()) {
+                FirebaseApp.initializeApp(options)
+            }
+
+        } catch (e: Exception) {
+            e.printStackTrace()
+            throw GeneralException(ErrorStatus.INITIAL_FIREBASE_INTERNAL_SERVER_ERROR)
+        }
+    }
+
+}

src/main/kotlin/gat_be/dev/common/config/SecurityConfig.kt

@@ -75,7 +75,7 @@ class SecurityConfig(
     @Bean
     fun corsConfigurationSource(): CorsConfigurationSource {
         val config = CorsConfiguration().apply {
-            allowedOrigins = listOf("http://localhost:8000", "http://localhost:3000")
+            allowedOrigins = listOf("https://get-a-team.site", "http://localhost:8000", "http://localhost:3000")
             allowedMethods = listOf("GET", "POST", "PATCH", "DELETE")
             allowedHeaders = listOf("Authorization", "Content-Type")
             exposedHeaders = listOf("Authorization")

src/main/kotlin/gat_be/dev/common/log/discord/DiscordAlarmSender.kt

@@ -37,4 +37,7 @@ class DiscordAlarmSender(
             )
     }
 
+
+    
+
 }

src/main/kotlin/gat_be/dev/common/status/ErrorStatus.kt

@@ -22,6 +22,7 @@ enum class ErrorStatus(
     /**
      * User
      */
+    USER_SCRAPPED_TEAM_NOT_FOUND(HttpStatus.NOT_FOUND, "USER_404", "존재하지 않는 유저 스크랩 내역입니다."),
 
 
     /**
@@ -90,4 +91,14 @@ enum class ErrorStatus(
     CANNOT_CREATE_REVIEW_WHEN_TEAM_IS_NOT_DONE(HttpStatus.CONFLICT, "REVIEW_409", "팀 활동이 종료되기 전에는 리뷰를 작성할 수 없습니다"),
     INVALID_REVIEW_LIST_SORT_PARAM(HttpStatus.BAD_REQUEST, "REVIEW_400", "리뷰 리스트 조회를 위한 정렬 조건이 잘못 되었습니다."),
     REVIEW_NOT_FOUND(HttpStatus.NOT_FOUND, "REVIEW_404", "해당 리뷰 정보를 찾을 수 없습니다")
+
+    /**
+     * Notification
+     */
+    NOTIFICATION_FORBIDDEN(HttpStatus.FORBIDDEN, "NOTIFICATION_403", "알림에 대한 접근 권한이 없습니다."),
+    NOTIFICATION_NOT_FOUND(HttpStatus.NOT_FOUND, "NOTIFICATION_404", "존재하지 않는 알림입니다."),
+    INITIAL_FIREBASE_INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "NOTIFICATION_500", "Firebase 인증 초기화 중 오류가 발생했습니다."),
+    SEND_FCM_NOTIFICATION_INTERNAL_SERVER_ERROR(HttpStatus.INTERNAL_SERVER_ERROR, "NOTIFICATION_500", "FCM 알림 전송 중 오류가 발생했습니다.")
+
+
 }

src/main/kotlin/gat_be/dev/common/status/SuccessStatus.kt

@@ -20,7 +20,10 @@ enum class SuccessStatus(
     GET_USER_MY_PAGE_SUCCESS(HttpStatus.OK,"USER_200","유저 마이 페이지 조회 성공"),
     GET_USER_PROFILE_SUCCESS(HttpStatus.OK, "USER_200", "유저 프로필 조회 성공"),
     UPDATE_USER_PROFILE_SUCCESS(HttpStatus.OK, "USER_200", "유저 프로필 수정 성공"),
+    GET_USER_SCRAP_LIST_SUCCESS(HttpStatus.OK,"USER_200","스크랩 내역 조회 성공"),
     CREATE_USER_SCRAP_SUCCESS(HttpStatus.OK, "USER_200", "스크랩 기능 성공"),
+    CANCEL_USER_SCRAP_SUCCESS(HttpStatus.OK, "USER_200", "스크랩 취소 성공"),
+    GET_USER_VIEWED_TEAM_LIST_SUCCESS(HttpStatus.OK, "USER_200", "최근 본 글 조회 성공"),
 
     /**
      * Team
@@ -30,6 +33,7 @@ enum class SuccessStatus(
     GET_TEAM_INFO_SUCCESS(HttpStatus.OK, "TEAM_200", "팀 상세정보 조회 성공"),
     GET_TEAM_LIST_SUCCESS(HttpStatus.OK, "TEAM_200", "모집 중인 팀 리스트 조회 성공"),
     GET_MY_TEAM_LIST_SUCCESS(HttpStatus.OK, "TEAM_200", "나의 팀 리스트 조회 성공"),
+    GET_TEAM_LIST_FOR_SEARCH_SUCCESS(HttpStatus.OK, "TEAM_200", "팀 리스트 검색 성공"),
 
     /**
      * Application
@@ -55,6 +59,12 @@ enum class SuccessStatus(
     CREATE_TOKEN_SUCCESS(HttpStatus.OK, "AUTH_200", "토큰 재발급 성공"),
     CREATE_USER_SUCCESS(HttpStatus.CREATED, "AUTH_201", "회원가입 성공"),
 
+    /**
+     * Notification
+     */
+    MARK_NOTIFICATION_AS_READ_SUCCESS(HttpStatus.OK, "NOTIFICATION_200", "알림 읽음 표시 성공"),
+    GET_NOTIFICATION_LIST_SUCCESS(HttpStatus.OK, "NOTIFICATION_200", "알림 리스트 조회 성공"),
+
     /**
      * Review
      */

src/main/kotlin/gat_be/dev/domain/application/facade/ApplicationApplyFacade.kt

@@ -1,26 +1,46 @@
 package gat_be.dev.domain.application.facade
 
+import gat_be.dev.common.exception.GeneralException
 import gat_be.dev.domain.application.dto.request.CreateApplicationRequest
 import gat_be.dev.domain.application.dto.response.CreateApplicationResponse
 import gat_be.dev.domain.application.service.ApplicationService
+import gat_be.dev.domain.notification.service.NotificationService
 import gat_be.dev.domain.team.service.TeamService
+import gat_be.dev.domain.user.service.UserService
 import jakarta.transaction.Transactional
+import org.slf4j.LoggerFactory
 import org.springframework.stereotype.Service
 
 @Service
 class ApplicationApplyFacade(
     private val applicationService: ApplicationService,
-    private val teamService: TeamService
+    private val teamService: TeamService,
+    private val userService: UserService,
+    private val notificationService: NotificationService
 ) {
 
+    private val log = LoggerFactory.getLogger(this::class.java)
+
     @Transactional
     fun createApplication(userId: Long, request: CreateApplicationRequest): CreateApplicationResponse {
         applicationService.validateIsDuplicatedApplication(userId, request.teamId)
-        teamService.validateTeamIsRecruitingForStack(request.teamId, request.techStack)
 
+        val team = teamService.validateTeamIsRecruitingForStack(request.teamId, request.techStack)
         val application = applicationService.createAndSaveApplication(userId, request)
 
-        // TODO: [Notification] 팀 리더에게 새로운 지원 생성 알림 전송
+        team.leader?.let { leader ->
+            try {
+                val receiver = userService.findUserByUserId(leader.userId)
+
+                notificationService.registerNewTeamApplicationNotification(
+                    receiver,
+                    team.title,
+                    application.applicationId
+                )
+            } catch (e: GeneralException) {
+                log.warn("[*] 리더 유저를 찾을 수 없어 알림 전송 생략: ${leader.userId}")
+            }
+        }
 
         return CreateApplicationResponse(application.applicationId)
     }

src/main/kotlin/gat_be/dev/domain/application/facade/ApplicationManageFacade.kt

@@ -1,14 +1,18 @@
 package gat_be.dev.domain.application.facade
 
 import gat_be.dev.domain.application.service.ApplicationService
+import gat_be.dev.domain.notification.service.NotificationService
 import gat_be.dev.domain.team.service.TeamService
+import gat_be.dev.domain.user.service.UserService
 import jakarta.transaction.Transactional
 import org.springframework.stereotype.Service
 
 @Service
 class ApplicationManageFacade(
     private val applicationService: ApplicationService,
-    private val teamService: TeamService
+    private val teamService: TeamService,
+    private val notificationService: NotificationService,
+    private val userService: UserService
 ) {
 
     // 팀 지원 수락
@@ -18,9 +22,14 @@ class ApplicationManageFacade(
         teamService.validateLeaderAndCanProcessApplication(userId, application.teamId)
         application.accept()
 
-        teamService.acceptNewTeamMember(application.userId, application.teamId, application.role)
+        val team = teamService.acceptNewTeamMember(application.userId, application.teamId, application.role)
+        val receiver = userService.findUserByUserId(application.userId)
 
-        // TODO: [Notification] 지원 수락 알림 발송
+        notificationService.registerTeamAcceptanceNotification(
+            receiver,
+            team.title,
+            application.applicationId
+        )
     }
 
     // 팀 지원 거절