From 788337f6617bd5c622f9bcb196ec3c0e18d47e5a Mon Sep 17 00:00:00 2001
From: Florian LEROUX <florian.leroux3@laposte.net>
Date: Wed, 10 Jan 2024 12:50:02 +0100
Subject: [PATCH] fix(#35): change restaurant address structure

---
 .../app/(normal)/account/orders/[id]/map.tsx  |  4 ++--
 apps/web/app/(normal)/checkout/page.tsx       |  2 +-
 apps/web/app/admin/page.tsx                   |  6 +++---
 apps/web/components/location/restaurant.tsx   |  4 ++--
 apps/web/constants/data.ts                    | 20 +++++++++++++++----
 apps/web/hooks/useLocation.tsx                |  2 +-
 apps/web/types/restaurant.ts                  | 13 ++++++++++--
 7 files changed, 36 insertions(+), 15 deletions(-)

diff --git a/apps/web/app/(normal)/account/orders/[id]/map.tsx b/apps/web/app/(normal)/account/orders/[id]/map.tsx
index ebf12491..cfe7022c 100644
--- a/apps/web/app/(normal)/account/orders/[id]/map.tsx
+++ b/apps/web/app/(normal)/account/orders/[id]/map.tsx
@@ -14,8 +14,8 @@ export const OrderStatusMap = (order: Order) => {
 
   const { restaurants } = useLocation();
   const restaurant = restaurants.find((r) => r.id === order.restaurant_id);
-  const { locationList: r_location } = restaurant || {};
-  const [r_lat, r_lng] = r_location || [0, 0];
+  const { address: r_location } = restaurant || {};
+  const [r_lat, r_lng] = [r_location?.lat, r_location?.lng] || [0, 0];
 
   // todo: move getting gps coordinates of address to service instead of client
   const { address } = order.delivery;
diff --git a/apps/web/app/(normal)/checkout/page.tsx b/apps/web/app/(normal)/checkout/page.tsx
index 05991303..4869e553 100644
--- a/apps/web/app/(normal)/checkout/page.tsx
+++ b/apps/web/app/(normal)/checkout/page.tsx
@@ -153,7 +153,7 @@ export default function CheckoutPage() {
                                   </Button>
                                   <Button asChild>
                                     <a
-                                      href={`https://www.google.com/maps?q=${restaurant.locationList[0]},${restaurant.locationList[1]}`}
+                                      href={`https://www.google.com/maps?q=${restaurant.address.lat},${restaurant.address.lng}`}
                                       target="_blank"
                                       rel="noopener noreferrer"
                                     >
diff --git a/apps/web/app/admin/page.tsx b/apps/web/app/admin/page.tsx
index 350ed33a..bd4caccb 100644
--- a/apps/web/app/admin/page.tsx
+++ b/apps/web/app/admin/page.tsx
@@ -19,8 +19,8 @@ export default function AdminHome() {
       <div className="h-96">
         <Map
           center={{
-            latitude: restaurantList[0].locationList[0] || 0,
-            longitude: restaurantList[0].locationList[1] || 0,
+            latitude: restaurantList[0].address.lat || 0,
+            longitude: restaurantList[0].address.lng || 0,
           }}
         >
           {[
@@ -32,7 +32,7 @@ export default function AdminHome() {
             </Marker>
           ))}
           {restaurantList.map((r) => (
-            <Marker key={r.id} latitude={r.locationList[0]} longitude={r.locationList[1]} anchor="bottom">
+            <Marker key={r.id} latitude={r.address.lat} longitude={r.address.lng} anchor="bottom">
               <RestaurantPin />
             </Marker>
           ))}
diff --git a/apps/web/components/location/restaurant.tsx b/apps/web/components/location/restaurant.tsx
index 60983bea..dd10a373 100644
--- a/apps/web/components/location/restaurant.tsx
+++ b/apps/web/components/location/restaurant.tsx
@@ -39,8 +39,8 @@ export const LocationRestaurant = ({
               getDistance(
                 { latitude: lat, longitude: lng },
                 {
-                  latitude: restaurant.locationList[0],
-                  longitude: restaurant.locationList[1],
+                  latitude: restaurant.address.lat,
+                  longitude: restaurant.address.lng,
                 },
               ) / 1000
             ).toFixed(1)} km`}
diff --git a/apps/web/constants/data.ts b/apps/web/constants/data.ts
index b2a38850..1ce5759d 100644
--- a/apps/web/constants/data.ts
+++ b/apps/web/constants/data.ts
@@ -190,8 +190,14 @@ export const restaurantList: Restaurant[] = [
   {
     id: "restaurant_id:1",
     name: "Rouen Gros Horloge",
-    address: "1 Rue du Gros Horloge, 76000 Rouen",
-    locationList: [49.440459, 1.094853],
+    address: {
+      lat: 49.440459,
+      lng: 1.094853,
+      street: "1 Rue du Gros Horloge",
+      city: "Rouen",
+      zipcode: "76000",
+      country: "France",
+    },
     openinghoursList: ["11h30 - 14h30 / 18h30 - 22h30"],
     phone: "02 35 71 00 00",
     useridsList: [],
@@ -201,8 +207,14 @@ export const restaurantList: Restaurant[] = [
   {
     id: "restaurant_id:2",
     name: "Rouen Pierre Corneille",
-    address: "76 Rue Pierre Corneille, 76000 Rouen",
-    locationList: [49.442459, 1.094853],
+    address: {
+      lat: 49.442459,
+      lng: 1.094853,
+      street: "76 Rue Pierre Corneille",
+      city: "Rouen",
+      zipcode: "76000",
+      country: "France",
+    },
     openinghoursList: ["11h30 - 14h30 / 18h30 - 22h30"],
     phone: "02 35 71 00 00",
     useridsList: [],
diff --git a/apps/web/hooks/useLocation.tsx b/apps/web/hooks/useLocation.tsx
index 91d0621d..d425ecf3 100644
--- a/apps/web/hooks/useLocation.tsx
+++ b/apps/web/hooks/useLocation.tsx
@@ -32,7 +32,7 @@ export const LocationProvider = ({ children }: { children: React.ReactNode }) =>
     queryFn: async () => {
       const res = await fetchAPI(`/api/restaurant/by-location`, undefined, {
         method: "POST",
-        body: JSON.stringify({ locationList: [lat, lng] }),
+        body: JSON.stringify({ lat, lng }),
       });
       const body = await res.json();
       return body.restaurantsList;
diff --git a/apps/web/types/restaurant.ts b/apps/web/types/restaurant.ts
index a50b4a6b..77fa77c0 100644
--- a/apps/web/types/restaurant.ts
+++ b/apps/web/types/restaurant.ts
@@ -1,8 +1,7 @@
 export type Restaurant = {
   id: string;
   name: string;
-  address: string;
-  locationList: number[];
+  address: Address;
   openinghoursList: string[];
   description?: string;
   phone: string;
@@ -10,3 +9,13 @@ export type Restaurant = {
   createdat: string;
   updatedat: string;
 };
+
+export type Address = {
+  lat: number;
+  lng: number;
+
+  street?: string;
+  city?: string;
+  zipcode?: string;
+  country?: string;
+};