refactor: adjust queries

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

@@ -2,6 +2,8 @@ import { relations } from "drizzle-orm";
 import { boolean, pgTable, text, timestamp } from "drizzle-orm/pg-core";
 import { nanoid } from "nanoid";
 import { users_temp } from "./user";
+import { server } from "./server";
+import { projects } from "./project";
 
 export const account = pgTable("account", {
 	id: text("id")
@@ -60,12 +62,17 @@ export const organization = pgTable("organization", {
 		.references(() => users_temp.id),
 });
 
-export const organizationRelations = relations(organization, ({ one }) => ({
-	owner: one(users_temp, {
-		fields: [organization.ownerId],
-		references: [users_temp.id],
+export const organizationRelations = relations(
+	organization,
+	({ one, many }) => ({
+		owner: one(users_temp, {
+			fields: [organization.ownerId],
+			references: [users_temp.id],
+		}),
+		servers: many(server),
+		projects: many(projects),
 	}),
-}));
+);
 
 export const member = pgTable("member", {
 	id: text("id")

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

@@ -61,5 +61,5 @@ export const apiUpdateBitbucket = createSchema.extend({
 	name: z.string().min(1),
 	bitbucketUsername: z.string().optional(),
 	bitbucketWorkspaceName: z.string().optional(),
-	userId: z.string().optional(),
+	organizationId: z.string().optional(),
 });

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

@@ -150,7 +150,7 @@ export const apiCreateSlack = notificationsSchema
 export const apiUpdateSlack = apiCreateSlack.partial().extend({
 	notificationId: z.string().min(1),
 	slackId: z.string(),
-	userId: z.string().optional(),
+	organizationId: z.string().optional(),
 });
 
 export const apiTestSlackConnection = apiCreateSlack.pick({
@@ -177,7 +177,7 @@ export const apiCreateTelegram = notificationsSchema
 export const apiUpdateTelegram = apiCreateTelegram.partial().extend({
 	notificationId: z.string().min(1),
 	telegramId: z.string().min(1),
-	userId: z.string().optional(),
+	organizationId: z.string().optional(),
 });
 
 export const apiTestTelegramConnection = apiCreateTelegram.pick({
@@ -204,7 +204,7 @@ export const apiCreateDiscord = notificationsSchema
 export const apiUpdateDiscord = apiCreateDiscord.partial().extend({
 	notificationId: z.string().min(1),
 	discordId: z.string().min(1),
-	userId: z.string().optional(),
+	organizationId: z.string().optional(),
 });
 
 export const apiTestDiscordConnection = apiCreateDiscord
@@ -238,7 +238,7 @@ export const apiCreateEmail = notificationsSchema
 export const apiUpdateEmail = apiCreateEmail.partial().extend({
 	notificationId: z.string().min(1),
 	emailId: z.string().min(1),
-	userId: z.string().optional(),
+	organizationId: z.string().optional(),
 });
 
 export const apiTestEmailConnection = apiCreateEmail.pick({

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

@@ -118,6 +118,10 @@ export const serverRelations = relations(server, ({ one, many }) => ({
 	mysql: many(mysql),
 	postgres: many(postgres),
 	certificates: many(certificates),
+	organization: one(organization, {
+		fields: [server.organizationId],
+		references: [organization.id],
+	}),
 }));
 
 const createSchema = createInsertSchema(server, {