From 140a871275a7d61ed74e34d1c6f81c69a89c7fc6 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Thu, 13 Feb 2025 01:21:49 -0600 Subject: [PATCH] refactor: update --- packages/server/src/db/schema/git-provider.ts | 6 +++--- packages/server/src/services/admin.ts | 2 +- packages/server/src/services/auth.ts | 2 +- packages/server/src/services/user.ts | 4 ++-- 4 files changed, 7 insertions(+), 7 deletions(-) diff --git a/packages/server/src/db/schema/git-provider.ts b/packages/server/src/db/schema/git-provider.ts index a3410af53..be2c50001 100644 --- a/packages/server/src/db/schema/git-provider.ts +++ b/packages/server/src/db/schema/git-provider.ts @@ -47,9 +47,9 @@ export const gitProviderRelations = relations(gitProvider, ({ one, many }) => ({ fields: [gitProvider.gitProviderId], references: [bitbucket.gitProviderId], }), - admin: one(admins, { - fields: [gitProvider.adminId], - references: [admins.adminId], + user: one(users_temp, { + fields: [gitProvider.userId], + references: [users_temp.id], }), })); diff --git a/packages/server/src/services/admin.ts b/packages/server/src/services/admin.ts index 21c8f13e5..5155231b0 100644 --- a/packages/server/src/services/admin.ts +++ b/packages/server/src/services/admin.ts @@ -4,7 +4,7 @@ import { admins, type apiCreateUserInvitation, auth, - user, + users_temp, } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import * as bcrypt from "bcrypt"; diff --git a/packages/server/src/services/auth.ts b/packages/server/src/services/auth.ts index f391d011d..787ceedb8 100644 --- a/packages/server/src/services/auth.ts +++ b/packages/server/src/services/auth.ts @@ -5,7 +5,7 @@ import { type apiCreateAdmin, type apiCreateUser, auth, - user, + users_temp, } from "@dokploy/server/db/schema"; import { getPublicIpWithFallback } from "@dokploy/server/wss/utils"; import { TRPCError } from "@trpc/server"; diff --git a/packages/server/src/services/user.ts b/packages/server/src/services/user.ts index afc3ec009..5a9898cde 100644 --- a/packages/server/src/services/user.ts +++ b/packages/server/src/services/user.ts @@ -1,9 +1,9 @@ import { db } from "@dokploy/server/db"; -import { user } from "@dokploy/server/db/schema"; +import type { users_temp } from "@dokploy/server/db/schema"; import { TRPCError } from "@trpc/server"; import { eq } from "drizzle-orm"; -export type User = typeof user.$inferSelect; +export type User = typeof users_temp.$inferSelect; export const findUserById = async (userId: string) => { const userR = await db.query.user.findFirst({