From 3ac4a828a841e090aa34691213d0829e524fae82 Mon Sep 17 00:00:00 2001
From: Roland Osborne <roland.osborne@gmail.com>
Date: Tue, 15 Nov 2022 15:27:46 -0800
Subject: [PATCH] fixed clearning card form channel when deleting card

---
 net/server/internal/api_removeCard.go | 12 ++++++------
 net/server/internal/store/schema.go   |  2 +-
 2 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/net/server/internal/api_removeCard.go b/net/server/internal/api_removeCard.go
index 29709845..0c6da0df 100644
--- a/net/server/internal/api_removeCard.go
+++ b/net/server/internal/api_removeCard.go
@@ -23,7 +23,7 @@ func RemoveCard(w http.ResponseWriter, r *http.Request) {
 
 	// load referenced card
 	var slot store.CardSlot
-  if err := store.DB.Preload("Card.Groups").Preload("Card.Channels.Members.Card").Preload("Card.Channels.ChannelSlot").Where("account_id = ? AND card_slot_id = ?", account.ID, cardID).First(&slot).Error; err != nil {
+  if err := store.DB.Preload("Card.Groups").Preload("Card.Members.Channel.Members.Card").Preload("Card.Members.Channel.ChannelSlot").Where("account_id = ? AND card_slot_id = ?", account.ID, cardID).First(&slot).Error; err != nil {
 		if !errors.Is(err, gorm.ErrRecordNotFound) {
 			ErrResponse(w, http.StatusInternalServerError, err)
 		} else {
@@ -41,17 +41,17 @@ func RemoveCard(w http.ResponseWriter, r *http.Request) {
 
 	// save and update contact revision
 	err = store.DB.Transaction(func(tx *gorm.DB) error {
-		for _, channel := range slot.Card.Channels {
-      if res := tx.Where("card_id = ?", slot.Card.ID).Delete(&store.Member{}).Error; res != nil {
+		for _, member := range slot.Card.Members {
+      if res := tx.Model(&store.Member{}).Where("card_id = ? AND channel_id = ?", slot.Card.ID, member.Channel.ID).Delete(&store.Member{}).Error; res != nil {
 				return res
 			}
-      if res := tx.Model(&channel).Update("detail_revision", account.ChannelRevision+1).Error; res != nil {
+      if res := tx.Model(&store.Channel{}).Where("id = ?", member.Channel.ID).Update("detail_revision", account.ChannelRevision+1).Error; res != nil {
         return res
       }
-			if res := tx.Model(&channel.ChannelSlot).Update("revision", account.ChannelRevision+1).Error; res != nil {
+			if res := tx.Model(&store.ChannelSlot{}).Where("id = ?", member.Channel.ChannelSlot.ID).Update("revision", account.ChannelRevision+1).Error; res != nil {
 				return res
 			}
-			for _, member := range channel.Members {
+			for _, member := range member.Channel.Members {
 				cards[member.Card.GUID] = &member.Card
 			}
 		}
diff --git a/net/server/internal/store/schema.go b/net/server/internal/store/schema.go
index af5276aa..4c7e857f 100644
--- a/net/server/internal/store/schema.go
+++ b/net/server/internal/store/schema.go
@@ -199,7 +199,7 @@ type Card struct {
   NotifiedProfile   int64
   Account           Account         `gorm:"references:GUID"`
   Groups            []Group         `gorm:"many2many:card_groups"`
-  Channels          []Channel       `gorm:"many2many:channel_cards"`
+  Members           []Member
   CardSlot          CardSlot
 }