mirror of
https://github.com/Dokploy/dokploy
synced 2025-06-26 18:27:59 +00:00
refactor: update
This commit is contained in:
parent
d1f72a2e20
commit
140a871275
@ -47,9 +47,9 @@ export const gitProviderRelations = relations(gitProvider, ({ one, many }) => ({
|
|||||||
fields: [gitProvider.gitProviderId],
|
fields: [gitProvider.gitProviderId],
|
||||||
references: [bitbucket.gitProviderId],
|
references: [bitbucket.gitProviderId],
|
||||||
}),
|
}),
|
||||||
admin: one(admins, {
|
user: one(users_temp, {
|
||||||
fields: [gitProvider.adminId],
|
fields: [gitProvider.userId],
|
||||||
references: [admins.adminId],
|
references: [users_temp.id],
|
||||||
}),
|
}),
|
||||||
}));
|
}));
|
||||||
|
|
||||||
|
@ -4,7 +4,7 @@ import {
|
|||||||
admins,
|
admins,
|
||||||
type apiCreateUserInvitation,
|
type apiCreateUserInvitation,
|
||||||
auth,
|
auth,
|
||||||
user,
|
users_temp,
|
||||||
} from "@dokploy/server/db/schema";
|
} from "@dokploy/server/db/schema";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
import * as bcrypt from "bcrypt";
|
import * as bcrypt from "bcrypt";
|
||||||
|
@ -5,7 +5,7 @@ import {
|
|||||||
type apiCreateAdmin,
|
type apiCreateAdmin,
|
||||||
type apiCreateUser,
|
type apiCreateUser,
|
||||||
auth,
|
auth,
|
||||||
user,
|
users_temp,
|
||||||
} from "@dokploy/server/db/schema";
|
} from "@dokploy/server/db/schema";
|
||||||
import { getPublicIpWithFallback } from "@dokploy/server/wss/utils";
|
import { getPublicIpWithFallback } from "@dokploy/server/wss/utils";
|
||||||
import { TRPCError } from "@trpc/server";
|
import { TRPCError } from "@trpc/server";
|
||||||
|
@ -1,9 +1,9 @@
|
|||||||
import { db } from "@dokploy/server/db";
|
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 { TRPCError } from "@trpc/server";
|
||||||
import { eq } from "drizzle-orm";
|
import { eq } from "drizzle-orm";
|
||||||
|
|
||||||
export type User = typeof user.$inferSelect;
|
export type User = typeof users_temp.$inferSelect;
|
||||||
|
|
||||||
export const findUserById = async (userId: string) => {
|
export const findUserById = async (userId: string) => {
|
||||||
const userR = await db.query.user.findFirst({
|
const userR = await db.query.user.findFirst({
|
||||||
|
Loading…
Reference in New Issue
Block a user