Merge branch 'main' of https://github.com/f-lab-edu/get-offer into fe…

…ature/7
f-lab-edu · Oct 21, 2024 · 625d71e · 625d71e
2 parents 350e80d + d264def
commit 625d71e
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 14 deletions.
diff --git a/src/main/kotlin/com/get_offer/auction/controller/AuctionController.kt b/src/main/kotlin/com/get_offer/auction/controller/AuctionController.kt
@@ -34,9 +34,12 @@ class AuctionController(
         return ApiResponse.success(auctionService.getBuyHistory(userId.toLong()))
     }
 
-    @GetMapping("{id}/sold")
-    fun getSoldAuctionDetail(@RequestParam userId: String, @PathVariable id: Long): ApiResponse<SellAuctionDetailDto> {
-        return ApiResponse.success(auctionService.getSoldAuctionDetail(userId.toLong(), id))
+    @GetMapping("{auctionId}/sold")
+    fun getSoldAuctionDetail(
+        @RequestParam userId: String,
+        @PathVariable auctionId: Long
+    ): ApiResponse<SellAuctionDetailDto> {
+        return ApiResponse.success(auctionService.getSoldAuctionDetail(userId.toLong(), auctionId))
     }
 
     @GetMapping("{id}/bought")

diff --git a/src/main/kotlin/com/get_offer/auction/service/AuctionService.kt b/src/main/kotlin/com/get_offer/auction/service/AuctionService.kt
@@ -1,9 +1,12 @@
 package com.get_offer.auction.service
 
 import com.get_offer.auction.controller.repository.AuctionResultRepository
+import com.get_offer.auction.domain.AuctionResult
 import com.get_offer.common.exception.NotFoundException
 import com.get_offer.common.exception.UnAuthorizationException
+import com.get_offer.product.domain.Product
 import com.get_offer.product.repository.ProductRepository
+import com.get_offer.user.domain.User
 import com.get_offer.user.repository.UserRepository
 import org.springframework.stereotype.Service
 
@@ -31,30 +34,35 @@ class AuctionService(
     }
 
     fun getSoldAuctionDetail(userId: Long, auctionId: Long): SellAuctionDetailDto {
-        val auction = auctionRepository.findById(auctionId)
-            .orElseThrow { NotFoundException("$auctionId 의 경매 내역은 존재하지 않습니다.") }
-
-        val product = productRepository.findById(auction.productId)
-            .orElseThrow { NotFoundException("${auction.productId} 의 상품은 존재하지 않습니다.") }
+        val (auction, product) = getAuctionAndProduct(auctionId)
         if (userId != product.writerId) throw UnAuthorizationException()
 
-        val buyer = userRepository.findById(auction.buyerId)
-            .orElseThrow { NotFoundException("${auction.buyerId} 의 사용자는 존재하지 않습니다.") }
+        val buyer = getUser(auction.buyerId)
 
         return SellAuctionDetailDto.of(product, buyer, auction)
     }
 
     fun getBoughtAuctionDetail(userId: Long, auctionId: Long): BuyAuctionDetailDto {
+        val (auction, product) = getAuctionAndProduct(auctionId)
+        if (userId != auction.buyerId) throw UnAuthorizationException()
+
+        val seller = getUser(product.writerId)
+
+        return BuyAuctionDetailDto.of(product, seller, auction)
+    }
+
+    private fun getAuctionAndProduct(auctionId: Long): Pair<AuctionResult, Product> {
         val auction = auctionRepository.findById(auctionId)
             .orElseThrow { NotFoundException("$auctionId 의 경매 내역은 존재하지 않습니다.") }
-        if (userId != auction.buyerId) throw UnAuthorizationException()
 
         val product = productRepository.findById(auction.productId)
             .orElseThrow { NotFoundException("${auction.productId} 의 상품은 존재하지 않습니다.") }
 
-        val seller = userRepository.findById(product.writerId)
-            .orElseThrow { NotFoundException("${product.writerId} 의 사용자는 존재하지 않습니다.") }
+        return Pair(auction, product)
+    }
 
-        return BuyAuctionDetailDto.of(product, seller, auction)
+    private fun getUser(userId: Long): User {
+        return userRepository.findById(userId)
+            .orElseThrow { NotFoundException("$userId 의 사용자는 존재하지 않습니다.") }
     }
 }