From 0f3f72ad643d34dd76009e2619eee6248299bb30 Mon Sep 17 00:00:00 2001 From: Nour Balaha Date: Wed, 23 Oct 2024 16:19:10 +0900 Subject: [PATCH] fix(server): remove workspaces without settings (#1280) fix: remove workspace with no workspace settings --- server/internal/adapter/gql/resolver_workspace.go | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/server/internal/adapter/gql/resolver_workspace.go b/server/internal/adapter/gql/resolver_workspace.go index 9770358e6..c795a0683 100644 --- a/server/internal/adapter/gql/resolver_workspace.go +++ b/server/internal/adapter/gql/resolver_workspace.go @@ -6,11 +6,13 @@ package gql import ( "context" + "errors" "github.com/reearth/reearth-cms/server/internal/adapter/gql/gqlmodel" "github.com/reearth/reearth-cms/server/internal/usecase/interfaces" "github.com/reearth/reearthx/account/accountdomain" "github.com/reearth/reearthx/account/accountdomain/workspace" + "github.com/reearth/reearthx/rerror" ) // CreateWorkspace is the resolver for the createWorkspace field. @@ -37,9 +39,8 @@ func (r *mutationResolver) DeleteWorkspace(ctx context.Context, input gqlmodel.D return nil, err } - if err := usecases(ctx).WorkspaceSettings.Delete(ctx, interfaces.DeleteWorkspaceSettingsParam{ - ID: wid, - }, getOperator(ctx)); err != nil { + err = usecases(ctx).WorkspaceSettings.Delete(ctx, interfaces.DeleteWorkspaceSettingsParam{ID: wid}, getOperator(ctx)) + if err != nil && !errors.Is(err, rerror.ErrNotFound) { return nil, err }