feat: update references

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

@@ -1,6 +1,7 @@
 import { boolean, pgTable, text, timestamp } from "drizzle-orm/pg-core";
 import { nanoid } from "nanoid";
 import { users_temp } from "./user";
+import { relations } from "drizzle-orm";
 
 export const account = pgTable("account", {
 	id: text("id")
@@ -29,6 +30,13 @@ export const account = pgTable("account", {
 	confirmationExpiresAt: text("confirmationExpiresAt"),
 });
 
+export const accountRelations = relations(account, ({ one }) => ({
+	user: one(users_temp, {
+		fields: [account.userId],
+		references: [users_temp.id],
+	}),
+}));
+
 export const verification = pgTable("verification", {
 	id: text("id").primaryKey(),
 	identifier: text("identifier").notNull(),
@@ -52,6 +60,13 @@ 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 member = pgTable("member", {
 	id: text("id")
 		.primaryKey()
@@ -66,6 +81,17 @@ export const member = pgTable("member", {
 	createdAt: timestamp("created_at").notNull(),
 });
 
+export const memberRelations = relations(member, ({ one }) => ({
+	organization: one(organization, {
+		fields: [member.organizationId],
+		references: [organization.id],
+	}),
+	user: one(users_temp, {
+		fields: [member.userId],
+		references: [users_temp.id],
+	}),
+}));
+
 export const invitation = pgTable("invitation", {
 	id: text("id").primaryKey(),
 	organizationId: text("organization_id")
@@ -79,3 +105,10 @@ export const invitation = pgTable("invitation", {
 		.notNull()
 		.references(() => users_temp.id),
 });
+
+export const invitationRelations = relations(invitation, ({ one }) => ({
+	organization: one(organization, {
+		fields: [invitation.organizationId],
+		references: [organization.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(),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });

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

@@ -3,7 +3,6 @@ import { boolean, integer, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
 import { z } from "zod";
-import { admins } from "./admin";
 import { users_temp } from "./user";
 // import { user } from "./user";
 
@@ -153,7 +152,7 @@ export const apiCreateSlack = notificationsSchema
 export const apiUpdateSlack = apiCreateSlack.partial().extend({
 	notificationId: z.string().min(1),
 	slackId: z.string(),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestSlackConnection = apiCreateSlack.pick({
@@ -180,7 +179,7 @@ export const apiCreateTelegram = notificationsSchema
 export const apiUpdateTelegram = apiCreateTelegram.partial().extend({
 	notificationId: z.string().min(1),
 	telegramId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestTelegramConnection = apiCreateTelegram.pick({
@@ -207,7 +206,7 @@ export const apiCreateDiscord = notificationsSchema
 export const apiUpdateDiscord = apiCreateDiscord.partial().extend({
 	notificationId: z.string().min(1),
 	discordId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestDiscordConnection = apiCreateDiscord
@@ -241,7 +240,7 @@ export const apiCreateEmail = notificationsSchema
 export const apiUpdateEmail = apiCreateEmail.partial().extend({
 	notificationId: z.string().min(1),
 	emailId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestEmailConnection = apiCreateEmail.pick({
@@ -273,7 +272,7 @@ export const apiCreateGotify = notificationsSchema
 export const apiUpdateGotify = apiCreateGotify.partial().extend({
 	notificationId: z.string().min(1),
 	gotifyId: z.string().min(1),
-	adminId: z.string().optional(),
+	userId: z.string().optional(),
 });
 
 export const apiTestGotifyConnection = apiCreateGotify

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

@@ -196,8 +196,8 @@ export const usersRelations = relations(users, ({ one }) => ({
 	// }),
 }));
 
-const createSchema = createInsertSchema(users, {
-	userId: z.string().min(1),
+const createSchema = createInsertSchema(users_temp, {
+	id: z.string().min(1),
 	// authId: z.string().min(1),
 	token: z.string().min(1),
 	isRegistered: z.boolean().optional(),
@@ -218,7 +218,7 @@ export const apiCreateUserInvitation = createSchema.pick({}).extend({
 
 export const apiRemoveUser = createSchema
 	.pick({
-		// authId: true,
+		id: true,
 	})
 	.required();
 
@@ -230,7 +230,7 @@ export const apiFindOneToken = createSchema
 
 export const apiAssignPermissions = createSchema
 	.pick({
-		userId: true,
+		id: true,
 		canCreateProjects: true,
 		canCreateServices: true,
 		canDeleteProjects: true,
@@ -247,7 +247,7 @@ export const apiAssignPermissions = createSchema
 
 export const apiFindOneUser = createSchema
 	.pick({
-		userId: true,
+		id: true,
 	})
 	.required();