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

test contact view of articles

Browse Source
This commit is contained in:
Roland Osborne 2022-02-14 12:55:02 -08:00
parent d26522fc86
commit 4bb89658d8
8 changed files with 159 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,7 +50,7 @@ func AddArticle(w http.ResponseWriter, r *http.Request) {
}
SetStatus(account)
WriteResponse(w, getArticleModel(slot, true))
WriteResponse(w, getArticleModel(slot, true, true))
}

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

@ -75,6 +75,6 @@ func ClearArticleGroup(w http.ResponseWriter, r *http.Request) {
SetContactArticleNotification(account, &card)
}
WriteResponse(w, getArticleModel(&articleSlot, true));
WriteResponse(w, getArticleModel(&articleSlot, true, true));
}

26
net/server/internal/api_getArticles.go
View File

@ -73,7 +73,7 @@ func GetArticles(w http.ResponseWriter, r *http.Request) {
for _, slot := range slots {
if !typesSet || hasType(types, slot.Article) {
response = append(response, getArticleModel(&slot, true))
response = append(response, getArticleModel(&slot, true, true))
}
}
@ -97,20 +97,21 @@ func GetArticles(w http.ResponseWriter, r *http.Request) {
account := &card.Account
var slots []store.ArticleSlot
if articleRevisionSet {
if err := store.DB.Preload("Article.ArticleData").Where("account_id = ? AND revision > ?", account.ID, articleRevision).Find(&slots).Error; err != nil {
if err := store.DB.Preload("Article.Groups.Cards").Where("account_id = ? AND revision > ?", account.ID, articleRevision).Find(&slots).Error; err != nil {
ErrResponse(w, http.StatusInternalServerError, err)
return
}
} else {
if err := store.DB.Preload("Article.ArticleData").Where("account_id = ? AND article_id != 0", account.ID).Find(&slots).Error; err != nil {
if err := store.DB.Preload("Article.Groups.Cards").Where("account_id = ? AND article_id != 0", account.ID).Find(&slots).Error; err != nil {
ErrResponse(w, http.StatusInternalServerError, err)
return
}
}
for _, slot := range slots {
shared := isShared(card.Guid, slot.Article)
if !typesSet || hasType(types, slot.Article) {
response = append(response, getArticleModel(&slot, false))
response = append(response, getArticleModel(&slot, shared, false))
}
}
@ -125,7 +126,24 @@ func GetArticles(w http.ResponseWriter, r *http.Request) {
WriteResponse(w, response)
}
func isShared(guid string, article *store.Article) bool {
if article == nil {
return false
}
for _, group := range article.Groups {
for _, card := range group.Cards {
if guid == card.Guid {
return true
}
}
}
return false
}
func hasType(types []string, article *store.Article) bool {
if article == nil {
return false
}
for _, schema := range types {
if schema == article.DataType {
return true

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

@ -74,6 +74,6 @@ func RemoveArticle(w http.ResponseWriter, r *http.Request) {
SetContactArticleNotification(account, card)
}
WriteResponse(w, getArticleModel(&slot, true));
WriteResponse(w, getArticleModel(&slot, true, true));
}

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

@ -75,6 +75,6 @@ func SetArticleGroup(w http.ResponseWriter, r *http.Request) {
SetContactArticleNotification(account, &card)
}
WriteResponse(w, getArticleModel(&articleSlot, true));
WriteResponse(w, getArticleModel(&articleSlot, true, true));
}

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

@ -76,6 +76,6 @@ func SetArticleSubject(w http.ResponseWriter, r *http.Request) {
SetContactArticleNotification(account, card)
}
WriteResponse(w, getArticleModel(&slot, true));
WriteResponse(w, getArticleModel(&slot, true, true));
}

4
net/server/internal/modelUtil.go
View File

@ -115,8 +115,8 @@ func getGroupModel(slot *store.GroupSlot) *Group {
}
}
func getArticleModel(slot *store.ArticleSlot, showGroups bool) *Article {
if slot.Article == nil {
func getArticleModel(slot *store.ArticleSlot, showData bool, showGroups bool) *Article {
if !showData || slot.Article == nil {
return &Article{
Id: slot.ArticleSlotId,
Revision: slot.Revision,

135
net/server/internal/ucShareAttribute_test.go
View File

@ -2,6 +2,7 @@ package databag
import (
"testing"
"strconv"
"github.com/stretchr/testify/assert"
)
@ -10,11 +11,39 @@ func TestShareAttribute(t *testing.T) {
var subject *Subject
var article *Article
param := map[string]string{}
var bRev *Revision
var cRev *Revision
var rev *Revision
var cards *[]Card
var card *Card
var revision string
var rView string
var rArticle string
var bViewRevision int64
var cViewRevision int64
var bArticleRevision int64
var cArticleRevision int64
// setup testing group
set, err := AddTestGroup("shareattribute")
assert.NoError(t, err)
// get latest
card = &Card{}
param["cardId"] = set.B.A.CardId
bRev = GetTestRevision(set.B.Revisions)
assert.NoError(t, ApiTestMsg(GetCard, "GET", "/contact/cards/{cardId}",
&param, nil, APP_TOKENAPP, set.B.Token, card, nil))
bViewRevision = card.Data.NotifiedView
bArticleRevision = card.Data.NotifiedArticle
card = &Card{}
param["cardId"] = set.C.A.CardId
cRev = GetTestRevision(set.C.Revisions)
assert.NoError(t, ApiTestMsg(GetCard, "GET", "/contact/cards/{cardId}",
&param, nil, APP_TOKENAPP, set.C.Token, card, nil))
bViewRevision = card.Data.NotifiedView
bArticleRevision = card.Data.NotifiedArticle
// add a new attribute
articles = &[]Article{}
assert.NoError(t, ApiTestMsg(GetArticles, "GET", "/attribute/articles",
@ -31,6 +60,10 @@ func TestShareAttribute(t *testing.T) {
nil, nil, APP_TOKENAPP, set.A.Token, articles, nil))
assert.Equal(t, 1, len(*articles))
// should not have generated a revision
assert.Nil(t, GetTestRevision(set.B.Revisions))
assert.Nil(t, GetTestRevision(set.C.Revisions))
// share article with B
param["articleId"] = article.Id
param["groupId"] = set.A.B.GroupId
@ -38,7 +71,29 @@ func TestShareAttribute(t *testing.T) {
assert.NoError(t, ApiTestMsg(SetArticleGroup, "PUT", "/attribute/articles/{articleId}/groups/{groupId}",
&param, nil, APP_TOKENAPP, set.A.Token, article, nil))
// TODO validate B & C view
// validate B & C view
cards = &[]Card{}
rev = GetTestRevision(set.B.Revisions)
assert.NotEqual(t, bRev.Card, rev.Card)
assert.Nil(t, GetTestRevision(set.C.Revisions))
revision = strconv.FormatInt(bRev.Card, 10)
assert.NoError(t, ApiTestMsg(GetCards, "GET", "/contact/cards?revision=" + revision,
nil, nil, APP_TOKENAPP, set.B.Token, cards, nil))
assert.Equal(t, 1, len(*cards))
assert.NotEqual(t, bArticleRevision, (*cards)[0].Data.NotifiedArticle)
assert.Equal(t, bViewRevision, (*cards)[0].Data.NotifiedView)
bRev = rev
bArticleRevision = (*cards)[0].Data.NotifiedArticle
articles = &[]Article{}
assert.NoError(t, ApiTestMsg(GetArticles, "GET", "/attribute/articles",
nil, nil, APP_TOKENCONTACT, set.B.A.Token, articles, nil))
assert.Equal(t, 1, len(*articles))
assert.NotNil(t, (*articles)[0].Data)
articles = &[]Article{}
assert.NoError(t, ApiTestMsg(GetArticles, "GET", "/attribute/articles",
nil, nil, APP_TOKENCONTACT, set.C.A.Token, articles, nil))
assert.Equal(t, 1, len(*articles))
assert.Nil(t, (*articles)[0].Data)
// update attribute
data := "{ \"nested\" : { \"image\" : \"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\" } }"
@ -48,7 +103,27 @@ func TestShareAttribute(t *testing.T) {
assert.NoError(t, ApiTestMsg(SetArticleSubject, "PUT", "/attribute/articles/{articleId}/subject",
&param, subject, APP_TOKENAPP, set.A.Token, article, nil))
// TODO validate B & C view
// validate B & C view
cards = &[]Card{}
rev = GetTestRevision(set.B.Revisions)
assert.NotEqual(t, bRev.Card, rev.Card)
assert.Nil(t, GetTestRevision(set.C.Revisions))
revision = strconv.FormatInt(bRev.Card, 10)
assert.NoError(t, ApiTestMsg(GetCards, "GET", "/contact/cards?revision=" + revision,
nil, nil, APP_TOKENAPP, set.B.Token, cards, nil))
assert.Equal(t, 1, len(*cards))
assert.NotEqual(t, bArticleRevision, (*cards)[0].Data.NotifiedArticle)
assert.Equal(t, bViewRevision, (*cards)[0].Data.NotifiedView)
bRev = rev
rView = strconv.FormatInt(bViewRevision, 10)
rArticle = strconv.FormatInt(bArticleRevision, 10)
articles = &[]Article{}
assert.NoError(t, ApiTestMsg(GetArticles, "GET", "/attribute/articles?viewRevision=" + rView + "&articleRevision=" + rArticle,
nil, nil, APP_TOKENCONTACT, set.B.A.Token, articles, nil))
assert.Equal(t, 1, len(*articles))
assert.Equal(t, "nestedimage", (*articles)[0].Data.DataType)
bArticleRevision = (*cards)[0].Data.NotifiedArticle
bViewRevision = (*cards)[0].Data.NotifiedView
// share article with C
param["articleId"] = article.Id
@ -57,9 +132,19 @@ func TestShareAttribute(t *testing.T) {
assert.NoError(t, ApiTestMsg(SetArticleGroup, "PUT", "/attribute/articles/{articleId}/groups/{groupId}",
&param, nil, APP_TOKENAPP, set.A.Token, article, nil))
// TODO A retrieve image
// TODO C retrieve image
// TODO validate B & C view
// validate B & C view
cards = &[]Card{}
rev = GetTestRevision(set.C.Revisions)
assert.NotEqual(t, cRev.Card, rev.Card)
assert.Nil(t, GetTestRevision(set.B.Revisions))
revision = strconv.FormatInt(cRev.Card, 10)
assert.NoError(t, ApiTestMsg(GetCards, "GET", "/contact/cards?revision=" + revision,
nil, nil, APP_TOKENAPP, set.C.Token, cards, nil))
assert.Equal(t, 1, len(*cards))
cRev = rev
// unshare article with B
param["articleId"] = article.Id
@ -68,7 +153,32 @@ func TestShareAttribute(t *testing.T) {
assert.NoError(t, ApiTestMsg(ClearArticleGroup, "DELETE", "/attribute/articles/{articleId}/groups/{groupId}",
&param, nil, APP_TOKENAPP, set.A.Token, article, nil))
// TODO validate B & C view
// validate B & C view
cards = &[]Card{}
rev = GetTestRevision(set.B.Revisions)
assert.NotEqual(t, bRev.Card, rev.Card)
assert.Nil(t, GetTestRevision(set.C.Revisions))
revision = strconv.FormatInt(bRev.Card, 10)
assert.NoError(t, ApiTestMsg(GetCards, "GET", "/contact/cards?revision=" + revision,
nil, nil, APP_TOKENAPP, set.B.Token, cards, nil))
assert.Equal(t, 1, len(*cards))
assert.NotEqual(t, bArticleRevision, (*cards)[0].Data.NotifiedArticle)
assert.Equal(t, bViewRevision, (*cards)[0].Data.NotifiedView)
bRev = rev
rView = strconv.FormatInt(bViewRevision, 10)
rArticle = strconv.FormatInt(bArticleRevision, 10)
articles = &[]Article{}
assert.NoError(t, ApiTestMsg(GetArticles, "GET", "/attribute/articles?viewRevision=" + rView + "&articleRevision=" + rArticle,
nil, nil, APP_TOKENCONTACT, set.B.A.Token, articles, nil))
assert.Equal(t, 1, len(*articles))
assert.Nil(t, (*articles)[0].Data)
card = &Card{}
param["cardId"] = set.C.A.CardId
GetTestRevision(set.B.Revisions)
assert.NoError(t, ApiTestMsg(GetCard, "GET", "/contact/cards/{cardId}",
&param, nil, APP_TOKENCONTACT, set.C.Token, card, nil))
cArticleRevision = card.Data.NotifiedArticle
cViewRevision = card.Data.NotifiedView
// delete article
param["articleId"] = article.Id
@ -79,6 +189,21 @@ func TestShareAttribute(t *testing.T) {
nil, nil, APP_TOKENAPP, set.A.Token, articles, nil))
assert.Equal(t, 0, len(*articles))
// TODO validate B & C view
// validate B & C view
cards = &[]Card{}
rev = GetTestRevision(set.C.Revisions)
assert.NotEqual(t, cRev.Card, rev.Card)
assert.Nil(t, GetTestRevision(set.B.Revisions))
revision = strconv.FormatInt(cRev.Card, 10)
assert.NoError(t, ApiTestMsg(GetCards, "GET", "/contact/cards?revision=" + revision,
nil, nil, APP_TOKENAPP, set.C.Token, cards, nil))
assert.Equal(t, 1, len(*cards))
rView = strconv.FormatInt(cViewRevision, 10)
rArticle = strconv.FormatInt(cArticleRevision, 10)
articles = &[]Article{}
assert.NoError(t, ApiTestMsg(GetArticles, "GET", "/attribute/articles?viewRevision=" + rView + "&articleRevision=" + rArticle,
nil, nil, APP_TOKENCONTACT, set.C.A.Token, articles, nil))
assert.Equal(t, 1, len(*articles))
assert.Nil(t, (*articles)[0].Data)
}