From a3cd1585a003dd0d4ceb11c6a2b49e49b2323ab6 Mon Sep 17 00:00:00 2001 From: "Jose I. Paris" Date: Tue, 1 Jul 2025 17:22:36 +0200 Subject: [PATCH] discard deleted records in project queries Signed-off-by: Jose I. Paris --- app/controlplane/pkg/data/project.go | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/app/controlplane/pkg/data/project.go b/app/controlplane/pkg/data/project.go index 96946ff4e..e430c1c34 100644 --- a/app/controlplane/pkg/data/project.go +++ b/app/controlplane/pkg/data/project.go @@ -45,7 +45,13 @@ func NewProjectsRepo(data *Data, logger log.Logger) biz.ProjectsRepo { // FindProjectByOrgIDAndName gets a project by organization ID and project name func (r *ProjectRepo) FindProjectByOrgIDAndName(ctx context.Context, orgID uuid.UUID, projectName string) (*biz.Project, error) { - pro, err := r.data.DB.Organization.Query().Where(organization.ID(orgID)).QueryProjects().Where(project.Name(projectName)).Only(ctx) + pro, err := r.data.DB.Organization.Query().Where( + organization.ID(orgID), + ).QueryProjects().Where( + project.Name(projectName), + project.DeletedAtIsNil(), + ).Only(ctx) + if err != nil { if ent.IsNotFound(err) { return nil, biz.NewErrNotFound(fmt.Sprintf("project %s", projectName)) @@ -58,7 +64,13 @@ func (r *ProjectRepo) FindProjectByOrgIDAndName(ctx context.Context, orgID uuid. // FindProjectByOrgIDAndID gets a project by organization ID and project ID func (r *ProjectRepo) FindProjectByOrgIDAndID(ctx context.Context, orgID uuid.UUID, projectID uuid.UUID) (*biz.Project, error) { - pro, err := r.data.DB.Organization.Query().Where(organization.ID(orgID)).QueryProjects().Where(project.ID(projectID)).Only(ctx) + pro, err := r.data.DB.Organization.Query().Where( + organization.ID(orgID), + ).QueryProjects().Where( + project.ID(projectID), + project.DeletedAtIsNil(), + ).Only(ctx) + if err != nil { if ent.IsNotFound(err) { return nil, biz.NewErrNotFound(fmt.Sprintf("project %s", projectID.String()))