refactoring

storage/postgresql/schema.hcl

@@ -5,14 +5,6 @@ table "passengers" {
     null = false
     type = uuid
   }
-  column "passenger_departure_route" {
-    null = false
-    type = jsonb
-  }
-  column "passenger_destination_route" {
-    null = false
-    type = jsonb
-  }
   column "alias" {
     null = false
     type = varchar(15)
@@ -45,10 +37,6 @@ table "passengers" {
     null = true
     type = jsonb
   }
-  column "passenger_pickup_date" {
-    null = false
-    type = int
-  }
   primary_key {
     columns = [column.passenger_id]
   }
@@ -139,7 +127,27 @@ table "bookings" {
   }
   column "booking_status" {
     null = false
-    type = enum.booking_status
+    type = enum.bookingstatus
+  }
+  column "departure_address" {
+    null = false
+    type = jsonb
+  }
+  column "destination_address" {
+    null = false
+    type = jsonb
+  }
+  column "pickup_date" {
+    null = false
+    type = int
+  }
+  column "duration"{
+    null = false
+    type = int
+  }
+  column "distance"{
+    null = false
+    type = float
   }
   primary_key {
     columns = [column.booking_id]
@@ -153,8 +161,6 @@ table "bookings" {
     ref_columns = [table.passengers.column.passenger_id]
   }
 }
-
-
 enum "booking_status" {
   schema = schema.solidarity_service
   values = ["INITIATED", "WAITING_PASSENGER_CONFIRMATION", "WAITING_DRIVER_CONFIRMATION", "CONFIRMED", "CANCELLED", "COMPLETED_PENDING_VALIDATION", "VALIDATED"]