Merge pull request #29 from Preta3418/main

Refactoring: member 측 매핑 제거
prgrms-be-devcourse · Nov 5, 2024 · eedc2ce · eedc2ce
2 parents cc1716d + ff1a84d
commit eedc2ce
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 9 deletions.
diff --git a/src/main/kotlin/org/tenten/bittakotlin/member/entity/Member.kt b/src/main/kotlin/org/tenten/bittakotlin/member/entity/Member.kt
@@ -21,11 +21,6 @@ data class Member(
     @OneToOne(mappedBy = "member", cascade = [CascadeType.ALL], fetch = FetchType.LAZY)
     var profile: Profile? = null,
 
-    @OneToMany(mappedBy = "sender", cascade = [CascadeType.ALL], orphanRemoval = true)
-    val sentScoutRequests: MutableList<ScoutRequest> = mutableListOf(),
-
-    @OneToMany(mappedBy = "receiver", cascade = [CascadeType.ALL], orphanRemoval = true)
-    val receivedScoutRequests: MutableList<ScoutRequest> = mutableListOf(),
 
     @Column(nullable = false, unique = true)
     var username: String = "",

diff --git a/src/main/kotlin/org/tenten/bittakotlin/scout/repository/ScoutRequestRepository.kt b/src/main/kotlin/org/tenten/bittakotlin/scout/repository/ScoutRequestRepository.kt
@@ -7,6 +7,6 @@ import org.springframework.data.jpa.repository.JpaRepository
 import org.tenten.bittakotlin.scout.entity.ScoutRequest
 
 interface ScoutRequestRepository : JpaRepository<ScoutRequest, Long> {
-    fun findBySender_IdOrderById(senderId: Long, pageable: Pageable): Page<ScoutRequest>
-    fun findByReceiver_IdOrderById(receiverId: Long, pageable: Pageable): Page<ScoutRequest>
+    fun findBySenderIdOrderById(senderId: Long, pageable: Pageable): Page<ScoutRequest>
+    fun findByReceiverIdOrderById(receiverId: Long, pageable: Pageable): Page<ScoutRequest>
 }
diff --git a/src/main/kotlin/org/tenten/bittakotlin/scout/service/ScoutRequestService.kt b/src/main/kotlin/org/tenten/bittakotlin/scout/service/ScoutRequestService.kt
@@ -39,7 +39,7 @@ class ScoutRequestService(
     fun getSentScoutRequests(senderId: Long, pageable: Pageable): Page<ScoutDTO> {
         logger.info("Fetching sent scout requests for senderId=$senderId")
 
-        val sentRequests = scoutRequestRepository.findBySender_IdOrderById(senderId, pageable)
+        val sentRequests = scoutRequestRepository.findBySenderIdOrderById(senderId, pageable)
             .map { request -> entityToDto(request) }
 
         logger.info("Retrieved ${sentRequests.totalElements} sent scout requests for senderId=$senderId")
@@ -50,7 +50,7 @@ class ScoutRequestService(
     fun getReceivedScoutRequests(receiverId: Long, pageable: Pageable): Page<ScoutDTO> {
         logger.info("Fetching received scout requests for receiverId=$receiverId")
 
-        val receivedRequests = scoutRequestRepository.findByReceiver_IdOrderById(receiverId, pageable)
+        val receivedRequests = scoutRequestRepository.findByReceiverIdOrderById(receiverId, pageable)
             .map { request -> entityToDto(request) }
 
         logger.info("Retrieved ${receivedRequests.totalElements} received scout requests for receiverId=$receiverId")