martin/databag
1
0
Fork 0
mirror of https://github.com/balzack/databag.git synced 2025-02-12 03:29:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

added missing groups in getCard

Browse Source
This commit is contained in:
Roland Osborne 2022-01-25 10:48:02 -08:00
parent c66d5bedbc
commit 1d86e2c0cf
2 changed files with 21 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
net/server/internal/api_getCard.go
View File

@ -18,7 +18,7 @@ func GetCard(w http.ResponseWriter, r *http.Request) {
cardId := mux.Vars(r)["cardId"] cardId := mux.Vars(r)["cardId"]
var card store.Card 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) { if errors.Is(err, gorm.ErrRecordNotFound) {
ErrResponse(w, http.StatusNotFound, err) ErrResponse(w, http.StatusNotFound, err)
} else { } else {

20
net/server/internal/ucGroupContact_test.go
View File

@ -86,6 +86,16 @@ func TestGroupContact(t *testing.T) {
assert.NoError(t, ReadResponse(w, &cardData)) assert.NoError(t, ReadResponse(w, &cardData))
assert.Equal(t, 1, len(cardData.Groups)) 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 // receive revision
wsA.SetReadDeadline(time.Now().Add(2 * time.Second)) wsA.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = wsA.ReadMessage() _, data, _ = wsA.ReadMessage()
@ -145,6 +155,16 @@ func TestGroupContact(t *testing.T) {
RemoveGroup(w, r) RemoveGroup(w, r)
assert.NoError(t, ReadResponse(w, &group)) 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 // receive revision
wsA.SetReadDeadline(time.Now().Add(2 * time.Second)) wsA.SetReadDeadline(time.Now().Add(2 * time.Second))
_, data, _ = wsA.ReadMessage() _, data, _ = wsA.ReadMessage()