Skip to content

fix(queries): discard deleted records in project queries #2163

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
Jul 1, 2025
+14 −2
Merged

fix(queries): discard deleted records in project queries #2163

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 14 additions & 2 deletions app/controlplane/pkg/data/project.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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))
Expand All @@ -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()))
Expand Down
Loading