TerribleDev/ente
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[server] Relax criteria for closing families (#5525)

Browse Source 
## Description

Users can create a family, leave it and then join another.

In the `families` table, there will be one entry for each such family
they have been a part of (against their `admin_id`).

This PR removes this constraint for only a single row to be affected, so
users who have historically been associated with more than one family
can have a fresh start.
This commit is contained in:
Vishnu Mohandas
2025-04-03 19:07:19 +05:30
committed by GitHub
parent 0738caaa2b d86f4de8ce
commit 4229238768
1 changed files with 2 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
server/pkg/repo/family.go
View File

@@ -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, "")