From 0abf62dd5212b2bc996c9d8ddfd4d3a7d8ccced7 Mon Sep 17 00:00:00 2001 From: Mauricio Siu <47042324+Siumauricio@users.noreply.github.com> Date: Sat, 21 Dec 2024 13:10:34 -0600 Subject: [PATCH] refactor: prevent update appName in services --- packages/server/src/db/schema/utils.ts | 4 ++-- packages/server/src/services/application.ts | 4 ++-- packages/server/src/services/compose.ts | 4 ++-- packages/server/src/services/mariadb.ts | 4 ++-- packages/server/src/services/mongo.ts | 4 ++-- packages/server/src/services/mysql.ts | 4 ++-- packages/server/src/services/postgres.ts | 4 ++-- packages/server/src/services/redis.ts | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/packages/server/src/db/schema/utils.ts b/packages/server/src/db/schema/utils.ts index e8651769..43332c8a 100644 --- a/packages/server/src/db/schema/utils.ts +++ b/packages/server/src/db/schema/utils.ts @@ -17,9 +17,9 @@ export const generateAppName = (type: string) => { export const cleanAppName = (appName?: string) => { if (!appName) { - return appName; + return appName?.toLowerCase(); } - return appName.trim().replace(/ /g, "-"); + return appName.trim().replace(/ /g, "-").toLowerCase(); }; export const buildAppName = (type: string, baseAppName?: string) => { diff --git a/packages/server/src/services/application.ts b/packages/server/src/services/application.ts index d2ce3432..b8ecb88b 100644 --- a/packages/server/src/services/application.ts +++ b/packages/server/src/services/application.ts @@ -138,11 +138,11 @@ export const updateApplication = async ( applicationId: string, applicationData: Partial, ) => { + const { appName, ...rest } = applicationData; const application = await db .update(applications) .set({ - ...applicationData, - appName: cleanAppName(applicationData.appName), + ...rest, }) .where(eq(applications.applicationId, applicationId)) .returning(); diff --git a/packages/server/src/services/compose.ts b/packages/server/src/services/compose.ts index 27e7bfa4..5e5c6897 100644 --- a/packages/server/src/services/compose.ts +++ b/packages/server/src/services/compose.ts @@ -184,11 +184,11 @@ export const updateCompose = async ( composeId: string, composeData: Partial, ) => { + const { appName, ...rest } = composeData; const composeResult = await db .update(compose) .set({ - ...composeData, - appName: cleanAppName(composeData.appName), + ...rest, }) .where(eq(compose.composeId, composeId)) .returning(); diff --git a/packages/server/src/services/mariadb.ts b/packages/server/src/services/mariadb.ts index 7906cc5b..39ef5910 100644 --- a/packages/server/src/services/mariadb.ts +++ b/packages/server/src/services/mariadb.ts @@ -80,11 +80,11 @@ export const updateMariadbById = async ( mariadbId: string, mariadbData: Partial, ) => { + const { appName, ...rest } = mariadbData; const result = await db .update(mariadb) .set({ - ...mariadbData, - appName: cleanAppName(mariadbData.appName), + ...rest, }) .where(eq(mariadb.mariadbId, mariadbId)) .returning(); diff --git a/packages/server/src/services/mongo.ts b/packages/server/src/services/mongo.ts index 82a8a84f..f8d5e4d6 100644 --- a/packages/server/src/services/mongo.ts +++ b/packages/server/src/services/mongo.ts @@ -72,11 +72,11 @@ export const updateMongoById = async ( mongoId: string, mongoData: Partial, ) => { + const { appName, ...rest } = mongoData; const result = await db .update(mongo) .set({ - ...mongoData, - appName: cleanAppName(mongoData.appName), + ...rest, }) .where(eq(mongo.mongoId, mongoId)) .returning(); diff --git a/packages/server/src/services/mysql.ts b/packages/server/src/services/mysql.ts index 1bb2c478..e2c8bb6f 100644 --- a/packages/server/src/services/mysql.ts +++ b/packages/server/src/services/mysql.ts @@ -76,11 +76,11 @@ export const updateMySqlById = async ( mysqlId: string, mysqlData: Partial, ) => { + const { appName, ...rest } = mysqlData; const result = await db .update(mysql) .set({ - ...mysqlData, - appName: cleanAppName(mysqlData.appName), + ...rest, }) .where(eq(mysql.mysqlId, mysqlId)) .returning(); diff --git a/packages/server/src/services/postgres.ts b/packages/server/src/services/postgres.ts index d2cd4874..87286e67 100644 --- a/packages/server/src/services/postgres.ts +++ b/packages/server/src/services/postgres.ts @@ -94,11 +94,11 @@ export const updatePostgresById = async ( postgresId: string, postgresData: Partial, ) => { + const { appName, ...rest } = postgresData; const result = await db .update(postgres) .set({ - ...postgresData, - appName: cleanAppName(postgresData.appName), + ...rest, }) .where(eq(postgres.postgresId, postgresId)) .returning(); diff --git a/packages/server/src/services/redis.ts b/packages/server/src/services/redis.ts index 96b3066c..5b958081 100644 --- a/packages/server/src/services/redis.ts +++ b/packages/server/src/services/redis.ts @@ -68,11 +68,11 @@ export const updateRedisById = async ( redisId: string, redisData: Partial, ) => { + const { appName, ...rest } = redisData; const result = await db .update(redis) .set({ - ...redisData, - appName: cleanAppName(redisData.appName), + ...rest, }) .where(eq(redis.redisId, redisId)) .returning();