refactor: update organization

packages/server/src/db/schema/certificate.ts

@@ -8,6 +8,7 @@ import { server } from "./server";
 import { users_temp } from "./user";
 // import { user } from "./user";
 import { generateAppName } from "./utils";
+import { organization } from "./account";
 
 export const certificates = pgTable("certificate", {
 	certificateId: text("certificateId")
@@ -22,12 +23,9 @@ export const certificates = pgTable("certificate", {
 		.$defaultFn(() => generateAppName("certificate"))
 		.unique(),
 	autoRenew: boolean("autoRenew"),
-	// userId: text("userId").references(() => user.userId, {
-	// 	onDelete: "cascade",
-	// }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 	serverId: text("serverId").references(() => server.serverId, {
 		onDelete: "cascade",
 	}),
@@ -40,9 +38,9 @@ export const certificatesRelations = relations(
 			fields: [certificates.serverId],
 			references: [server.serverId],
 		}),
-		user: one(users_temp, {
-			fields: [certificates.userId],
-			references: [users_temp.id],
+		organization: one(organization, {
+			fields: [certificates.organizationId],
+			references: [organization.id],
 		}),
 	}),
 );

packages/server/src/db/schema/destination.ts

@@ -6,6 +6,7 @@ import { z } from "zod";
 import { admins } from "./admin";
 import { backups } from "./backups";
 import { users_temp } from "./user";
+import { organization } from "./account";
 // import { user } from "./user";
 
 export const destinations = pgTable("destination", {
@@ -21,18 +22,19 @@ export const destinations = pgTable("destination", {
 	region: text("region").notNull(),
 	//   maybe it can be null
 	endpoint: text("endpoint").notNull(),
-	// userId: text("userId")
-	// 	.notNull()
-	// 	.references(() => user.userId, { onDelete: "cascade" }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 });
 
 export const destinationsRelations = relations(
 	destinations,
 	({ many, one }) => ({
 		backups: many(backups),
+		organization: one(organization, {
+			fields: [destinations.organizationId],
+			references: [organization.id],
+		}),
 		// user: one(user, {
 		// 	fields: [destinations.userId],
 		// 	references: [user.id],

packages/server/src/db/schema/git-provider.ts

@@ -8,6 +8,7 @@ import { bitbucket } from "./bitbucket";
 import { github } from "./github";
 import { gitlab } from "./gitlab";
 import { users_temp } from "./user";
+import { organization } from "./account";
 // import { user } from "./user";
 
 export const gitProviderType = pgEnum("gitProviderType", [
@@ -26,12 +27,9 @@ export const gitProvider = pgTable("git_provider", {
 	createdAt: text("createdAt")
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
-	// userId: text("userId").references(() => user.userId, {
-	// 	onDelete: "cascade",
-	// }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 });
 
 export const gitProviderRelations = relations(gitProvider, ({ one, many }) => ({
@@ -47,9 +45,9 @@ export const gitProviderRelations = relations(gitProvider, ({ one, many }) => ({
 		fields: [gitProvider.gitProviderId],
 		references: [bitbucket.gitProviderId],
 	}),
-	user: one(users_temp, {
-		fields: [gitProvider.userId],
-		references: [users_temp.id],
+	organization: one(organization, {
+		fields: [gitProvider.organizationId],
+		references: [organization.id],
 	}),
 }));
 

packages/server/src/db/schema/notification.ts

@@ -4,6 +4,7 @@ import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
 import { users_temp } from "./user";
+import { organization } from "./account";
 // import { user } from "./user";
 
 export const notificationType = pgEnum("notificationType", [
@@ -45,12 +46,9 @@ export const notifications = pgTable("notification", {
 	gotifyId: text("gotifyId").references(() => gotify.gotifyId, {
 		onDelete: "cascade",
 	}),
-	// userId: text("userId").references(() => user.userId, {
-	// 	onDelete: "cascade",
-	// }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 });
 
 export const slack = pgTable("slack", {
@@ -125,9 +123,9 @@ export const notificationsRelations = relations(notifications, ({ one }) => ({
 		fields: [notifications.gotifyId],
 		references: [gotify.gotifyId],
 	}),
-	user: one(users_temp, {
-		fields: [notifications.userId],
-		references: [users_temp.id],
+	organization: one(organization, {
+		fields: [notifications.organizationId],
+		references: [organization.id],
 	}),
 }));
 

packages/server/src/db/schema/project.ts

@@ -26,14 +26,9 @@ export const projects = pgTable("project", {
 	createdAt: text("createdAt")
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
-	// userId: text("userId")
-	// 	.notNull()
-	// 	.references(() => user.userId, { onDelete: "cascade" }),
-	userId: text("userId")
-		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+
 	organizationId: text("organizationId")
-		// .notNull()
+		.notNull()
 		.references(() => organization.id, { onDelete: "cascade" }),
 	env: text("env").notNull().default(""),
 });
@@ -46,14 +41,10 @@ export const projectRelations = relations(projects, ({ many, one }) => ({
 	mongo: many(mongo),
 	redis: many(redis),
 	compose: many(compose),
-	user: one(users_temp, {
-		fields: [projects.userId],
-		references: [users_temp.id],
+	organization: one(organization, {
+		fields: [projects.organizationId],
+		references: [organization.id],
 	}),
-	// user: one(user, {
-	// 	fields: [projects.userId],
-	// 	references: [user.id],
-	// }),
 }));
 
 const createSchema = createInsertSchema(projects, {

packages/server/src/db/schema/registry.ts

@@ -6,6 +6,7 @@ import { z } from "zod";
 import { admins } from "./admin";
 import { applications } from "./application";
 import { users_temp } from "./user";
+import { organization } from "./account";
 // import { user } from "./user";
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
@@ -29,12 +30,9 @@ export const registry = pgTable("registry", {
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
 	registryType: registryType("selfHosted").notNull().default("cloud"),
-	// userId: text("userId")
-	// 	.notNull()
-	// 	.references(() => user.userId, { onDelete: "cascade" }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 });
 
 export const registryRelations = relations(registry, ({ one, many }) => ({
@@ -50,7 +48,7 @@ const createSchema = createInsertSchema(registry, {
 	username: z.string().min(1),
 	password: z.string().min(1),
 	registryUrl: z.string(),
-	userId: z.string().min(1),
+	organizationId: z.string().min(1),
 	registryId: z.string().min(1),
 	registryType: z.enum(["cloud"]),
 	imagePrefix: z.string().nullable().optional(),

packages/server/src/db/schema/server.ts

@@ -25,6 +25,7 @@ import { sshKeys } from "./ssh-key";
 import { users_temp } from "./user";
 // import { user } from "./user";
 import { generateAppName } from "./utils";
+import { organization } from "./account";
 
 export const serverStatus = pgEnum("serverStatus", ["active", "inactive"]);
 
@@ -43,13 +44,9 @@ export const server = pgTable("server", {
 		.$defaultFn(() => generateAppName("server")),
 	enableDockerCleanup: boolean("enableDockerCleanup").notNull().default(false),
 	createdAt: text("createdAt").notNull(),
-	// 	.$defaultFn(() => new Date().toISOString()),
-	// userId: text("userId")
-	// 	.notNull()
-	// 	.references(() => user.userId, { onDelete: "cascade" }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 	serverStatus: serverStatus("serverStatus").notNull().default("active"),
 	command: text("command").notNull().default(""),
 	sshKeyId: text("sshKeyId").references(() => sshKeys.sshKeyId, {

packages/server/src/db/schema/ssh-key.ts

@@ -8,6 +8,7 @@ import { applications } from "./application";
 import { compose } from "./compose";
 import { server } from "./server";
 import { users_temp } from "./user";
+import { organization } from "./account";
 // import { user } from "./user";
 
 export const sshKeys = pgTable("ssh-key", {
@@ -23,21 +24,18 @@ export const sshKeys = pgTable("ssh-key", {
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
 	lastUsedAt: text("lastUsedAt"),
-	// userId: text("userId").references(() => user.userId, {
-	// 	onDelete: "cascade",
-	// }),
-	userId: text("userId")
+	organizationId: text("organizationId")
 		.notNull()
-		.references(() => users_temp.id, { onDelete: "cascade" }),
+		.references(() => organization.id, { onDelete: "cascade" }),
 });
 
 export const sshKeysRelations = relations(sshKeys, ({ many, one }) => ({
 	applications: many(applications),
 	compose: many(compose),
 	servers: many(server),
-	user: one(users_temp, {
-		fields: [sshKeys.userId],
-		references: [users_temp.id],
+	organization: one(organization, {
+		fields: [sshKeys.organizationId],
+		references: [organization.id],
 	}),
 }));
 
@@ -53,7 +51,7 @@ export const apiCreateSshKey = createSchema
 		description: true,
 		privateKey: true,
 		publicKey: true,
-		userId: true,
+		organizationId: true,
 	})
 	.merge(sshKeyCreate.pick({ privateKey: true }));