Merge pull request #71 from billilge/develop

release: 0.1.0 배포

Author: tnals0924

.github/workflows/ci-cd.yml

@@ -19,6 +19,12 @@ jobs:
           java-version: '17'
           distribution: 'temurin'
 
+      - name: Create Firebase Config Directory
+        run: |
+          mkdir -p src/main/resources/firebase
+          echo "${{ secrets.FIREBASE_SERVICE_KEY }}" | base64 --decode > src/main/resources/firebase/firebaseServiceKey.json
+        shell: bash
+
       - name: Setup Gradle
         uses: gradle/actions/setup-gradle@af1da67850ed9a4cedd57bfd976089dd991e2582 # v4.0.0
 

.gitignore

@@ -41,4 +41,5 @@ out/
 
 application-local.yml
 
-.DS_Store
+.DS_Store
+/src/main/resources/firebase

build.gradle.kts

@@ -59,6 +59,8 @@ dependencies {
 
     implementation("io.github.oshai:kotlin-logging-jvm:7.0.3")
 
+    implementation("com.google.firebase:firebase-admin:9.4.3")
+
     compileOnly("org.projectlombok:lombok")
     runtimeOnly("com.h2database:h2")
     runtimeOnly("com.mysql:mysql-connector-j")

src/main/kotlin/site/billilge/api/backend/domain/item/controller/ItemApi.kt

@@ -0,0 +1,32 @@
+package site.billilge.api.backend.domain.item.controller
+
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.responses.ApiResponses
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.ModelAttribute
+import site.billilge.api.backend.domain.item.dto.response.ItemFindAllResponse
+import site.billilge.api.backend.global.dto.SearchCondition
+
+@Tag(name = "Item", description = "대여 물품 조회 API")
+interface ItemApi {
+
+    @Operation(
+        summary = "대여 물품 목록 조회",
+        description = "검색어에 따라 물품 이름에 포함된 단어를 기반으로 대여 물품 목록을 조회합니다."
+    )
+    @ApiResponses(
+        value = [
+            ApiResponse(
+                responseCode = "200",
+                description = "대여 물품 목록 조회 성공"
+            )
+        ]
+    )
+    @GetMapping
+    fun getItems(
+        @ModelAttribute searchCondition: SearchCondition
+    ): ResponseEntity<ItemFindAllResponse>
+}

src/main/kotlin/site/billilge/api/backend/domain/item/controller/ItemController.kt

@@ -0,0 +1,24 @@
+package site.billilge.api.backend.domain.item.controller
+
+import org.springframework.http.ResponseEntity
+import org.springframework.web.bind.annotation.GetMapping
+import org.springframework.web.bind.annotation.ModelAttribute
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import site.billilge.api.backend.domain.item.dto.response.ItemFindAllResponse
+import site.billilge.api.backend.domain.item.service.ItemService
+import site.billilge.api.backend.global.dto.SearchCondition
+
+@RestController
+@RequestMapping("/items")
+class ItemController(
+    private val itemService: ItemService
+) : ItemApi {
+    @GetMapping
+    override fun getItems(
+        @ModelAttribute searchCondition: SearchCondition
+    ): ResponseEntity<ItemFindAllResponse> {
+        val response = itemService.searchItems(searchCondition)
+        return ResponseEntity.ok(response)
+    }
+}

src/main/kotlin/site/billilge/api/backend/domain/item/dto/response/ItemDetail.kt

@@ -3,8 +3,6 @@ package site.billilge.api.backend.domain.item.dto.response
 import io.swagger.v3.oas.annotations.media.Schema
 import site.billilge.api.backend.domain.item.entity.Item
 import site.billilge.api.backend.domain.item.enums.ItemType
-import site.billilge.api.backend.domain.item.exception.ItemErrorCode
-import site.billilge.api.backend.global.exception.ApiException
 
 @Schema
 data class ItemDetail(
@@ -23,8 +21,7 @@ data class ItemDetail(
         @JvmStatic
         fun from(item: Item): ItemDetail {
             return ItemDetail(
-                itemId = item.id
-                    ?: throw ApiException(ItemErrorCode.ITEM_ID_IS_NULL),
+                itemId = item.id!!,
                 itemName = item.name,
                 itemType = item.type,
                 count = item.count,

src/main/kotlin/site/billilge/api/backend/domain/item/repository/ItemRepository.kt

@@ -1,10 +1,15 @@
 package site.billilge.api.backend.domain.item.repository
 
 import org.springframework.data.jpa.repository.JpaRepository
+import org.springframework.data.jpa.repository.Query
+import org.springframework.data.repository.query.Param
 import site.billilge.api.backend.domain.item.entity.Item
 import java.util.*
 
 interface ItemRepository: JpaRepository<Item, Long>, ItemRepositoryCustom {
     override fun findById(id: Long): Optional<Item>
     fun existsByName(name: String): Boolean
+
+    @Query("SELECT i FROM Item i WHERE i.name LIKE CONCAT('%', :search, '%')")
+    fun findByItemName(@Param("search") search: String): List<Item>
 }

src/main/kotlin/site/billilge/api/backend/domain/item/service/ItemService.kt

@@ -117,4 +117,10 @@ class ItemService(
         if (image.contentType != "image/svg+xml")
             throw ApiException(ItemErrorCode.IMAGE_IS_NOT_SVG)
     }
+
+    fun searchItems(searchCondition: SearchCondition): ItemFindAllResponse {
+        val items = itemRepository.findByItemName(searchCondition.search)
+
+        return ItemFindAllResponse(items.map { ItemDetail.from(it) })
+    }
 }

src/main/kotlin/site/billilge/api/backend/domain/member/controller/MemberApi.kt

@@ -0,0 +1,31 @@
+package site.billilge.api.backend.domain.member.controller
+
+import io.swagger.v3.oas.annotations.Operation
+import io.swagger.v3.oas.annotations.responses.ApiResponse
+import io.swagger.v3.oas.annotations.responses.ApiResponses
+import io.swagger.v3.oas.annotations.tags.Tag
+import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.web.bind.annotation.RequestBody
+import site.billilge.api.backend.domain.member.dto.request.MemberFCMTokenRequest
+import site.billilge.api.backend.global.security.oauth2.UserAuthInfo
+
+@Tag(name = "Member", description = "회원 API")
+interface MemberApi {
+    @Operation(
+        summary = "FCM 토큰 전송",
+        description = "서버 측으로 회원 기기의 FCM 토큰을 전송하는 API"
+    )
+    @ApiResponses(
+        value = [
+            ApiResponse(
+                responseCode = "200",
+                description = "FCM 토큰 전송 성공"
+            )
+        ]
+    )
+    fun setFCMToken(
+        @AuthenticationPrincipal userAuthInfo: UserAuthInfo,
+        @RequestBody request: MemberFCMTokenRequest
+    ): ResponseEntity<Void>
+}

src/main/kotlin/site/billilge/api/backend/domain/member/controller/MemberController.kt

@@ -0,0 +1,26 @@
+package site.billilge.api.backend.domain.member.controller
+
+import org.springframework.http.ResponseEntity
+import org.springframework.security.core.annotation.AuthenticationPrincipal
+import org.springframework.web.bind.annotation.PostMapping
+import org.springframework.web.bind.annotation.RequestBody
+import org.springframework.web.bind.annotation.RequestMapping
+import org.springframework.web.bind.annotation.RestController
+import site.billilge.api.backend.domain.member.dto.request.MemberFCMTokenRequest
+import site.billilge.api.backend.domain.member.service.MemberService
+import site.billilge.api.backend.global.security.oauth2.UserAuthInfo
+
+@RestController
+@RequestMapping("/members")
+class MemberController(
+    private val memberService: MemberService,
+) : MemberApi {
+    @PostMapping("/me/fcm-token")
+    override fun setFCMToken(
+        @AuthenticationPrincipal userAuthInfo: UserAuthInfo,
+        @RequestBody request: MemberFCMTokenRequest
+    ): ResponseEntity<Void> {
+        memberService.setMemberFCMToken(userAuthInfo.memberId, request)
+        return ResponseEntity.ok().build()
+    }
+}