Skip to content

armgit / kaneo

Public Imported from GitHub
0

⚡ Project management that doesn't become the project. Boards, Gantt charts, and GitHub integration. Self-host it or use Kaneo Cloud.

chore: reverting psql migrations

Andrej Acevskib2bd56dac2a8
diff --git a/apps/api/drizzle/0000_new_ted_forrester.sql b/apps/api/drizzle/0000_confused_pixie.sql
similarity index 94%
rename from apps/api/drizzle/0000_new_ted_forrester.sql
rename to apps/api/drizzle/0000_confused_pixie.sql
index 5143088f4..64ebe2e97 100644
--- a/apps/api/drizzle/0000_new_ted_forrester.sql
+++ b/apps/api/drizzle/0000_confused_pixie.sql
@@ -88,8 +88,8 @@ CREATE TABLE "workspace" (
--> statement-breakpoint
CREATE TABLE "workspace_member" (
"id" text PRIMARY KEY NOT NULL,
- "workspace_id" text NOT NULL,
- "user_email" text,
+ "workspace_id" text,
+ "user_email" text NOT NULL,
"role" text DEFAULT 'member' NOT NULL,
"joined_at" timestamp DEFAULT now() NOT NULL,
"status" text DEFAULT 'pending' NOT NULL
@@ -106,5 +106,4 @@ ALTER TABLE "task" ADD CONSTRAINT "task_assignee_email_user_email_fk" FOREIGN KE
ALTER TABLE "time_entry" ADD CONSTRAINT "time_entry_task_id_task_id_fk" FOREIGN KEY ("task_id") REFERENCES "public"."task"("id") ON DELETE cascade ON UPDATE cascade;--> statement-breakpoint
ALTER TABLE "time_entry" ADD CONSTRAINT "time_entry_user_email_user_email_fk" FOREIGN KEY ("user_email") REFERENCES "public"."user"("email") ON DELETE cascade ON UPDATE cascade;--> statement-breakpoint
ALTER TABLE "workspace" ADD CONSTRAINT "workspace_owner_email_user_email_fk" FOREIGN KEY ("owner_email") REFERENCES "public"."user"("email") ON DELETE cascade ON UPDATE cascade;--> statement-breakpoint
-ALTER TABLE "workspace_member" ADD CONSTRAINT "workspace_member_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE cascade;--> statement-breakpoint
-ALTER TABLE "workspace_member" ADD CONSTRAINT "workspace_member_user_email_user_email_fk" FOREIGN KEY ("user_email") REFERENCES "public"."user"("email") ON DELETE cascade ON UPDATE cascade;
\ No newline at end of file
+ALTER TABLE "workspace_member" ADD CONSTRAINT "workspace_member_workspace_id_workspace_id_fk" FOREIGN KEY ("workspace_id") REFERENCES "public"."workspace"("id") ON DELETE cascade ON UPDATE cascade;
\ No newline at end of file
diff --git a/apps/api/drizzle/meta/0000_snapshot.json b/apps/api/drizzle/meta/0000_snapshot.json
index 5ccd8692b..753450f7c 100644
--- a/apps/api/drizzle/meta/0000_snapshot.json
+++ b/apps/api/drizzle/meta/0000_snapshot.json
@@ -1,5 +1,5 @@
{
- "id": "b34dfa17-4282-4f42-a5ba-71db1f01adc8",
+ "id": "1ed2e748-68b8-4d66-9d11-c06fba31a8dd",
"prevId": "00000000-0000-0000-0000-000000000000",
"version": "7",
"dialect": "postgresql",
@@ -625,13 +625,13 @@
"name": "workspace_id",
"type": "text",
"primaryKey": false,
- "notNull": true
+ "notNull": false
},
"user_email": {
"name": "user_email",
"type": "text",
"primaryKey": false,
- "notNull": false
+ "notNull": true
},
"role": {
"name": "role",
@@ -665,15 +665,6 @@
"columnsTo": ["id"],
"onDelete": "cascade",
"onUpdate": "cascade"
- },
- "workspace_member_user_email_user_email_fk": {
- "name": "workspace_member_user_email_user_email_fk",
- "tableFrom": "workspace_member",
- "tableTo": "user",
- "columnsFrom": ["user_email"],
- "columnsTo": ["email"],
- "onDelete": "cascade",
- "onUpdate": "cascade"
}
},
"compositePrimaryKeys": {},
diff --git a/apps/api/drizzle/meta/_journal.json b/apps/api/drizzle/meta/_journal.json
index 2019f5852..5343b386a 100644
--- a/apps/api/drizzle/meta/_journal.json
+++ b/apps/api/drizzle/meta/_journal.json
@@ -5,8 +5,8 @@
{
"idx": 0,
"version": "7",
- "when": 1749922967091,
- "tag": "0000_new_ted_forrester",
+ "when": 1750083630484,
+ "tag": "0000_confused_pixie",
"breakpoints": true
}
]
diff --git a/apps/api/src/database/schema.ts b/apps/api/src/database/schema.ts
index abd622776..49a514526 100644
--- a/apps/api/src/database/schema.ts
+++ b/apps/api/src/database/schema.ts
@@ -47,16 +47,11 @@ export const workspaceUserTable = pgTable("workspace_member", {
id: text("id")
.$defaultFn(() => createId())
.primaryKey(),
- workspaceId: text("workspace_id")
- .notNull()
- .references(() => workspaceTable.id, {
- onDelete: "cascade",
- onUpdate: "cascade",
- }),
- userEmail: text("user_email").references(() => userTable.email, {
+ workspaceId: text("workspace_id").references(() => workspaceTable.id, {
onDelete: "cascade",
onUpdate: "cascade",
}),
+ userEmail: text("user_email").notNull(),
role: text("role").default("member").notNull(),
joinedAt: timestamp("joined_at", { mode: "date" }).defaultNow().notNull(),
status: text("status").default("pending").notNull(),
diff --git a/apps/api/src/workspace-user/controllers/get-workspace-user.ts b/apps/api/src/workspace-user/controllers/get-workspace-user.ts
index 9c1db877b..df6636286 100644
--- a/apps/api/src/workspace-user/controllers/get-workspace-user.ts
+++ b/apps/api/src/workspace-user/controllers/get-workspace-user.ts
@@ -4,8 +4,8 @@ import db from "../../database";
import { workspaceUserTable } from "../../database/schema";
async function getWorkspaceUser(id: string) {
- const workspaceUser = await db.query.workspaceUserTable.findFirst({
- where: eq(workspaceUserTable.id, id),
+ const workspaceUser = await db.query.workspaceUserTable.findMany({
+ where: eq(workspaceUserTable.workspaceId, id),
});
if (!workspaceUser) {