From d86f4de8ce721bed9eda80b60644429fcda61a95 Mon Sep 17 00:00:00 2001 From: vishnukvmd Date: Thu, 3 Apr 2025 18:57:39 +0530 Subject: [PATCH] Relax criteria for closing families --- server/pkg/repo/family.go | 13 ++----------- 1 file changed, 2 insertions(+), 11 deletions(-) diff --git a/server/pkg/repo/family.go b/server/pkg/repo/family.go index fad14d89aa..667b58f7ac 100644 --- a/server/pkg/repo/family.go +++ b/server/pkg/repo/family.go @@ -57,27 +57,18 @@ func (repo *FamilyRepository) CloseFamily(ctx context.Context, adminID int64) er if err != nil { return stacktrace.Propagate(err, "") } - affectResult, err := tx.ExecContext(ctx, `DELETE FROM families WHERE admin_id = $1`, adminID) + _, err = tx.ExecContext(ctx, `DELETE FROM families WHERE admin_id = $1`, adminID) if err != nil { tx.Rollback() return stacktrace.Propagate(err, "") } - affected, err := affectResult.RowsAffected() - if err != nil { - tx.Rollback() - return stacktrace.Propagate(err, "") - } - if affected != 1 { - tx.Rollback() - return stacktrace.Propagate(errors.New("exactly one row should be deleted"), "") - } affectedRows, err := tx.ExecContext(ctx, `UPDATE users SET family_admin_id = null WHERE family_admin_id = $1`, adminID) if err != nil { tx.Rollback() return stacktrace.Propagate(err, "") } - affected, err = affectedRows.RowsAffected() + affected, err := affectedRows.RowsAffected() if err != nil { tx.Rollback() return stacktrace.Propagate(err, "")