From 30e7fe8a4561d50a8a421d92e8041258e416b62d Mon Sep 17 00:00:00 2001 From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com> Date: Tue, 12 Mar 2024 17:21:27 +0100 Subject: [PATCH] Fix: Rebase errors --- .../src/services/project/project-service.ts | 21 ------------------- backend/src/services/project/project-types.ts | 14 ------------- 2 files changed, 35 deletions(-) diff --git a/backend/src/services/project/project-service.ts b/backend/src/services/project/project-service.ts index f9223ca02..c19856eb9 100644 --- a/backend/src/services/project/project-service.ts +++ b/backend/src/services/project/project-service.ts @@ -358,27 +358,6 @@ export const projectServiceFactory = ({ return deletedProject; }; - const deleteProjectBySlug = async ({ actor, actorId, actorOrgId, slug }: TDeleteProjectBySlugDTO) => { - const project = await projectDAL.findOne({ slug }); - - const { permission } = await permissionService.getProjectPermission(actor, actorId, project.id, actorOrgId); - ForbiddenError.from(permission).throwUnlessCan(ProjectPermissionActions.Delete, ProjectPermissionSub.Project); - - const deletedProject = await projectDAL.transaction(async (tx) => { - const delProject = await projectDAL.deleteById(project.id, tx); - const projectGhostUser = await projectMembershipDAL.findProjectGhostUser(project.id).catch(() => null); - - // Delete the org membership for the ghost user if it's found. - if (projectGhostUser) { - await userDAL.deleteById(projectGhostUser.id, tx); - } - - return delProject; - }); - - return deletedProject; - }; - const getProjects = async (actorId: string) => { const workspaces = await projectDAL.findAllProjects(actorId); return workspaces; diff --git a/backend/src/services/project/project-types.ts b/backend/src/services/project/project-types.ts index 364d25a80..56237b428 100644 --- a/backend/src/services/project/project-types.ts +++ b/backend/src/services/project/project-types.ts @@ -36,13 +36,6 @@ export type TDeleteProjectBySlugDTO = { actorOrgId?: string; }; -export type TDeleteProjectBySlugDTO = { - slug: string; - actor: ActorType; - actorId: string; - actorOrgId?: string; -}; - export type TGetProjectDTO = { filter: Filter; } & Omit; @@ -54,13 +47,6 @@ export type TUpdateProjectNameDTO = { name: string; } & TProjectPermission; -export type TToggleProjectAutoCapitalizationDTO = { - autoCapitalization: boolean; -} & TProjectPermission; -export type TUpdateProjectNameDTO = { - name: string; -} & TProjectPermission; - export type TUpdateProjectDTO = { filter: Filter; update: {