#250 - notes can be NULL + added to PublicRun

Northeastern-Electric-Racing · Nov 28, 2024 · 119d3db · 119d3db
1 parent 0532c39
commit 119d3db
Show file tree

Hide file tree

Showing 7 changed files with 20 additions and 9 deletions.
diff --git a/angular-client/src/utils/types.utils.ts b/angular-client/src/utils/types.utils.ts
@@ -36,6 +36,7 @@ export type Run = {
   locationName: string;
   driverName: string;
   time: Date;
+  notes: string;
 };
 
 export type Coordinate = {

diff --git a/scylla-server/migrations/2024-11-10-031516_create_all/down.sql b/scylla-server/migrations/2024-11-10-031516_create_all/down.sql
@@ -1,4 +1,8 @@
--- This file should undo anything in `up.sql`
-DROP TABLE "run";
+-- Drop Foreign Keys
+ALTER TABLE "data" DROP CONSTRAINT "data_runId_fkey";
+ALTER TABLE "data" DROP CONSTRAINT "data_dataTypeName_fkey";
+
+-- Drop Tables
 DROP TABLE "data";
-DROP TABLE "dataType";
+DROP TABLE "dataType";
+DROP TABLE "run";
diff --git a/scylla-server/migrations/2024-11-10-031516_create_all/up.sql b/scylla-server/migrations/2024-11-10-031516_create_all/up.sql
@@ -5,7 +5,7 @@ CREATE TABLE "run" (
     "latitude" DOUBLE PRECISION,
     "longitude" DOUBLE PRECISION,
     "driverName" TEXT,
-    "notes" TEXT NOT NULL,
+    "notes" TEXT,
     "time" TIMESTAMPTZ NOT NULL,
 
     CONSTRAINT "run_pkey" PRIMARY KEY ("id")

diff --git a/scylla-server/src/models.rs b/scylla-server/src/models.rs
@@ -33,6 +33,6 @@ pub struct Run {
     pub latitude: Option<f64>,
     pub longitude: Option<f64>,
     pub driverName: Option<String>,
-    pub notes: String,
+    pub notes: Option<String>,
     pub time: DateTime<Utc>,
 }
diff --git a/scylla-server/src/schema.rs b/scylla-server/src/schema.rs
@@ -25,12 +25,16 @@ diesel::table! {
         latitude -> Nullable<Float8>,
         longitude -> Nullable<Float8>,
         driverName -> Nullable<Text>,
-        notes -> Text,
+        notes -> Nullable<Text>,
         time -> Timestamptz,
     }
 }
 
 diesel::joinable!(data -> dataType (dataTypeName));
 diesel::joinable!(data -> run (runId));
 
-diesel::allow_tables_to_appear_in_same_query!(data, dataType, run,);
+diesel::allow_tables_to_appear_in_same_query!(
+    data,
+    dataType,
+    run,
+);
diff --git a/scylla-server/src/services/run_service.rs b/scylla-server/src/services/run_service.rs
@@ -29,7 +29,7 @@ pub async fn create_run(
     timestamp: DateTime<Utc>,
 ) -> Result<Run, diesel::result::Error> {
     diesel::insert_into(run)
-        .values((time.eq(timestamp), notes.eq("A")))
+        .values(time.eq(timestamp))
         .get_result(db)
 }
 
@@ -44,7 +44,7 @@ pub async fn create_run_with_id(
     run_id: i32,
 ) -> Result<Run, diesel::result::Error> {
     diesel::insert_into(run)
-        .values((time.eq(timestamp), id.eq(run_id), notes.eq("A")))
+        .values((time.eq(timestamp), id.eq(run_id)))
         .get_result(db)
 }
 

diff --git a/scylla-server/src/transformers/run_transformer.rs b/scylla-server/src/transformers/run_transformer.rs
@@ -10,6 +10,7 @@ pub struct PublicRun {
     pub driver_name: String,
     #[serde(rename = "time")]
     pub time_ms: i64,
+    pub notes: String,
 }
 
 impl From<crate::models::Run> for PublicRun {
@@ -19,6 +20,7 @@ impl From<crate::models::Run> for PublicRun {
             location_name: value.locationName.unwrap_or_default(),
             driver_name: value.driverName.clone().unwrap_or_default(),
             time_ms: value.time.timestamp_millis(),
+            notes: value.notes.unwrap_or_default(),
         }
     }
 }