diff --git a/net/server/internal/api_removeGroup.go b/net/server/internal/api_removeGroup.go index 22bd472f..38ae0c43 100644 --- a/net/server/internal/api_removeGroup.go +++ b/net/server/internal/api_removeGroup.go @@ -29,6 +29,9 @@ func RemoveGroup(w http.ResponseWriter, r *http.Request) { } err = store.DB.Transaction(func(tx *gorm.DB) error { + if res := tx.Model(slot.Group).Association("Cards").Clear(); res != nil { + return res + } if res := tx.Delete(&slot.Group.GroupData).Error; res != nil { return res } diff --git a/net/server/internal/ucUpdateContact_test.go b/net/server/internal/ucUpdateContact_test.go index 1b61d309..16907643 100644 --- a/net/server/internal/ucUpdateContact_test.go +++ b/net/server/internal/ucUpdateContact_test.go @@ -15,15 +15,15 @@ func TestUpdateContact(t *testing.T) { var cards []Card var detail int64 var profile int64 - var cardProfile *CardProfile var cardDetail *CardDetail + var cardProfile *CardProfile // setup testing group - set, err = AddTestGroup("addaccount") + set, err = AddTestGroup("updatecontact") assert.NoError(t, err) // setup testing group - _, err = AddTestGroup("addaccount") + _, err = AddTestGroup("updatecontact") assert.Error(t, err) rev = GetTestRevision(set.B.Revisions)