Merge branch 'main' into feature/add-sort-to-assigned

Author: canjalal

src/backend/db/migrations/1_initial-migrations.sql

@@ -76,16 +76,16 @@ CREATE TABLE "goal" (
   created_at TIMESTAMPTZ NOT NULL DEFAULT NOW()
 );
 
--- aka benchmark
-CREATE TABLE "subgoal" (
-  subgoal_id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), -- TODO: add index to allow reordering
+CREATE TABLE "benchmark" (
+  benchmark_id UUID PRIMARY KEY DEFAULT uuid_generate_v4(), -- TODO: add index to allow reordering
   goal_id UUID REFERENCES "goal" (goal_id),
   status TEXT NOT NULL DEFAULT 'In Progress'
     CHECK (status IN ('In Progress', 'Complete')),
   description TEXT NOT NULL,
   setup TEXT NOT NULL,
   instructions TEXT NOT NULL DEFAULT '',
   materials TEXT NOT NULL DEFAULT '',
+  frequency TEXT NOT NULL DEFAULT '',
   target_level SMALLINT NOT NULL CHECK (target_level BETWEEN 0 AND 100),
   baseline_level SMALLINT NOT NULL CHECK(baseline_level BETWEEN 0 AND 100),
   current_level SMALLINT CHECK(current_level BETWEEN 0 AND 100), --To be calculated as trial data is collected
@@ -100,7 +100,7 @@ CREATE TABLE "subgoal" (
 
 CREATE TABLE "task" (
   task_id UUID PRIMARY KEY DEFAULT uuid_generate_v4(),
-  subgoal_id UUID REFERENCES "subgoal" (subgoal_id),
+  benchmark_id UUID REFERENCES "benchmark" (benchmark_id),
   assignee_id UUID REFERENCES "user" (user_id),
   due_date TIMESTAMPTZ,
   trial_count INTEGER,
@@ -128,5 +128,5 @@ CREATE TABLE "trial_data_file" (
 );
 
 -- Potential schema for different collection types:
-  -- type TEXT NOT NULL CHECK (type IN ('attempt', 'behavioral')) -- enum - type of subgoal
+  -- type TEXT NOT NULL CHECK (type IN ('attempt', 'behavioral')) -- enum - type of benchmark
   -- data jsonb -- actual data, e.g. attempt_counts etc

src/backend/db/migrations/2_add-uniqueness-constraint-on-tasks.sql

@@ -1,7 +1,7 @@
--- Each task should have a unique subgoal_id - assignee_id combination
+-- Each task should have a unique benchmark_id - assignee_id combination
 -- which corresponds to a unique benchmark / para combo
 ALTER TABLE task
-ADD CONSTRAINT subgoal_assignee_unique UNIQUE (subgoal_id, assignee_id);
+ADD CONSTRAINT benchmark_assignee_unique UNIQUE (benchmark_id, assignee_id);
 
 -- Add index to allow easy queries of tasks by assignee
 CREATE INDEX idx_task_assignee ON task(assignee_id);