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, {

packages/server/src/services/bitbucket.ts

@@ -12,14 +12,14 @@ export type Bitbucket = typeof bitbucket.$inferSelect;
 
 export const createBitbucket = async (
 	input: typeof apiCreateBitbucket._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newGitProvider = await tx
 			.insert(gitProvider)
 			.values({
 				providerType: "bitbucket",
-				userId: userId,
+				organizationId: organizationId,
 				name: input.name,
 			})
 			.returning()
@@ -74,12 +74,12 @@ export const updateBitbucket = async (
 			.where(eq(bitbucket.bitbucketId, bitbucketId))
 			.returning();
 
-		if (input.name || input.userId) {
+		if (input.name || input.organizationId) {
 			await tx
 				.update(gitProvider)
 				.set({
 					name: input.name,
-					userId: input.userId,
+					organizationId: input.organizationId,
 				})
 				.where(eq(gitProvider.gitProviderId, input.gitProviderId))
 				.returning();

packages/server/src/services/destination.ts

@@ -10,13 +10,13 @@ export type Destination = typeof destinations.$inferSelect;
 
 export const createDestintation = async (
 	input: typeof apiCreateDestination._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	const newDestination = await db
 		.insert(destinations)
 		.values({
 			...input,
-			userId: userId,
+			organizationId: organizationId,
 		})
 		.returning()
 		.then((value) => value[0]);
@@ -46,14 +46,14 @@ export const findDestinationById = async (destinationId: string) => {
 
 export const removeDestinationById = async (
 	destinationId: string,
-	userId: string,
+	organizationId: string,
 ) => {
 	const result = await db
 		.delete(destinations)
 		.where(
 			and(
 				eq(destinations.destinationId, destinationId),
-				eq(destinations.userId, userId),
+				eq(destinations.organizationId, organizationId),
 			),
 		)
 		.returning();
@@ -73,7 +73,7 @@ export const updateDestinationById = async (
 		.where(
 			and(
 				eq(destinations.destinationId, destinationId),
-				eq(destinations.userId, destinationData.userId || ""),
+				eq(destinations.organizationId, destinationData.organizationId || ""),
 			),
 		)
 		.returning();

packages/server/src/services/github.ts

@@ -12,14 +12,14 @@ import { updatePreviewDeployment } from "./preview-deployment";
 export type Github = typeof github.$inferSelect;
 export const createGithub = async (
 	input: typeof apiCreateGithub._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newGitProvider = await tx
 			.insert(gitProvider)
 			.values({
 				providerType: "github",
-				userId: userId,
+				organizationId: organizationId,
 				name: input.name,
 			})
 			.returning()

packages/server/src/services/gitlab.ts

@@ -13,14 +13,14 @@ export type Gitlab = typeof gitlab.$inferSelect;
 
 export const createGitlab = async (
 	input: typeof apiCreateGitlab._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	return await db.transaction(async (tx) => {
 		const newGitProvider = await tx
 			.insert(gitProvider)
 			.values({
 				providerType: "gitlab",
-				userId: userId,
+				organizationId: organizationId,
 				name: input.name,
 			})
 			.returning()

packages/server/src/services/notification.ts

@@ -24,7 +24,7 @@ export type Notification = typeof notifications.$inferSelect;
 
 export const createSlackNotification = async (
 	input: typeof apiCreateSlack._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newSlack = await tx
@@ -54,7 +54,7 @@ export const createSlackNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "slack",
-				userId: userId,
+				organizationId: organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -84,7 +84,7 @@ export const updateSlackNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				userId: input.userId,
+				organizationId: input.organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -114,7 +114,7 @@ export const updateSlackNotification = async (
 
 export const createTelegramNotification = async (
 	input: typeof apiCreateTelegram._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newTelegram = await tx
@@ -144,7 +144,7 @@ export const createTelegramNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "telegram",
-				userId: userId,
+				organizationId: organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -174,7 +174,7 @@ export const updateTelegramNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				userId: input.userId,
+				organizationId: input.organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -204,7 +204,7 @@ export const updateTelegramNotification = async (
 
 export const createDiscordNotification = async (
 	input: typeof apiCreateDiscord._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newDiscord = await tx
@@ -234,7 +234,7 @@ export const createDiscordNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "discord",
-				userId: userId,
+				organizationId: organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -264,7 +264,7 @@ export const updateDiscordNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				userId: input.userId,
+				organizationId: input.organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -294,7 +294,7 @@ export const updateDiscordNotification = async (
 
 export const createEmailNotification = async (
 	input: typeof apiCreateEmail._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newEmail = await tx
@@ -328,7 +328,7 @@ export const createEmailNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "email",
-				userId: userId,
+				organizationId: organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.returning()
@@ -358,7 +358,7 @@ export const updateEmailNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				userId: input.userId,
+				organizationId: input.organizationId,
 				serverThreshold: input.serverThreshold,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
@@ -392,7 +392,7 @@ export const updateEmailNotification = async (
 
 export const createGotifyNotification = async (
 	input: typeof apiCreateGotify._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	await db.transaction(async (tx) => {
 		const newGotify = await tx
@@ -424,7 +424,7 @@ export const createGotifyNotification = async (
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
 				notificationType: "gotify",
-				userId: userId,
+				organizationId: organizationId,
 			})
 			.returning()
 			.then((value) => value[0]);
@@ -453,7 +453,7 @@ export const updateGotifyNotification = async (
 				databaseBackup: input.databaseBackup,
 				dokployRestart: input.dokployRestart,
 				dockerCleanup: input.dockerCleanup,
-				userId: input.userId,
+				organizationId: input.organizationId,
 			})
 			.where(eq(notifications.notificationId, input.notificationId))
 			.returning()

packages/server/src/services/project.ts

@@ -16,13 +16,13 @@ export type Project = typeof projects.$inferSelect;
 
 export const createProject = async (
 	input: typeof apiCreateProject._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	const newProject = await db
 		.insert(projects)
 		.values({
 			...input,
-			userId: userId,
+			organizationId: organizationId,
 		})
 		.returning()
 		.then((value) => value[0]);

packages/server/src/services/server.ts

@@ -1,5 +1,9 @@
 import { db } from "@dokploy/server/db";
-import { type apiCreateServer, server } from "@dokploy/server/db/schema";
+import {
+	type apiCreateServer,
+	organization,
+	server,
+} from "@dokploy/server/db/schema";
 import { TRPCError } from "@trpc/server";
 import { desc, eq } from "drizzle-orm";
 
@@ -7,13 +11,13 @@ export type Server = typeof server.$inferSelect;
 
 export const createServer = async (
 	input: typeof apiCreateServer._type,
-	userId: string,
+	organizationId: string,
 ) => {
 	const newServer = await db
 		.insert(server)
 		.values({
 			...input,
-			userId: userId,
+			organizationId: organizationId,
 			createdAt: new Date().toISOString(),
 		})
 		.returning()
@@ -47,11 +51,15 @@ export const findServerById = async (serverId: string) => {
 };
 
 export const findServersByUserId = async (userId: string) => {
-	const servers = await db.query.server.findMany({
-		where: eq(server.userId, userId),
-		orderBy: desc(server.createdAt),
+	const orgs = await db.query.organization.findMany({
+		where: eq(organization.ownerId, userId),
+		with: {
+			servers: true,
+		},
 	});
 
+	const servers = orgs.flatMap((org) => org.servers);
+
 	return servers;
 };