feat: link field with application

server/api/routers/application.ts

@@ -235,6 +235,7 @@ export const applicationRouter = createTRPCRouter({
 				customGitBranch: input.customGitBranch,
 				customGitBuildPath: input.customGitBuildPath,
 				customGitUrl: input.customGitUrl,
+				customGitSSHKeyId: input.customGitSSHKeyId,
 				sourceType: "git",
 				applicationStatus: "idle",
 			});
@@ -249,9 +250,9 @@ export const applicationRouter = createTRPCRouter({
 				await generateSSHKey(application.appName);
 				const file = await readRSAFile(application.appName);
 
-				await updateApplication(input.applicationId, {
-					customGitSSHKey: file,
-				});
+				// await updateApplication(input.applicationId, {
+				// 	customGitSSHKey: file,
+				// });
 			} catch (error) {}
 
 			return true;
@@ -261,9 +262,9 @@ export const applicationRouter = createTRPCRouter({
 		.mutation(async ({ input }) => {
 			const application = await findApplicationById(input.applicationId);
 			await removeRSAFiles(application.appName);
-			await updateApplication(input.applicationId, {
-				customGitSSHKey: null,
-			});
+			// await updateApplication(input.applicationId, {
+			// 	customGitSSHKey: null,
+			// });
 
 			return true;
 		}),

server/db/schema/application.ts

@@ -20,6 +20,7 @@ import { redirects } from "./redirects";
 import { registry } from "./registry";
 import { security } from "./security";
 import { applicationStatus } from "./shared";
+import { sshKeys } from "./ssh-key";
 import { generateAppName } from "./utils";
 
 export const sourceType = pgEnum("sourceType", [
@@ -132,7 +133,12 @@ export const applications = pgTable("application", {
 	customGitUrl: text("customGitUrl"),
 	customGitBranch: text("customGitBranch"),
 	customGitBuildPath: text("customGitBuildPath"),
-	customGitSSHKey: text("customGitSSHKey"),
+	customGitSSHKeyId: text("customGitSSHKeyId").references(
+		() => sshKeys.sshKeyId,
+		{
+			onDelete: "set null",
+		},
+	),
 	dockerfile: text("dockerfile"),
 	// Drop
 	dropBuildPath: text("dropBuildPath"),
@@ -170,6 +176,10 @@ export const applicationsRelations = relations(
 			references: [projects.projectId],
 		}),
 		deployments: many(deployments),
+		customGitSSHKey: one(sshKeys, {
+			fields: [applications.customGitSSHKeyId],
+			references: [sshKeys.sshKeyId],
+		}),
 		domains: many(domains),
 		mounts: many(mounts),
 		redirects: many(redirects),
@@ -289,7 +299,7 @@ const createSchema = createInsertSchema(applications, {
 	dockerImage: z.string().optional(),
 	username: z.string().optional(),
 	password: z.string().optional(),
-	customGitSSHKey: z.string().optional(),
+	customGitSSHKeyId: z.string().optional(),
 	repository: z.string().optional(),
 	dockerfile: z.string().optional(),
 	branch: z.string().optional(),
@@ -371,7 +381,12 @@ export const apiSaveGitProvider = createSchema
 		customGitBuildPath: true,
 		customGitUrl: true,
 	})
-	.required();
+	.required()
+	.merge(
+		createSchema.pick({
+			customGitSSHKeyId: true,
+		}),
+	);
 
 export const apiSaveEnvironmentVariables = createSchema
 	.pick({

server/db/schema/ssh-key.ts

@@ -1,4 +1,6 @@
+import { applications } from "@/server/db/schema/application";
 import { sshKeyCreate } from "@/server/db/validations";
+import { relations } from "drizzle-orm";
 import { pgTable, text, time } from "drizzle-orm/pg-core";
 import { createInsertSchema } from "drizzle-zod";
 import { nanoid } from "nanoid";
@@ -17,6 +19,10 @@ export const sshKeys = pgTable("ssh-key", {
 	lastUsedAt: text("lastUsedAt"),
 });
 
+export const sshKeysRelations = relations(sshKeys, ({ many }) => ({
+	applications: many(applications),
+}));
+
 const createSchema = createInsertSchema(
 	sshKeys,
 	/* Private key is not stored in the DB */