Merge branch 'canary' into 187-backups-for-docker-compose

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

@@ -17,6 +17,7 @@ import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
 import { backups } from "./backups";
 
+import { schedules } from "./schedule";
 export const sourceTypeCompose = pgEnum("sourceTypeCompose", [
 	"git",
 	"github",
@@ -137,6 +138,7 @@ export const composeRelations = relations(compose, ({ one, many }) => ({
 		references: [server.serverId],
 	}),
 	backups: many(backups),
+	schedules: many(schedules),
 }));
 
 const createSchema = createInsertSchema(compose, {

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

@@ -13,7 +13,7 @@ import { applications } from "./application";
 import { compose } from "./compose";
 import { previewDeployments } from "./preview-deployments";
 import { server } from "./server";
-
+import { schedules } from "./schedule";
 export const deploymentStatus = pgEnum("deploymentStatus", [
 	"running",
 	"done",
@@ -47,7 +47,13 @@ export const deployments = pgTable("deployment", {
 	createdAt: text("createdAt")
 		.notNull()
 		.$defaultFn(() => new Date().toISOString()),
+	startedAt: text("startedAt"),
+	finishedAt: text("finishedAt"),
 	errorMessage: text("errorMessage"),
+	scheduleId: text("scheduleId").references(
+		(): AnyPgColumn => schedules.scheduleId,
+		{ onDelete: "cascade" },
+	),
 });
 
 export const deploymentsRelations = relations(deployments, ({ one }) => ({
@@ -67,6 +73,10 @@ export const deploymentsRelations = relations(deployments, ({ one }) => ({
 		fields: [deployments.previewDeploymentId],
 		references: [previewDeployments.previewDeploymentId],
 	}),
+	schedule: one(schedules, {
+		fields: [deployments.scheduleId],
+		references: [schedules.scheduleId],
+	}),
 }));
 
 const schema = createInsertSchema(deployments, {
@@ -128,6 +138,17 @@ export const apiCreateDeploymentServer = schema
 		serverId: z.string().min(1),
 	});
 
+export const apiCreateDeploymentSchedule = schema
+	.pick({
+		title: true,
+		status: true,
+		logPath: true,
+		description: true,
+	})
+	.extend({
+		scheduleId: z.string().min(1),
+	});
+
 export const apiFindAllByApplication = schema
 	.pick({
 		applicationId: true,

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

@@ -31,3 +31,4 @@ export * from "./utils";
 export * from "./preview-deployments";
 export * from "./ai";
 export * from "./account";
+export * from "./schedule";

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

@@ -0,0 +1,83 @@
+import { relations } from "drizzle-orm";
+import { boolean, pgEnum, pgTable, text } from "drizzle-orm/pg-core";
+import { createInsertSchema } from "drizzle-zod";
+import { nanoid } from "nanoid";
+import { z } from "zod";
+import { applications } from "./application";
+import { deployments } from "./deployment";
+import { generateAppName } from "./utils";
+import { compose } from "./compose";
+import { server } from "./server";
+import { users_temp } from "./user";
+export const shellTypes = pgEnum("shellType", ["bash", "sh"]);
+
+export const scheduleType = pgEnum("scheduleType", [
+	"application",
+	"compose",
+	"server",
+	"dokploy-server",
+]);
+
+export const schedules = pgTable("schedule", {
+	scheduleId: text("scheduleId")
+		.notNull()
+		.primaryKey()
+		.$defaultFn(() => nanoid()),
+	name: text("name").notNull(),
+	cronExpression: text("cronExpression").notNull(),
+	appName: text("appName")
+		.notNull()
+		.$defaultFn(() => generateAppName("schedule")),
+	serviceName: text("serviceName"),
+	shellType: shellTypes("shellType").notNull().default("bash"),
+	scheduleType: scheduleType("scheduleType").notNull().default("application"),
+	command: text("command").notNull(),
+	script: text("script"),
+	applicationId: text("applicationId").references(
+		() => applications.applicationId,
+		{
+			onDelete: "cascade",
+		},
+	),
+	composeId: text("composeId").references(() => compose.composeId, {
+		onDelete: "cascade",
+	}),
+	serverId: text("serverId").references(() => server.serverId, {
+		onDelete: "cascade",
+	}),
+	userId: text("userId").references(() => users_temp.id, {
+		onDelete: "cascade",
+	}),
+	enabled: boolean("enabled").notNull().default(true),
+	createdAt: text("createdAt")
+		.notNull()
+		.$defaultFn(() => new Date().toISOString()),
+});
+
+export type Schedule = typeof schedules.$inferSelect;
+
+export const schedulesRelations = relations(schedules, ({ one, many }) => ({
+	application: one(applications, {
+		fields: [schedules.applicationId],
+		references: [applications.applicationId],
+	}),
+	compose: one(compose, {
+		fields: [schedules.composeId],
+		references: [compose.composeId],
+	}),
+	server: one(server, {
+		fields: [schedules.serverId],
+		references: [server.serverId],
+	}),
+	user: one(users_temp, {
+		fields: [schedules.userId],
+		references: [users_temp.id],
+	}),
+	deployments: many(deployments),
+}));
+
+export const createScheduleSchema = createInsertSchema(schedules);
+
+export const updateScheduleSchema = createScheduleSchema.extend({
+	scheduleId: z.string().min(1),
+});

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

@@ -22,7 +22,7 @@ import { postgres } from "./postgres";
 import { redis } from "./redis";
 import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
-
+import { schedules } from "./schedule";
 export const serverStatus = pgEnum("serverStatus", ["active", "inactive"]);
 
 export const server = pgTable("server", {
@@ -114,6 +114,7 @@ export const serverRelations = relations(server, ({ one, many }) => ({
 		fields: [server.organizationId],
 		references: [organization.id],
 	}),
+	schedules: many(schedules),
 }));
 
 const createSchema = createInsertSchema(server, {

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

@@ -14,6 +14,7 @@ import { account, apikey, organization } from "./account";
 import { projects } from "./project";
 import { certificateType } from "./shared";
 import { backups } from "./backups";
+import { schedules } from "./schedule";
 /**
  * This is an example of how to use the multi-project schema feature of Drizzle ORM. Use the same
  * database instance for multiple projects.
@@ -127,6 +128,7 @@ export const usersRelations = relations(users_temp, ({ one, many }) => ({
 	projects: many(projects),
 	apiKeys: many(apikey),
 	backups: many(backups),
+	schedules: many(schedules),
 }));
 
 const createSchema = createInsertSchema(users_temp, {