Dokploy/dokploy
1
0
Fork 0
mirror of https://github.com/Dokploy/dokploy synced 2025-06-26 18:27:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

refactor: migration

Browse Source
This commit is contained in:
Mauricio Siu
2025-02-09 18:56:17 -06:00
parent c04bf3c7e0
commit fafc238e70
22 changed files with 138 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
packages/server/src/services/admin.ts
View File

@@ -4,7 +4,7 @@ import {
admins,
type apiCreateUserInvitation,
auth,
users,
user,
} from "@dokploy/server/db/schema";
import { TRPCError } from "@trpc/server";
import * as bcrypt from "bcrypt";

2
packages/server/src/services/auth.ts
View File

@@ -5,7 +5,7 @@ import {
type apiCreateAdmin,
type apiCreateUser,
auth,
users,
user,
} from "@dokploy/server/db/schema";
import { getPublicIpWithFallback } from "@dokploy/server/wss/utils";
import { TRPCError } from "@trpc/server";

34
packages/server/src/services/user.ts
View File

@@ -1,15 +1,15 @@
import { db } from "@dokploy/server/db";
import { users } from "@dokploy/server/db/schema";
import { user } from "@dokploy/server/db/schema";
import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm";
export type User = typeof users.$inferSelect;
export type User = typeof user.$inferSelect;
export const findUserById = async (userId: string) => {
const user = await db.query.users.findFirst({
where: eq(users.userId, userId),
const userR = await db.query.user.findFirst({
where: eq(user.userId, userId),
});
if (!user) {
if (!userR) {
throw new TRPCError({
code: "NOT_FOUND",
message: "User not found",
@@ -19,8 +19,8 @@ export const findUserById = async (userId: string) => {
};
export const findUserByAuthId = async (authId: string) => {
const user = await db.query.users.findFirst({
where: eq(users.authId, authId),
const userR = await db.query.user.findFirst({
where: eq(user.authId, authId),
with: {
auth: true,
},
@@ -35,8 +35,8 @@ export const findUserByAuthId = async (authId: string) => {
};
export const findUsers = async (adminId: string) => {
const currentUsers = await db.query.users.findMany({
where: eq(users.adminId, adminId),
const currentUsers = await db.query.user.findMany({
where: eq(user.adminId, adminId),
with: {
auth: {
columns: {
@@ -49,24 +49,24 @@ export const findUsers = async (adminId: string) => {
};
export const addNewProject = async (authId: string, projectId: string) => {
const user = await findUserByAuthId(authId);
const userR = await findUserByAuthId(authId);
await db
.update(users)
.update(user)
.set({
accessedProjects: [...user.accessedProjects, projectId],
accessedProjects: [...userR.accessedProjects, projectId],
})
.where(eq(users.authId, authId));
.where(eq(user.authId, authId));
};
export const addNewService = async (authId: string, serviceId: string) => {
const user = await findUserByAuthId(authId);
const userR = await findUserByAuthId(authId);
await db
.update(users)
.update(user)
.set({
accessedServices: [...user.accessedServices, serviceId],
accessedServices: [...userR.accessedServices, serviceId],
})
.where(eq(users.authId, authId));
.where(eq(user.authId, authId));
};
export const canPerformCreationService = async (