made sure that stp_type is nullable

TUM-Dev · Jul 10, 2024 · c5e7ebc · c5e7ebc
1 parent 2b62c12
commit c5e7ebc
Show file tree

Hide file tree

Showing 7 changed files with 46 additions and 34 deletions.
diff --git a/server/.sqlx/query-1ffddd843ece79fa10cfb98c2e8aff2842cad45867c3a72f807ae08c1b10cb37.json b/server/.sqlx/query-1ffddd843ece79fa10cfb98c2e8aff2842cad45867c3a72f807ae08c1b10cb37.json
diff --git a/...7645c4b7413815693ebe3db92a62f2909dab.json → ...d6216530909e31c417d5234ac270e4d851c8.json b/...7645c4b7413815693ebe3db92a62f2909dab.json → ...d6216530909e31c417d5234ac270e4d851c8.json
diff --git a/server/.sqlx/query-3f063afa6b1cee235b60edc06dee94adea3223725f8906025b3abebd24704ee4.json b/server/.sqlx/query-3f063afa6b1cee235b60edc06dee94adea3223725f8906025b3abebd24704ee4.json
diff --git a/server/main-api/migrations/20240703163202_more_complete_calendar.down.sql b/server/main-api/migrations/20240703163202_more_complete_calendar.down.sql
@@ -0,0 +1,7 @@
+-- Add down migration script here
+
+ALTER TABLE calendar RENAME COLUMN title_de TO stp_title_de;
+ALTER TABLE calendar RENAME COLUMN title_en TO stp_title_en;
+
+DELETE FROM calendar where stp_type is null;
+ALTER TABLE calendar CHANGE COLUMN stp_type SET NOT NULL;
diff --git a/server/main-api/migrations/20240703163202_more_complete_calendar.up.sql b/server/main-api/migrations/20240703163202_more_complete_calendar.up.sql
@@ -0,0 +1,5 @@
+-- Add up migration script here
+ALTER TABLE calendar RENAME COLUMN stp_title_de TO title_de;
+ALTER TABLE calendar RENAME COLUMN stp_title_en TO title_en;
+
+ALTER TABLE calendar ALTER COLUMN stp_type drop not null;
diff --git a/server/main-api/src/calendar/mod.rs b/server/main-api/src/calendar/mod.rs
@@ -201,7 +201,7 @@ mod tests {
                     end_at: *TIME_2014,
                     title_de: "Quantenteleportation".into(),
                     title_en: "Quantum teleportation".into(),
-                    stp_type: "Vorlesung mit Zentralübung".into(),
+                    stp_type: Some("Vorlesung mit Zentralübung".into()),
                     entry_type: models::EventType::Lecture.to_string(),
                     detailed_entry_type: "Abhaltung".into(),
                 },
@@ -212,7 +212,7 @@ mod tests {
                     end_at: *TIME_2016,
                     title_de: "Quantenteleportation 2".into(),
                     title_en: "Quantum teleportation 2".into(),
-                    stp_type: "Vorlesung mit Zentralübung".into(),
+                    stp_type: Some("Vorlesung mit Zentralübung".into()),
                     entry_type: models::EventType::Lecture.to_string(),
                     detailed_entry_type: "Abhaltung".into(),
                 },
@@ -223,7 +223,7 @@ mod tests {
                     end_at: *TIME_2016,
                     title_de: "Wartung".into(),
                     title_en: "maintenance".into(),
-                    stp_type: "Vorlesung mit Zentralübung".into(),
+                    stp_type: Some("Vorlesung mit Zentralübung".into()),
                     entry_type: models::EventType::Barred.to_string(),
                     detailed_entry_type: "Abhaltung".into(),
                 },
@@ -234,7 +234,7 @@ mod tests {
                     end_at: *TIME_2020,
                     title_de: "Quantenteleportation 3".into(),
                     title_en: "Quantum teleportation 3".into(),
-                    stp_type: "Vorlesung".into(),
+                    stp_type: Some("Vorlesung".into()),
                     entry_type: models::EventType::Other.to_string(),
                     detailed_entry_type: "Abhaltung".into(),
                 },
@@ -245,7 +245,7 @@ mod tests {
                     end_at: *TIME_2010,
                     title_de: "Quantenteleportation 3".into(),
                     title_en: "Quantum teleportation 3".into(),
-                    stp_type: "Vorlesung".into(),
+                    stp_type: Some("Vorlesung".into()),
                     entry_type: models::EventType::Exam.to_string(),
                     detailed_entry_type: "Abhaltung".into(),
                 },

diff --git a/server/main-api/src/calendar/models.rs b/server/main-api/src/calendar/models.rs
@@ -34,7 +34,7 @@ pub(super) struct LocationEvents {
     pub(super) location: CalendarLocation,
 }
 
-#[derive(Serialize, Deserialize, Clone, Debug, sqlx::Type)]
+#[derive(Serialize, Deserialize, Clone, Debug)]
 pub(super) struct Event {
     pub(super) id: i32,
     /// e.g. 5121.EG.003
@@ -48,7 +48,7 @@ pub(super) struct Event {
     /// e.g. Quantum teleportation
     pub(super) title_en: String,
     /// e.g. Vorlesung mit Zentralübung
-    pub(super) stp_type: String,
+    pub(super) stp_type: Option<String>,
     /// e.g. lecture
     /// in reality this is a [EventType]
     pub(super) entry_type: String,