refactor: update database imports to use centralized db module for improved consistency across API routes and schemas

This commit is contained in:
Mauricio Siu
2026-02-24 19:00:30 -06:00
parent b027d21589
commit b2218efce6
39 changed files with 225 additions and 220 deletions
@@ -4,9 +4,9 @@ import {
IS_CLOUD, IS_CLOUD,
shouldDeploy, shouldDeploy,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import type { NextApiRequest, NextApiResponse } from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import { db } from "@/server/db";
import { applications } from "@/server/db/schema"; import { applications } from "@/server/db/schema";
import type { DeploymentJob } from "@/server/queues/queue-types"; import type { DeploymentJob } from "@/server/queues/queue-types";
import { myQueue } from "@/server/queues/queueSetup"; import { myQueue } from "@/server/queues/queueSetup";
@@ -1,7 +1,7 @@
import { IS_CLOUD, shouldDeploy } from "@dokploy/server"; import { IS_CLOUD, shouldDeploy } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import type { NextApiRequest, NextApiResponse } from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import { db } from "@/server/db";
import { compose } from "@/server/db/schema"; import { compose } from "@/server/db/schema";
import type { DeploymentJob } from "@/server/queues/queue-types"; import type { DeploymentJob } from "@/server/queues/queue-types";
import { myQueue } from "@/server/queues/queueSetup"; import { myQueue } from "@/server/queues/queueSetup";
+1 -1
View File
@@ -9,10 +9,10 @@ import {
removePreviewDeployment, removePreviewDeployment,
shouldDeploy, shouldDeploy,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { Webhooks } from "@octokit/webhooks"; import { Webhooks } from "@octokit/webhooks";
import { and, eq } from "drizzle-orm"; import { and, eq } from "drizzle-orm";
import type { NextApiRequest, NextApiResponse } from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import { db } from "@/server/db";
import { applications, compose, github } from "@/server/db/schema"; import { applications, compose, github } from "@/server/db/schema";
import type { DeploymentJob } from "@/server/queues/queue-types"; import type { DeploymentJob } from "@/server/queues/queue-types";
import { myQueue } from "@/server/queues/queueSetup"; import { myQueue } from "@/server/queues/queueSetup";
@@ -1,8 +1,8 @@
import { createGithub } from "@dokploy/server"; import { createGithub } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import type { NextApiRequest, NextApiResponse } from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import { Octokit } from "octokit"; import { Octokit } from "octokit";
import { db } from "@/server/db";
import { github } from "@/server/db/schema"; import { github } from "@/server/db/schema";
type Query = { type Query = {
+1 -1
View File
@@ -1,9 +1,9 @@
import { buffer } from "node:stream/consumers"; import { buffer } from "node:stream/consumers";
import { findUserById, type Server } from "@dokploy/server"; import { findUserById, type Server } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { asc, eq } from "drizzle-orm"; import { asc, eq } from "drizzle-orm";
import type { NextApiRequest, NextApiResponse } from "next"; import type { NextApiRequest, NextApiResponse } from "next";
import Stripe from "stripe"; import Stripe from "stripe";
import { db } from "@/server/db";
import { organization, server, user } from "@/server/db/schema"; import { organization, server, user } from "@/server/db/schema";
const endpointSecret = process.env.STRIPE_WEBHOOK_SECRET!; const endpointSecret = process.env.STRIPE_WEBHOOK_SECRET!;
@@ -30,12 +30,12 @@ import {
writeConfigRemote, writeConfigRemote,
// uploadFileSchema // uploadFileSchema
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateApplication, apiCreateApplication,
apiDeployApplication, apiDeployApplication,
+1 -1
View File
@@ -6,9 +6,9 @@ import {
testBitbucketConnection, testBitbucketConnection,
updateBitbucket, updateBitbucket,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiBitbucketTestConnection, apiBitbucketTestConnection,
apiCreateBitbucket, apiCreateBitbucket,
@@ -4,10 +4,10 @@ import {
IS_CLOUD, IS_CLOUD,
removeCertificateById, removeCertificateById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { adminProcedure, createTRPCRouter } from "@/server/api/trpc"; import { adminProcedure, createTRPCRouter } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateCertificate, apiCreateCertificate,
apiFindCertificate, apiFindCertificate,
+1 -1
View File
@@ -33,6 +33,7 @@ import {
updateCompose, updateCompose,
updateDeploymentStatus, updateDeploymentStatus,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { import {
type CompleteTemplate, type CompleteTemplate,
fetchTemplateFiles, fetchTemplateFiles,
@@ -47,7 +48,6 @@ import { parse } from "toml";
import { stringify } from "yaml"; import { stringify } from "yaml";
import { z } from "zod"; import { z } from "zod";
import { slugify } from "@/lib/slug"; import { slugify } from "@/lib/slug";
import { db } from "@/server/db";
import { import {
apiCreateCompose, apiCreateCompose,
apiDeleteCompose, apiDeleteCompose,
@@ -11,10 +11,10 @@ import {
removeDeployment, removeDeployment,
updateDeploymentStatus, updateDeploymentStatus,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { desc, eq } from "drizzle-orm"; import { desc, eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { db } from "@/server/db";
import { import {
apiFindAllByApplication, apiFindAllByApplication,
apiFindAllByCompose, apiFindAllByCompose,
@@ -7,6 +7,7 @@ import {
removeDestinationById, removeDestinationById,
updateDestinationById, updateDestinationById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { desc, eq } from "drizzle-orm"; import { desc, eq } from "drizzle-orm";
import { import {
@@ -14,7 +15,6 @@ import {
createTRPCRouter, createTRPCRouter,
protectedProcedure, protectedProcedure,
} from "@/server/api/trpc"; } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateDestination, apiCreateDestination,
apiFindOneDestination, apiFindOneDestination,
@@ -1,8 +1,8 @@
import { findGitProviderById, removeGitProvider } from "@dokploy/server"; import { findGitProviderById, removeGitProvider } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, desc, eq } from "drizzle-orm"; import { and, desc, eq } from "drizzle-orm";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { apiRemoveGitProvider, gitProvider } from "@/server/db/schema"; import { apiRemoveGitProvider, gitProvider } from "@/server/db/schema";
export const gitProviderRouter = createTRPCRouter({ export const gitProviderRouter = createTRPCRouter({
+1 -1
View File
@@ -8,9 +8,9 @@ import {
updateGitea, updateGitea,
updateGitProvider, updateGitProvider,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateGitea, apiCreateGitea,
apiFindGiteaBranches, apiFindGiteaBranches,
+1 -1
View File
@@ -6,9 +6,9 @@ import {
updateGithub, updateGithub,
updateGitProvider, updateGitProvider,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiFindGithubBranches, apiFindGithubBranches,
apiFindOneGithub, apiFindOneGithub,
+1 -1
View File
@@ -8,9 +8,9 @@ import {
updateGitlab, updateGitlab,
updateGitProvider, updateGitProvider,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateGitlab, apiCreateGitlab,
apiFindGitlabBranches, apiFindGitlabBranches,
+1 -1
View File
@@ -19,12 +19,12 @@ import {
stopServiceRemote, stopServiceRemote,
updateMariadbById, updateMariadbById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { observable } from "@trpc/server/observable"; import { observable } from "@trpc/server/observable";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiChangeMariaDBStatus, apiChangeMariaDBStatus,
apiCreateMariaDB, apiCreateMariaDB,
+1 -1
View File
@@ -19,11 +19,11 @@ import {
stopServiceRemote, stopServiceRemote,
updateMongoById, updateMongoById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiChangeMongoStatus, apiChangeMongoStatus,
apiCreateMongo, apiCreateMongo,
+1 -1
View File
@@ -19,11 +19,11 @@ import {
stopServiceRemote, stopServiceRemote,
updateMySqlById, updateMySqlById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiChangeMySqlStatus, apiChangeMySqlStatus,
apiCreateMySql, apiCreateMySql,
@@ -38,6 +38,7 @@ import {
updateTeamsNotification, updateTeamsNotification,
updateTelegramNotification, updateTelegramNotification,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { desc, eq, sql } from "drizzle-orm"; import { desc, eq, sql } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
@@ -47,7 +48,6 @@ import {
protectedProcedure, protectedProcedure,
publicProcedure, publicProcedure,
} from "@/server/api/trpc"; } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateCustom, apiCreateCustom,
apiCreateDiscord, apiCreateDiscord,
@@ -1,9 +1,9 @@
import { db } from "@dokploy/server/db";
import { IS_CLOUD } from "@dokploy/server/index"; import { IS_CLOUD } from "@dokploy/server/index";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, desc, eq, exists } from "drizzle-orm"; import { and, desc, eq, exists } from "drizzle-orm";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { db } from "@/server/db";
import { invitation, member, organization } from "@/server/db/schema"; import { invitation, member, organization } from "@/server/db/schema";
import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc"; import { adminProcedure, createTRPCRouter, protectedProcedure } from "../trpc";
export const organizationRouter = createTRPCRouter({ export const organizationRouter = createTRPCRouter({
+1 -1
View File
@@ -20,11 +20,11 @@ import {
stopServiceRemote, stopServiceRemote,
updatePostgresById, updatePostgresById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiChangePostgresStatus, apiChangePostgresStatus,
apiCreatePostgres, apiCreatePostgres,
+1 -1
View File
@@ -32,12 +32,12 @@ import {
IS_CLOUD, IS_CLOUD,
updateProjectById, updateProjectById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { and, desc, eq, sql } from "drizzle-orm"; import { and, desc, eq, sql } from "drizzle-orm";
import type { AnyPgColumn } from "drizzle-orm/pg-core"; import type { AnyPgColumn } from "drizzle-orm/pg-core";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateProject, apiCreateProject,
apiFindOneProject, apiFindOneProject,
@@ -1,10 +1,10 @@
import { db } from "@dokploy/server/db";
import { user } from "@dokploy/server/db/schema"; import { user } from "@dokploy/server/db/schema";
import { hasValidLicense, validateLicenseKey } from "@dokploy/server/index"; import { hasValidLicense, validateLicenseKey } from "@dokploy/server/index";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { adminProcedure, createTRPCRouter } from "@/server/api/trpc"; import { adminProcedure, createTRPCRouter } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
activateLicenseKey, activateLicenseKey,
deactivateLicenseKey, deactivateLicenseKey,
@@ -1,5 +1,6 @@
import { normalizeTrustedOrigin } from "@dokploy/server"; import { normalizeTrustedOrigin } from "@dokploy/server";
import { IS_CLOUD } from "@dokploy/server/constants"; import { IS_CLOUD } from "@dokploy/server/constants";
import { db } from "@dokploy/server/db";
import { member, ssoProvider, user } from "@dokploy/server/db/schema"; import { member, ssoProvider, user } from "@dokploy/server/db/schema";
import { ssoProviderBodySchema } from "@dokploy/server/db/schema/sso"; import { ssoProviderBodySchema } from "@dokploy/server/db/schema/sso";
import { import {
@@ -15,7 +16,6 @@ import {
enterpriseProcedure, enterpriseProcedure,
publicProcedure, publicProcedure,
} from "@/server/api/trpc"; } from "@/server/api/trpc";
import { db } from "@/server/db";
export const ssoRouter = createTRPCRouter({ export const ssoRouter = createTRPCRouter({
showSignInWithSSO: publicProcedure.query(async () => { showSignInWithSSO: publicProcedure.query(async () => {
+1 -2
View File
@@ -18,12 +18,11 @@ import {
stopServiceRemote, stopServiceRemote,
updateRedisById, updateRedisById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiChangeRedisStatus, apiChangeRedisStatus,
apiCreateRedis, apiCreateRedis,
+1 -1
View File
@@ -7,9 +7,9 @@ import {
removeRegistry, removeRegistry,
updateRegistry, updateRegistry,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq } from "drizzle-orm"; import { eq } from "drizzle-orm";
import { db } from "@/server/db";
import { import {
apiCreateRegistry, apiCreateRegistry,
apiFindOneRegistry, apiFindOneRegistry,
+1 -1
View File
@@ -15,13 +15,13 @@ import {
setupMonitoring, setupMonitoring,
updateServerById, updateServerById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { observable } from "@trpc/server/observable"; import { observable } from "@trpc/server/observable";
import { and, desc, eq, getTableColumns, isNotNull, sql } from "drizzle-orm"; import { and, desc, eq, getTableColumns, isNotNull, sql } from "drizzle-orm";
import { z } from "zod"; import { z } from "zod";
import { updateServersBasedOnQuantity } from "@/pages/api/stripe/webhook"; import { updateServersBasedOnQuantity } from "@/pages/api/stripe/webhook";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateServer, apiCreateServer,
apiFindOneServer, apiFindOneServer,
+1 -1
View File
@@ -45,13 +45,13 @@ import {
writeTraefikConfigInPath, writeTraefikConfigInPath,
writeTraefikSetup, writeTraefikSetup,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { generateOpenApiDocument } from "@dokploy/trpc-openapi"; import { generateOpenApiDocument } from "@dokploy/trpc-openapi";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { eq, sql } from "drizzle-orm"; import { eq, sql } from "drizzle-orm";
import { scheduledJobs, scheduleJob } from "node-schedule"; import { scheduledJobs, scheduleJob } from "node-schedule";
import { parse, stringify } from "yaml"; import { parse, stringify } from "yaml";
import { z } from "zod"; import { z } from "zod";
import { db } from "@/server/db";
import { import {
apiAssignDomain, apiAssignDomain,
apiEnableDashboard, apiEnableDashboard,
+1 -1
View File
@@ -5,10 +5,10 @@ import {
removeSSHKeyById, removeSSHKeyById,
updateSSHKeyById, updateSSHKeyById,
} from "@dokploy/server"; } from "@dokploy/server";
import { db } from "@dokploy/server/db";
import { TRPCError } from "@trpc/server"; import { TRPCError } from "@trpc/server";
import { desc, eq } from "drizzle-orm"; import { desc, eq } from "drizzle-orm";
import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc"; import { createTRPCRouter, protectedProcedure } from "@/server/api/trpc";
import { db } from "@/server/db";
import { import {
apiCreateSshKey, apiCreateSshKey,
apiFindOneSshKey, apiFindOneSshKey,
+2 -2
View File
@@ -7,6 +7,8 @@
* need to use are documented accordingly near the end. * need to use are documented accordingly near the end.
*/ */
// import { getServerAuthSession } from "@/server/auth";
import { db } from "@dokploy/server/db";
import { hasValidLicense } from "@dokploy/server/index"; import { hasValidLicense } from "@dokploy/server/index";
import { validateRequest } from "@dokploy/server/lib/auth"; import { validateRequest } from "@dokploy/server/lib/auth";
import type { OpenApiMeta } from "@dokploy/trpc-openapi"; import type { OpenApiMeta } from "@dokploy/trpc-openapi";
@@ -15,8 +17,6 @@ import type { CreateNextContextOptions } from "@trpc/server/adapters/next";
import type { Session, User } from "better-auth"; import type { Session, User } from "better-auth";
import superjson from "superjson"; import superjson from "superjson";
import { ZodError } from "zod"; import { ZodError } from "zod";
// import { getServerAuthSession } from "@/server/auth";
import { db } from "@/server/db";
/** /**
* 1. CONTEXT * 1. CONTEXT
-22
View File
@@ -1,22 +0,0 @@
import { dbUrl } from "@dokploy/server/db/constants";
import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js";
import postgres from "postgres";
import * as schema from "./schema";
declare global {
var db: PostgresJsDatabase<typeof schema> | undefined;
}
export let db: PostgresJsDatabase<typeof schema>;
if (process.env.NODE_ENV === "production") {
db = drizzle(postgres(dbUrl!), {
schema,
});
} else {
if (!global.db)
global.db = drizzle(postgres(dbUrl!), {
schema,
});
db = global.db;
}
-2
View File
@@ -1,10 +1,8 @@
import { and, eq } from "drizzle-orm";
import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js"; import { drizzle, type PostgresJsDatabase } from "drizzle-orm/postgres-js";
import postgres from "postgres"; import postgres from "postgres";
import { dbUrl } from "./constants"; import { dbUrl } from "./constants";
import * as schema from "./schema"; import * as schema from "./schema";
export { and, eq };
export * from "./schema"; export * from "./schema";
declare global { declare global {
+76 -50
View File
@@ -126,62 +126,88 @@ const schema = createInsertSchema(deployments, {
previewDeploymentId: z.string(), previewDeploymentId: z.string(),
buildServerId: z.string(), buildServerId: z.string(),
}); });
export const apiCreateDeployment = z.object({ export const apiCreateDeployment = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
applicationId: z.string().min(1), logPath: true,
description: z.string().optional(), applicationId: true,
previewDeploymentId: z.string().optional(), description: true,
}); previewDeploymentId: true,
})
.extend({
applicationId: z.string().min(1),
});
export const apiCreateDeploymentPreview = z.object({ export const apiCreateDeploymentPreview = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
description: z.string().optional(), logPath: true,
previewDeploymentId: z.string().min(1), description: true,
}); previewDeploymentId: true,
})
.extend({
previewDeploymentId: z.string().min(1),
});
export const apiCreateDeploymentCompose = z.object({ export const apiCreateDeploymentCompose = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
composeId: z.string().min(1), logPath: true,
description: z.string().optional(), composeId: true,
}); description: true,
})
.extend({
composeId: z.string().min(1),
});
export const apiCreateDeploymentBackup = z.object({ export const apiCreateDeploymentBackup = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
backupId: z.string().min(1), logPath: true,
description: z.string().optional(), backupId: true,
}); description: true,
})
.extend({
backupId: z.string().min(1),
});
export const apiCreateDeploymentServer = z.object({ export const apiCreateDeploymentServer = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
serverId: z.string().min(1), logPath: true,
description: z.string().optional(), serverId: true,
}); description: true,
})
.extend({
serverId: z.string().min(1),
});
export const apiCreateDeploymentSchedule = z.object({ export const apiCreateDeploymentSchedule = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
description: z.string().optional(), logPath: true,
scheduleId: z.string().min(1), description: true,
}); })
.extend({
scheduleId: z.string().min(1),
});
export const apiCreateDeploymentVolumeBackup = z.object({ export const apiCreateDeploymentVolumeBackup = schema
title: z.string().min(1), .pick({
status: z.string().default("running"), title: true,
logPath: z.string().min(1), status: true,
description: z.string().optional(), logPath: true,
volumeBackupId: z.string().min(1), description: true,
}); })
.extend({
volumeBackupId: z.string().min(1),
});
export const apiFindAllByApplication = z.object({ export const apiFindAllByApplication = z.object({
applicationId: z.string().min(1), applicationId: z.string().min(1),
+34 -24
View File
@@ -46,33 +46,43 @@ const createSchema = createInsertSchema(destinations, {
region: z.string(), region: z.string(),
}); });
export const apiCreateDestination = z.object({ export const apiCreateDestination = createSchema
name: z.string().min(1), .pick({
provider: z.string(), name: true,
accessKey: z.string(), provider: true,
bucket: z.string(), accessKey: true,
region: z.string(), bucket: true,
endpoint: z.string(), region: true,
secretAccessKey: z.string(), endpoint: true,
serverId: z.string().optional(), secretAccessKey: true,
}); })
.required()
.extend({
serverId: z.string().optional(),
});
export const apiFindOneDestination = z.object({ export const apiFindOneDestination = z.object({
destinationId: z.string().min(1), destinationId: z.string().min(1),
}); });
export const apiRemoveDestination = z.object({ export const apiRemoveDestination = createSchema
destinationId: z.string().min(1), .pick({
}); destinationId: true,
})
.required();
export const apiUpdateDestination = z.object({ export const apiUpdateDestination = createSchema
destinationId: z.string().min(1), .pick({
name: z.string().min(1).optional(), name: true,
accessKey: z.string().optional(), accessKey: true,
bucket: z.string().optional(), bucket: true,
region: z.string().optional(), region: true,
endpoint: z.string().optional(), endpoint: true,
provider: z.string().optional(), secretAccessKey: true,
secretAccessKey: z.string().optional(), destinationId: true,
serverId: z.string().optional(), provider: true,
}); })
.required()
.extend({
serverId: z.string().optional(),
});
+13 -14
View File
@@ -62,13 +62,13 @@ const createSchema = createInsertSchema(patch, {
composeId: z.string().optional(), composeId: z.string().optional(),
}); });
export const apiCreatePatch = z.object({ export const apiCreatePatch = createSchema.pick({
filePath: z.string().min(1), filePath: true,
content: z.string(), content: true,
type: z.enum(["create", "update", "delete"]).optional(), type: true,
enabled: z.boolean().optional(), enabled: true,
applicationId: z.string().optional(), applicationId: true,
composeId: z.string().optional(), composeId: true,
}); });
export const apiFindPatch = z.object({ export const apiFindPatch = z.object({
@@ -83,13 +83,12 @@ export const apiFindPatchesByComposeId = z.object({
composeId: z.string().min(1), composeId: z.string().min(1),
}); });
export const apiUpdatePatch = z.object({ export const apiUpdatePatch = createSchema
patchId: z.string().min(1), .partial()
filePath: z.string().min(1).optional(), .extend({
content: z.string().optional(), patchId: z.string().min(1),
type: z.enum(["create", "update", "delete"]).optional(), })
enabled: z.boolean().optional(), .omit({ applicationId: true, composeId: true });
});
export const apiDeletePatch = z.object({ export const apiDeletePatch = z.object({
patchId: z.string().min(1), patchId: z.string().min(1),
+18 -14
View File
@@ -39,22 +39,26 @@ const createSchema = createInsertSchema(ports, {
protocol: z.enum(["tcp", "udp"]).default("tcp"), protocol: z.enum(["tcp", "udp"]).default("tcp"),
}); });
export const apiCreatePort = z.object({ export const apiCreatePort = createSchema
publishedPort: z.number(), .pick({
publishMode: z.enum(["ingress", "host"]).default("ingress"), publishedPort: true,
targetPort: z.number(), publishMode: true,
protocol: z.enum(["tcp", "udp"]).default("tcp"), targetPort: true,
applicationId: z.string().min(1), protocol: true,
}); applicationId: true,
})
.required();
export const apiFindOnePort = z.object({ export const apiFindOnePort = z.object({
portId: z.string().min(1), portId: z.string().min(1),
}); });
export const apiUpdatePort = z.object({ export const apiUpdatePort = createSchema
portId: z.string().min(1), .pick({
publishedPort: z.number(), portId: true,
publishMode: z.enum(["ingress", "host"]), publishedPort: true,
targetPort: z.number(), publishMode: true,
protocol: z.enum(["tcp", "udp"]), targetPort: true,
}); protocol: true,
})
.required();
+14 -10
View File
@@ -42,14 +42,18 @@ export const apiFindOneSecurity = z.object({
securityId: z.string().min(1), securityId: z.string().min(1),
}); });
export const apiCreateSecurity = z.object({ export const apiCreateSecurity = createSchema
applicationId: z.string().min(1), .pick({
username: z.string().min(1), applicationId: true,
password: z.string().min(1), username: true,
}); password: true,
})
.required();
export const apiUpdateSecurity = z.object({ export const apiUpdateSecurity = createSchema
securityId: z.string().min(1), .pick({
username: z.string().min(1), securityId: true,
password: z.string().min(1), username: true,
}); password: true,
})
.required();
+35 -16
View File
@@ -1,5 +1,6 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { pgTable, text } from "drizzle-orm/pg-core"; import { pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { sshKeyCreate, sshKeyType } from "../validations"; import { sshKeyCreate, sshKeyType } from "../validations";
@@ -36,13 +37,21 @@ export const sshKeysRelations = relations(sshKeys, ({ many, one }) => ({
}), }),
})); }));
export const apiCreateSshKey = z.object({ const createSchema = createInsertSchema(
name: z.string().min(1), sshKeys,
description: z.string().optional(), /* Private key is not stored in the DB */
organizationId: z.string().min(1), sshKeyCreate.omit({ privateKey: true }).shape,
publicKey: sshKeyCreate.shape.publicKey, );
privateKey: sshKeyCreate.shape.privateKey,
}); export const apiCreateSshKey = createSchema
.pick({
name: true,
description: true,
privateKey: true,
publicKey: true,
organizationId: true,
})
.merge(sshKeyCreate.pick({ privateKey: true }));
export const apiFindOneSshKey = z.object({ export const apiFindOneSshKey = z.object({
sshKeyId: z.string().min(1), sshKeyId: z.string().min(1),
@@ -50,13 +59,23 @@ export const apiFindOneSshKey = z.object({
export const apiGenerateSSHKey = sshKeyType; export const apiGenerateSSHKey = sshKeyType;
export const apiRemoveSshKey = z.object({ export const apiRemoveSshKey = createSchema
sshKeyId: z.string().min(1), .pick({
}); sshKeyId: true,
})
.required();
export const apiUpdateSshKey = z.object({ export const apiUpdateSshKey = createSchema
sshKeyId: z.string().min(1), .pick({
name: z.string().optional(), name: true,
description: z.string().optional(), description: true,
lastUsedAt: z.string().optional(), lastUsedAt: true,
}); })
.partial()
.merge(
createSchema
.pick({
sshKeyId: true,
})
.required(),
);
@@ -1,5 +1,6 @@
import { relations } from "drizzle-orm"; import { relations } from "drizzle-orm";
import { boolean, integer, pgTable, text } from "drizzle-orm/pg-core"; import { boolean, integer, pgTable, text } from "drizzle-orm/pg-core";
import { createInsertSchema } from "drizzle-zod";
import { nanoid } from "nanoid"; import { nanoid } from "nanoid";
import { z } from "zod"; import { z } from "zod";
import { applications } from "./application"; import { applications } from "./application";
@@ -104,45 +105,12 @@ export const volumeBackupsRelations = relations(
}), }),
); );
const serviceTypeEnum = z.enum([ export const createVolumeBackupSchema = createInsertSchema(volumeBackups).omit({
"application", volumeBackupId: true,
"postgres",
"mysql",
"mariadb",
"mongo",
"redis",
"compose",
]);
export const createVolumeBackupSchema = z.object({
name: z.string().min(1),
volumeName: z.string().min(1),
prefix: z.string().min(1),
serviceType: serviceTypeEnum.default("application"),
appName: z.string().min(1).optional(),
serviceName: z.string().optional(),
turnOff: z.boolean().default(false),
cronExpression: z.string().min(1),
keepLatestCount: z.number().optional(),
enabled: z.boolean().optional(),
applicationId: z.string().optional(),
postgresId: z.string().optional(),
mariadbId: z.string().optional(),
mongoId: z.string().optional(),
mysqlId: z.string().optional(),
redisId: z.string().optional(),
composeId: z.string().optional(),
destinationId: z.string().min(1),
}); });
export const updateVolumeBackupSchema = z.object({ export const updateVolumeBackupSchema = createVolumeBackupSchema.extend({
volumeBackupId: z.string().min(1), volumeBackupId: z.string().min(1),
name: z.string().min(1).optional(),
destinationId: z.string().optional(),
cronExpression: z.string().optional(),
keepLatestCount: z.number().optional(),
enabled: z.boolean().optional(),
turnOff: z.boolean().optional(),
}); });
export const apiFindOneVolumeBackup = z.object({ export const apiFindOneVolumeBackup = z.object({