coder
diff --git a/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 0 additions & 1 deletion b/‎coderd/database/dbauthz/dbauthz.go
Lines changed: 0 additions & 1 deletion
diff --git a/‎coderd/database/dbmem/dbmem.go
Lines changed: 3 additions & 3 deletions b/‎coderd/database/dbmem/dbmem.go
Lines changed: 3 additions & 3 deletions
diff --git a/‎coderd/database/dbmetrics/querymetrics.go
Lines changed: 0 additions & 1 deletion b/‎coderd/database/dbmetrics/querymetrics.go
Lines changed: 0 additions & 1 deletion
diff --git a/‎coderd/database/migrations/000295_organization_soft_delete.down.sql renamed to ‎coderd/database/migrations/000296_organization_soft_delete.down.sql b/‎coderd/database/migrations/000295_organization_soft_delete.down.sql renamed to ‎coderd/database/migrations/000296_organization_soft_delete.down.sql
diff --git a/‎coderd/database/migrations/000295_organization_soft_delete.up.sql renamed to ‎coderd/database/migrations/000296_organization_soft_delete.up.sql b/‎coderd/database/migrations/000295_organization_soft_delete.up.sql renamed to ‎coderd/database/migrations/000296_organization_soft_delete.up.sql
diff --git a/‎coderd/database/queries.sql.go
Lines changed: 4 additions & 5 deletions b/‎coderd/database/queries.sql.go
Lines changed: 4 additions & 5 deletions
diff --git a/‎coderd/database/queries/organizations.sql
Lines changed: 1 addition & 1 deletion b/‎coderd/database/queries/organizations.sql
Lines changed: 1 addition & 1 deletion
diff --git a/‎enterprise/audit/table.go
Lines changed: 1 addition & 1 deletion b/‎enterprise/audit/table.go
Lines changed: 1 addition & 1 deletion
diff --git a/‎enterprise/coderd/organizations.go
Lines changed: 0 additions & 1 deletion b/‎enterprise/coderd/organizations.go
Lines changed: 0 additions & 1 deletion
@@ -3737,7 +3737,6 @@ func (q *querier) UpdateOrganizationDeletedByID(ctx context.Context, arg databas
 	deleteF := func(ctx context.Context, id uuid.UUID) error {
 		return q.db.UpdateOrganizationDeletedByID(ctx, database.UpdateOrganizationDeletedByIDParams{
 			ID:        id,
-			Deleted:   true,
 			UpdatedAt: dbtime.Now(),
 		})
 	}
 
@@ -3680,7 +3680,7 @@ func (q *FakeQuerier) GetOrganizationByName(_ context.Context, params database.G
 	defer q.mutex.RUnlock()
 
 	for _, organization := range q.organizations {
-		if organization.Name == params.Name {
+		if organization.Name == params.Name && organization.Deleted == params.Deleted {
 			return organization, nil
 		}
 	}
@@ -3737,7 +3737,7 @@ func (q *FakeQuerier) GetOrganizationsByUserID(_ context.Context, arg database.G
 			continue
 		}
 		for _, organization := range q.organizations {
-			if organization.ID != organizationMember.OrganizationID {
+			if organization.ID != organizationMember.OrganizationID || organization.Deleted != arg.Deleted {
 				continue
 			}
 			organizations = append(organizations, organization)
@@ -9821,7 +9821,7 @@ func (q *FakeQuerier) UpdateOrganizationDeletedByID(_ context.Context, arg datab
 		if organization.ID != arg.ID || organization.IsDefault {
 			continue
 		}
-		organization.Deleted = arg.Deleted
+		organization.Deleted = true
 		organization.UpdatedAt = arg.UpdatedAt
 		q.organizations[index] = organization
 		return nil
 
@@ -89,7 +89,7 @@ RETURNING *;
 -- name: UpdateOrganizationDeletedByID :exec
 UPDATE organizations
 SET
-    deleted = @deleted,
+    deleted = true,
     updated_at = @updated_at
 WHERE
     id = @id AND
 
@@ -275,7 +275,7 @@ var auditableResourcesTypes = map[any]map[string]Action{
 		"id":           ActionIgnore,
 		"name":         ActionTrack,
 		"description":  ActionTrack,
-		"deleted":      ActionIgnore,
+		"deleted":      ActionTrack,
 		"created_at":   ActionIgnore,
 		"updated_at":   ActionTrack,
 		"is_default":   ActionTrack,
 
@@ -153,7 +153,6 @@ func (api *API) deleteOrganization(rw http.ResponseWriter, r *http.Request) {
 	err := api.Database.InTx(func(tx database.Store) error {
 		err := tx.UpdateOrganizationDeletedByID(ctx, database.UpdateOrganizationDeletedByIDParams{
 			ID:        organization.ID,
-			Deleted:   true,
 			UpdatedAt: dbtime.Now(),
 		})
 		if err != nil {
Original file line number	Diff line number	Diff line change
`@@ -3737,7 +3737,6 @@ func (q *querier) UpdateOrganizationDeletedByID(ctx context.Context, arg databas`
`3737`	`3737`	`deleteF := func(ctx context.Context, id uuid.UUID) error {`
`3738`	`3738`	`return q.db.UpdateOrganizationDeletedByID(ctx, database.UpdateOrganizationDeletedByIDParams{`
`3739`	`3739`	`ID: id,`
`3740`		`- Deleted: true,`
`3741`	`3740`	`UpdatedAt: dbtime.Now(),`
`3742`	`3741`	`})`
`3743`	`3742`	`}`
Original file line number	Diff line number	Diff line change
`@@ -3680,7 +3680,7 @@ func (q *FakeQuerier) GetOrganizationByName(_ context.Context, params database.G`
`3680`	`3680`	`defer q.mutex.RUnlock()`
`3681`	`3681`
`3682`	`3682`	`for _, organization := range q.organizations {`
`3683`		`- if organization.Name == params.Name {`
	`3683`	`+ if organization.Name == params.Name && organization.Deleted == params.Deleted {`
`3684`	`3684`	`return organization, nil`
`3685`	`3685`	`}`
`3686`	`3686`	`}`
`@@ -3737,7 +3737,7 @@ func (q *FakeQuerier) GetOrganizationsByUserID(_ context.Context, arg database.G`
`3737`	`3737`	`continue`
`3738`	`3738`	`}`
`3739`	`3739`	`for _, organization := range q.organizations {`
`3740`		`- if organization.ID != organizationMember.OrganizationID {`
	`3740`	`+ if organization.ID != organizationMember.OrganizationID \|\| organization.Deleted != arg.Deleted {`
`3741`	`3741`	`continue`
`3742`	`3742`	`}`
`3743`	`3743`	`organizations = append(organizations, organization)`
`@@ -9821,7 +9821,7 @@ func (q *FakeQuerier) UpdateOrganizationDeletedByID(_ context.Context, arg datab`
`9821`	`9821`	`if organization.ID != arg.ID \|\| organization.IsDefault {`
`9822`	`9822`	`continue`
`9823`	`9823`	`}`
`9824`		`- organization.Deleted = arg.Deleted`
	`9824`	`+ organization.Deleted = true`
`9825`	`9825`	`organization.UpdatedAt = arg.UpdatedAt`
`9826`	`9826`	`q.organizations[index] = organization`
`9827`	`9827`	`return nil`