diff --git a/backend/src/services/org/org-dal.ts b/backend/src/services/org/org-dal.ts index 3fbf54b4c..05c77e746 100644 --- a/backend/src/services/org/org-dal.ts +++ b/backend/src/services/org/org-dal.ts @@ -230,15 +230,6 @@ export const orgDALFactory = (db: TDbClient) => { } }; - const deleteMembershipByUserId = async (userId: string, orgId: string, tx?: Knex) => { - try { - const [membership] = await (tx || db)(TableName.OrgMembership).where({ userId, orgId }).delete().returning("*"); - return membership; - } catch (error) { - throw new DatabaseError({ error, name: "Delete org membership" }); - } - }; - const findMembership = async ( filter: TFindFilter, { offset, limit, sort, tx }: TFindOpt = {} @@ -284,7 +275,6 @@ export const orgDALFactory = (db: TDbClient) => { createMembership, updateMembershipById, deleteMembershipById, - deleteMembershipByUserId, updateMembership }); }; diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts index d5fa45bfa..c7c3af6fa 100644 --- a/backend/src/services/project/project-service.ts +++ b/backend/src/services/project/project-service.ts @@ -17,7 +17,6 @@ import { TProjectPermission } from "@app/lib/types"; import { ActorType } from "../auth/auth-type"; import { TIdentityOrgDALFactory } from "../identity/identity-org-dal"; import { TIdentityProjectDALFactory } from "../identity-project/identity-project-dal"; -import { TOrgDALFactory } from "../org/org-dal"; import { TOrgServiceFactory } from "../org/org-service"; import { TProjectBotDALFactory } from "../project-bot/project-bot-dal"; import { TProjectEnvDALFactory } from "../project-env/project-env-dal"; @@ -54,7 +53,6 @@ type TProjectServiceFactoryDep = { projectKeyDAL: Pick; projectBotDAL: Pick; projectMembershipDAL: Pick; - orgDAL: Pick; secretBlindIndexDAL: Pick; permissionService: TPermissionServiceFactory; orgService: Pick; @@ -70,7 +68,6 @@ export const projectServiceFactory = ({ permissionService, userDAL, folderDAL, - orgDAL, orgService, identityProjectDAL, projectBotDAL, @@ -300,7 +297,7 @@ export const projectServiceFactory = ({ // Delete the org membership for the ghost user if it's found. if (projectGhostUser) { - await orgDAL.deleteMembershipByUserId(projectGhostUser.id, deletedProject.orgId, tx); + await userDAL.deleteById(projectGhostUser.id, tx); } return project;