pass product test

DishDashAPP · Aug 3, 2024 · 185088d · 185088d
1 parent c172fd5
commit 185088d
Show file tree

Hide file tree

Showing 7 changed files with 24 additions and 26 deletions.
diff --git a/common/src/main/java/com/dishDash/common/dto/LocationDto.java b/common/src/main/java/com/dishDash/common/dto/LocationDto.java
@@ -11,6 +11,6 @@
 @NoArgsConstructor
 public class LocationDto {
   private long id;
-  private long latitude;
-  private long longitude;
+  private float latitude;
+  private float longitude;
 }
diff --git a/product/src/main/java/com/dish_dash/product/ProductApplication.java b/product/src/main/java/com/dish_dash/product/ProductApplication.java
@@ -4,7 +4,7 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.cloud.netflix.eureka.EnableEurekaClient;
 
-@SpringBootApplication
+@SpringBootApplication(scanBasePackages = {"com.dish_dash.product", "com.dishDash.common"})
 @EnableEurekaClient
 public class ProductApplication {
   public static void main(String[] args) {

diff --git a/product/src/test/resources/application.properties b/product/src/test/resources/application.properties
@@ -6,5 +6,6 @@ spring.datasource.password=
 spring.h2.console.enabled=true
 spring.jpa.database-platform=org.hibernate.dialect.H2Dialect
 spring.jpa.hibernate.ddl-auto=update
-spring.jpa.show-sql=true
+spring.jpa.show-sql=false
+spring.jpa.properties.hibernate.show_sql=false
 eureka.client.enabled=false
diff --git a/user/src/main/java/com/dish_dash/user/adapters/repository/LocationRepository.java b/user/src/main/java/com/dish_dash/user/adapters/repository/LocationRepository.java
@@ -14,9 +14,10 @@ public interface LocationRepository extends JpaRepository<Location, Long> {
 
   Optional<Location> findByDeliveryID(Long deliveryID);
 
-  @Query("UPDATE Location SET latitude =:latitude, longitude =:longitude, timestamp =:timestamp where id=:id")
+  @Query(
+      "UPDATE Location SET latitude =:latitude, longitude =:longitude where id=:id")
   @Modifying
   @Transactional
-  void modify(@Param("latitude") long latitude, @Param("longitude") long longitude,
-      @Param("timestamp") long timestamp, @Param("id") long id);
+  void modify(
+      @Param("latitude") float latitude, @Param("longitude") float longitude, @Param("id") long id);
 }
diff --git a/user/src/main/java/com/dish_dash/user/domain/model/Location.java b/user/src/main/java/com/dish_dash/user/domain/model/Location.java
@@ -19,8 +19,8 @@ public class Location {
   @GeneratedValue(strategy = GenerationType.IDENTITY)
   private long id;
 
-  private long latitude;
-  private long longitude;
+  private float latitude;
+  private float longitude;
   @UpdateTimestamp private Timestamp timestamp;
 
   @Column(name = "delivery_id")

diff --git a/user/src/main/java/com/dish_dash/user/service/DeliveryPersonService.java b/user/src/main/java/com/dish_dash/user/service/DeliveryPersonService.java
@@ -15,11 +15,6 @@
 import lombok.extern.slf4j.Slf4j;
 import org.springframework.stereotype.Service;
 
-import java.sql.Time;
-import java.time.LocalDateTime;
-
-import static com.fasterxml.jackson.databind.type.LogicalType.DateTime;
-
 @Service
 @RequiredArgsConstructor
 @Slf4j
@@ -97,12 +92,14 @@ public boolean setLocation(LocationDto locationDto, long deliveryPersonId) {
                       .findByDeliveryID(deliveryPersonId)
                       .orElseGet(
                           () ->
-                              Location.builder()
-                                  .deliveryID(deliveryPersonId)
-                                  .latitude(locationDto.getLatitude())
-                                  .longitude(locationDto.getLongitude())
-                                  .build());
-              locationRepository.modify(locationDto.getLatitude(), locationDto.getLongitude(),  System.currentTimeMillis(), location.getId());
+                              locationRepository.save(
+                                  Location.builder()
+                                      .deliveryID(deliveryPersonId)
+                                      .latitude(locationDto.getLatitude())
+                                      .longitude(locationDto.getLongitude())
+                                      .build()));
+              locationRepository.modify(
+                  locationDto.getLatitude(), locationDto.getLongitude(), location.getId());
 
               deliveryPerson.setLocation(location);
               deliveryPersonRepository.save(deliveryPerson);

diff --git a/user/src/test/java/com/dish_dash/user/DeliveryPersonServiceIntegrationTest.java b/user/src/test/java/com/dish_dash/user/DeliveryPersonServiceIntegrationTest.java
@@ -48,8 +48,7 @@ void setUp() {
             .phoneNumber("PHONE_NUMBER")
             .build();
 
-    locationDto =
-        LocationDto.builder().latitude((long) 12.345678).longitude((long) 98.765432).build();
+    locationDto = LocationDto.builder().latitude(12.345678F).longitude(98.765432F).build();
   }
 
   @Test
@@ -155,12 +154,12 @@ void getDeliveryPersonStatus_ShouldThrowCustomException_WhenDeliveryPersonDoesNo
   @Test
   void setLocation_ShouldReturnTrue_WhenDeliveryPersonExists() {
     DeliveryPerson deliveryPerson =
-        DeliveryPerson.builder().id(1L).status(DeliveryPersonStatus.ACTIVE).build();
-    deliveryPersonRepository.save(deliveryPerson);
+        deliveryPersonRepository.save(
+            DeliveryPerson.builder().id(1L).status(DeliveryPersonStatus.ACTIVE).build());
 
-    boolean result = deliveryPersonService.setLocation(locationDto, 1L);
+    boolean result = deliveryPersonService.setLocation(locationDto, deliveryPerson.getId());
 
-    Location location = locationRepository.findByDeliveryID(1L).orElse(null);
+    Location location = locationRepository.findByDeliveryID(deliveryPerson.getId()).orElse(null);
 
     assertTrue(result);
     assertNotNull(location);