update: TaxiDriver 위치 변경 및 merge

- taxidriver/model/TaxiDriver -> taxidriver/model/entity/TaxiDriver
KATJ-HH2 · Oct 17, 2023 · 1948ec7 · 1948ec7
1 parent 5bac727
commit 1948ec7
Show file tree

Hide file tree

Showing 11 changed files with 16 additions and 75 deletions.
diff --git a/src/main/kotlin/com/hh2/katj/taxidriver/component/TaxiDriverManager.kt b/src/main/kotlin/com/hh2/katj/taxidriver/component/TaxiDriverManager.kt
@@ -1,14 +1,10 @@
 package com.hh2.katj.taxidriver.component
 
-import com.hh2.katj.taxi.model.Taxi
-import com.hh2.katj.taxidriver.model.dto.request.AddTotalInfoRequest
 import com.hh2.katj.taxidriver.model.entity.TaxiDriver
 import com.hh2.katj.taxidriver.model.entity.TaxiDriverStatus
 import com.hh2.katj.taxidriver.repository.TaxiDriverRepository
-import com.hh2.katj.util.exception.ExceptionMessage.ID_DOES_NOT_EXIST
 import com.hh2.katj.util.exception.ExceptionMessage.USER_DOES_NOT_EXIST
 import com.hh2.katj.util.exception.ExceptionMessage.INTERNAL_SERVER_ERROR_FROM_DATABASE
-import com.hh2.katj.util.exception.failWithMessage
 import com.hh2.katj.util.exception.findByIdOrThrowMessage
 import org.springframework.stereotype.Component
 import org.springframework.transaction.annotation.Transactional

diff --git a/src/main/kotlin/com/hh2/katj/taxidriver/model/TaxiDriver.kt b/src/main/kotlin/com/hh2/katj/taxidriver/model/TaxiDriver.kt
diff --git a/src/main/kotlin/com/hh2/katj/taxidriver/model/entity/TaxiDriver.kt b/src/main/kotlin/com/hh2/katj/taxidriver/model/entity/TaxiDriver.kt
@@ -6,6 +6,8 @@ import com.hh2.katj.taxi.model.Taxi
 import com.hh2.katj.taxidriver.model.dto.request.AddTotalInfoRequest
 import com.hh2.katj.taxidriver.model.dto.request.UpdateStatusRequest
 import com.hh2.katj.taxidriver.model.dto.response.TaxiDriverResponse
+import com.hh2.katj.util.exception.ExceptionMessage
+import com.hh2.katj.util.exception.failWithMessage
 import com.hh2.katj.util.model.RoadAddress
 import jakarta.persistence.*
 import java.time.LocalDate
@@ -66,6 +68,11 @@ class TaxiDriver(
         this.img = request.img
     }
 
+    fun statusWaiting() {
+        if (this.status != TaxiDriverStatus.WAITING) {
+            failWithMessage(ExceptionMessage.INCORRECT_STATUS_VALUE.name)
+        }
+    }
     fun updateStatus(status: TaxiDriverStatus) {
         this.status = status
     }

diff --git a/src/main/kotlin/com/hh2/katj/taxidriver/repository/TaxiDriverRepository.kt b/src/main/kotlin/com/hh2/katj/taxidriver/repository/TaxiDriverRepository.kt
@@ -1,6 +1,6 @@
 package com.hh2.katj.taxidriver.repository
 
-import com.hh2.katj.taxidriver.model.TaxiDriver
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
 import org.springframework.data.jpa.repository.JpaRepository
 import org.springframework.stereotype.Repository
 

diff --git a/src/main/kotlin/com/hh2/katj/trip/model/Trip.kt b/src/main/kotlin/com/hh2/katj/trip/model/Trip.kt
@@ -1,10 +1,9 @@
 package com.hh2.katj.trip.model
 
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
 import com.hh2.katj.util.model.BaseEntity
-import com.hh2.katj.taxidriver.model.TaxiDriver
 import com.hh2.katj.trip.model.response.ResponseTrip
 import com.hh2.katj.user.model.entity.User
-import com.hh2.katj.util.model.RoadAddress
 import jakarta.persistence.*
 import java.time.LocalDate
 import java.time.LocalDateTime

diff --git a/src/main/kotlin/com/hh2/katj/trip/model/request/RequestTrip.kt b/src/main/kotlin/com/hh2/katj/trip/model/request/RequestTrip.kt
@@ -1,6 +1,6 @@
 package com.hh2.katj.trip.model.request
 
-import com.hh2.katj.taxidriver.model.TaxiDriver
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
 import com.hh2.katj.trip.model.DepartureRoadAddress
 import com.hh2.katj.trip.model.DestinationRoadAddress
 import com.hh2.katj.trip.model.Trip

diff --git a/src/main/kotlin/com/hh2/katj/trip/model/response/ResponseTrip.kt b/src/main/kotlin/com/hh2/katj/trip/model/response/ResponseTrip.kt
@@ -1,6 +1,6 @@
 package com.hh2.katj.trip.model.response
 
-import com.hh2.katj.taxidriver.model.TaxiDriver
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
 import com.hh2.katj.trip.model.DepartureRoadAddress
 import com.hh2.katj.trip.model.DestinationRoadAddress
 import com.hh2.katj.trip.model.TripStatus

diff --git a/src/main/kotlin/com/hh2/katj/trip/service/BillingService.kt b/src/main/kotlin/com/hh2/katj/trip/service/BillingService.kt
@@ -2,7 +2,7 @@ package com.hh2.katj.trip.service
 
 import com.hh2.katj.payment.component.PaymentMethodReader
 import com.hh2.katj.payment.model.entity.PaymentMethod
-import com.hh2.katj.taxidriver.model.TaxiDriver
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
 import com.hh2.katj.trip.component.TripManager
 import com.hh2.katj.trip.component.TripReader
 import com.hh2.katj.trip.model.Trip

diff --git a/src/main/kotlin/com/hh2/katj/trip/service/QueueProcessor.kt b/src/main/kotlin/com/hh2/katj/trip/service/QueueProcessor.kt
@@ -1,7 +1,7 @@
 package com.hh2.katj.trip.service
 
-import com.hh2.katj.taxidriver.model.TaxiDriver
-import com.hh2.katj.taxidriver.model.TaxiDriverStatus
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
+import com.hh2.katj.taxidriver.model.entity.TaxiDriverStatus
 import com.hh2.katj.trip.controller.TripController
 import kotlinx.coroutines.GlobalScope
 import kotlinx.coroutines.delay

diff --git a/src/test/kotlin/com/hh2/katj/trip/service/BillingServiceTest.kt b/src/test/kotlin/com/hh2/katj/trip/service/BillingServiceTest.kt
@@ -11,7 +11,6 @@ import com.hh2.katj.taxi.model.ChargeType
 import com.hh2.katj.taxi.model.FuelType
 import com.hh2.katj.taxi.model.Taxi
 import com.hh2.katj.taxi.repository.TaxiRepository
-import com.hh2.katj.taxidriver.model.TaxiDriver
 import com.hh2.katj.taxidriver.model.TaxiDriverStatus
 import com.hh2.katj.taxidriver.repository.TaxiDriverRepository
 import com.hh2.katj.trip.model.DepartureRoadAddress

diff --git a/src/test/kotlin/com/hh2/katj/trip/service/CallingServiceTest.kt b/src/test/kotlin/com/hh2/katj/trip/service/CallingServiceTest.kt
@@ -10,8 +10,8 @@ import com.hh2.katj.taxi.model.ChargeType
 import com.hh2.katj.taxi.model.FuelType
 import com.hh2.katj.taxi.model.Taxi
 import com.hh2.katj.taxi.repository.TaxiRepository
-import com.hh2.katj.taxidriver.model.TaxiDriver
-import com.hh2.katj.taxidriver.model.TaxiDriverStatus
+import com.hh2.katj.taxidriver.model.entity.TaxiDriver
+import com.hh2.katj.taxidriver.model.entity.TaxiDriverStatus
 import com.hh2.katj.taxidriver.repository.TaxiDriverRepository
 import com.hh2.katj.trip.model.DepartureRoadAddress
 import com.hh2.katj.trip.model.DestinationRoadAddress