Merge branch 'canary' into feat/internal-path-routing

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

@@ -27,7 +27,6 @@ import { server } from "./server";
 import { applicationStatus, certificateType, triggerType } from "./shared";
 import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
-
 export const sourceType = pgEnum("sourceType", [
 	"docker",
 	"git",
@@ -132,6 +131,7 @@ export const applications = pgTable("application", {
 	isPreviewDeploymentsActive: boolean("isPreviewDeploymentsActive").default(
 		false,
 	),
+	rollbackActive: boolean("rollbackActive").default(false),
 	buildArgs: text("buildArgs"),
 	memoryReservation: text("memoryReservation"),
 	memoryLimit: text("memoryLimit"),

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

@@ -15,6 +15,7 @@ import { compose } from "./compose";
 import { previewDeployments } from "./preview-deployments";
 import { schedules } from "./schedule";
 import { server } from "./server";
+import { rollbacks } from "./rollbacks";
 export const deploymentStatus = pgEnum("deploymentStatus", [
 	"running",
 	"done",
@@ -58,6 +59,10 @@ export const deployments = pgTable("deployment", {
 	backupId: text("backupId").references((): AnyPgColumn => backups.backupId, {
 		onDelete: "cascade",
 	}),
+	rollbackId: text("rollbackId").references(
+		(): AnyPgColumn => rollbacks.rollbackId,
+		{ onDelete: "cascade" },
+	),
 });
 
 export const deploymentsRelations = relations(deployments, ({ one }) => ({
@@ -85,6 +90,10 @@ export const deploymentsRelations = relations(deployments, ({ one }) => ({
 		fields: [deployments.backupId],
 		references: [backups.backupId],
 	}),
+	rollback: one(rollbacks, {
+		fields: [deployments.deploymentId],
+		references: [rollbacks.deploymentId],
+	}),
 }));
 
 const schema = createInsertSchema(deployments, {

packages/server/src/db/schema/git-provider.ts

@@ -8,6 +8,7 @@ import { bitbucket } from "./bitbucket";
 import { gitea } from "./gitea";
 import { github } from "./github";
 import { gitlab } from "./gitlab";
+import { users_temp } from "./user";
 
 export const gitProviderType = pgEnum("gitProviderType", [
 	"github",
@@ -29,6 +30,9 @@ export const gitProvider = pgTable("git_provider", {
 	organizationId: text("organizationId")
 		.notNull()
 		.references(() => organization.id, { onDelete: "cascade" }),
+	userId: text("userId")
+		.notNull()
+		.references(() => users_temp.id, { onDelete: "cascade" }),
 });
 
 export const gitProviderRelations = relations(gitProvider, ({ one }) => ({
@@ -52,6 +56,10 @@ export const gitProviderRelations = relations(gitProvider, ({ one }) => ({
 		fields: [gitProvider.organizationId],
 		references: [organization.id],
 	}),
+	user: one(users_temp, {
+		fields: [gitProvider.userId],
+		references: [users_temp.id],
+	}),
 }));
 
 const createSchema = createInsertSchema(gitProvider);

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

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

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

@@ -0,0 +1,45 @@
+import { relations } from "drizzle-orm";
+import { jsonb, pgTable, serial, text } from "drizzle-orm/pg-core";
+import { createInsertSchema } from "drizzle-zod";
+import { nanoid } from "nanoid";
+import { z } from "zod";
+import { deployments } from "./deployment";
+
+export const rollbacks = pgTable("rollback", {
+	rollbackId: text("rollbackId")
+		.notNull()
+		.primaryKey()
+		.$defaultFn(() => nanoid()),
+	deploymentId: text("deploymentId")
+		.notNull()
+		.references(() => deployments.deploymentId, {
+			onDelete: "cascade",
+		}),
+	version: serial(),
+	image: text("image"),
+	createdAt: text("createdAt")
+		.notNull()
+		.$defaultFn(() => new Date().toISOString()),
+	fullContext: jsonb("fullContext"),
+});
+
+export type Rollback = typeof rollbacks.$inferSelect;
+
+export const rollbacksRelations = relations(rollbacks, ({ one }) => ({
+	deployment: one(deployments, {
+		fields: [rollbacks.deploymentId],
+		references: [deployments.deploymentId],
+	}),
+}));
+
+export const createRollbackSchema = createInsertSchema(rollbacks).extend({
+	appName: z.string().min(1),
+});
+
+export const updateRollbackSchema = createRollbackSchema.extend({
+	rollbackId: z.string().min(1),
+});
+
+export const apiFindOneRollback = z.object({
+	rollbackId: z.string().min(1),
+});