From 1d86e2c0cf9c6c811a069a71706db342e2f5bcb5 Mon Sep 17 00:00:00 2001 From: Roland Osborne Date: Tue, 25 Jan 2022 10:48:02 -0800 Subject: [PATCH] added missing groups in getCard --- net/server/internal/api_getCard.go | 2 +- net/server/internal/ucGroupContact_test.go | 20 ++++++++++++++++++++ 2 files changed, 21 insertions(+), 1 deletion(-) diff --git a/net/server/internal/api_getCard.go b/net/server/internal/api_getCard.go index 7b1c5a6f..c2f2dc87 100644 --- a/net/server/internal/api_getCard.go +++ b/net/server/internal/api_getCard.go @@ -18,7 +18,7 @@ func GetCard(w http.ResponseWriter, r *http.Request) { cardId := mux.Vars(r)["cardId"] var card store.Card - if err := store.DB.Where("account_id = ? AND card_id = ?", account.Guid, cardId).First(&card).Error; err != nil { + if err := store.DB.Preload("Groups").Where("account_id = ? AND card_id = ?", account.Guid, cardId).First(&card).Error; err != nil { if errors.Is(err, gorm.ErrRecordNotFound) { ErrResponse(w, http.StatusNotFound, err) } else { diff --git a/net/server/internal/ucGroupContact_test.go b/net/server/internal/ucGroupContact_test.go index 20f002de..3587523c 100644 --- a/net/server/internal/ucGroupContact_test.go +++ b/net/server/internal/ucGroupContact_test.go @@ -86,6 +86,16 @@ func TestGroupContact(t *testing.T) { assert.NoError(t, ReadResponse(w, &cardData)) assert.Equal(t, 1, len(cardData.Groups)) + // get contact revision + r, w, _ = NewRequest("GET", "/contact/cards/{cardId}", nil) + vars = map[string]string{ "cardId": contact[0].ContactCardId } + r = mux.SetURLVars(r, vars) + SetBearerAuth(r, access[0]) + GetCard(w, r) + card = Card{} + assert.NoError(t, ReadResponse(w, &card)) + assert.Equal(t, len(card.CardData.Groups), 1) + // receive revision wsA.SetReadDeadline(time.Now().Add(2 * time.Second)) _, data, _ = wsA.ReadMessage() @@ -145,6 +155,16 @@ func TestGroupContact(t *testing.T) { RemoveGroup(w, r) assert.NoError(t, ReadResponse(w, &group)) + // get contact revision + r, w, _ = NewRequest("GET", "/contact/cards/{cardId}", nil) + vars = map[string]string{ "cardId": contact[0].ContactCardId } + r = mux.SetURLVars(r, vars) + SetBearerAuth(r, access[0]) + GetCard(w, r) + card = Card{} + assert.NoError(t, ReadResponse(w, &card)) + assert.Equal(t, len(card.CardData.Groups), 0) + // receive revision wsA.SetReadDeadline(time.Now().Add(2 * time.Second)) _, data, _ = wsA.ReadMessage()