fixing the checkin

src/database/schema.rs

@@ -61,20 +61,21 @@ CREATE TABLE IF NOT EXISTS schedules (
     user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
     enter_time TIMESTAMP NOT NULL,
     day_of_week day_of_week NOT NULL,
-    out_time TIMESTAMP NOT NULL,
+    out_time TIMESTAMP,
+    shift work_time NOT NULL,
     date_created TIMESTAMP NOT NULL DEFAULT NOW(),
     date_updated TIMESTAMP NOT NULL DEFAULT NOW()
 );
 "#;
 
-pub const CREATE_EMPLOYEE_WEEKLY_PREFERENCES_TABLE: &str = r#"
-CREATE TABLE IF NOT EXISTS employee_weekly_preferences (
+pub const CREATE_WEEKLY_PREFERENCES_TABLE: &str = r#"
+CREATE TABLE IF NOT EXISTS weekly_preferences (
     id SERIAL PRIMARY KEY,
     user_id INTEGER NOT NULL REFERENCES users(id) ON DELETE CASCADE,
     day_of_week day_of_week NOT NULL,
-    first_preference work_time NOT NULL,
-    second_preference work_time NOT NULL,
-    third_preference work_time NOT NULL,
+    first work_time NOT NULL,
+    second work_time NOT NULL,
+    third work_time NOT NULL,
     date_created TIMESTAMP NOT NULL DEFAULT NOW(),
     date_updated TIMESTAMP NOT NULL DEFAULT NOW(),
     UNIQUE (user_id, day_of_week)
@@ -83,7 +84,15 @@ CREATE TABLE IF NOT EXISTS employee_weekly_preferences (
 
 pub const ALTER_SCHEDULES_ADD_SHIFT: &str = r#"
 ALTER TABLE schedules
-ADD COLUMN IF NOT EXISTS shift work_time NOT NULL DEFAULT 'morning';
+ADD COLUMN IF NOT EXISTS shift work_time;
+"#;
+
+pub const UPDATE_SCHEDULES_DEFAULT_SHIFT: &str = r#"
+UPDATE schedules SET shift = 'morning' WHERE shift IS NULL;
+"#;
+
+pub const ALTER_SCHEDULES_SHIFT_SET_NOT_NULL: &str = r#"
+ALTER TABLE schedules ALTER COLUMN shift SET NOT NULL;
 "#;
 
 pub const ALTER_SCHEDULES_DROP_OUT_TIME_NOT_NULL: &str = r#"
@@ -91,14 +100,16 @@ ALTER TABLE schedules
 ALTER COLUMN out_time DROP NOT NULL;
 "#;
 
-pub const CREATE_SCHEMA_QUERIES: [&str; 9] = [
+pub const CREATE_SCHEMA_QUERIES: [&str; 11] = [
     CREATE_WORK_TIME_ENUM,
     CREATE_DAY_OF_WEEK_ENUM,
     CREATE_COMPANIES_TABLE,
     CREATE_USERS_TABLE,
     CREATE_COMPANY_USERS_TABLE,
     CREATE_SCHEDULES_TABLE,
-    CREATE_EMPLOYEE_WEEKLY_PREFERENCES_TABLE,
+    CREATE_WEEKLY_PREFERENCES_TABLE,
     ALTER_SCHEDULES_ADD_SHIFT,
+    UPDATE_SCHEDULES_DEFAULT_SHIFT,
+    ALTER_SCHEDULES_SHIFT_SET_NOT_NULL,
     ALTER_SCHEDULES_DROP_OUT_TIME_NOT_NULL,
 ];