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

syncrhonizing tags in test app

Browse Source
This commit is contained in:
Roland Osborne 2022-03-04 13:44:11 -08:00
parent 953dc93ed5
commit 9b5dcdfe3f
4 changed files with 264 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
net/server/internal/api_addChannelTopicTag.go
View File

@ -66,6 +66,7 @@ func AddChannelTopicTag(w http.ResponseWriter, r *http.Request) {
if res := tx.Save(tag).Error; res != nil {
return res
}
tagSlot.Tag = tag
if res := tx.Model(&topicSlot.Topic).Update("tag_revision", act.ChannelRevision + 1).Error; res != nil {
return res

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

@ -22,7 +22,7 @@ func GetChannelTopic(w http.ResponseWriter, r *http.Request) {
// load topic
var topicSlot store.TopicSlot
if err = store.DB.Where("channel_id = ? AND topic_slot_id = ?", channelSlot.Channel.ID, topicId).First(&topicSlot).Error; err != nil {
if err = store.DB.Preload("Topic").Where("channel_id = ? AND topic_slot_id = ?", channelSlot.Channel.ID, topicId).First(&topicSlot).Error; err != nil {
if errors.Is(err, gorm.ErrRecordNotFound) {
code = http.StatusNotFound
} else {

204
net/server/internal/testApp.go
View File

@ -19,9 +19,14 @@ type TestCondition struct {
channel chan bool
}
type TestTopic struct {
topic Topic
tags map[string]*Tag
}
type TestChannel struct {
channel Channel
topics map[string]*Topic
topics map[string]*TestTopic
}
type TestContactData struct {
@ -225,32 +230,114 @@ func (c *TestContactData) UpdateContactChannel(storeChannel *TestChannel, channe
return
}
func (c *TestContactData) UpdateContactChannelTopics(testChannel *TestChannel) (err error) {
func (c *TestContactData) UpdateContactChannelTopics(storeChannel *TestChannel) (err error) {
var topics []Topic
if testChannel.channel.Revision == 0 {
if storeChannel.channel.Revision == 0 {
token := c.card.Data.CardProfile.Guid + "." + c.card.Data.CardDetail.Token
params := &TestApiParams{ query: "/channels/{channelId}/topics",
path: map[string]string{ "channelId": testChannel.channel.Id }, tokenType: APP_TOKENCONTACT, token: token }
path: map[string]string{ "channelId": storeChannel.channel.Id }, tokenType: APP_TOKENCONTACT, token: token }
response := &TestApiResponse{ data: &topics }
if err = TestApiRequest(GetChannelTopics, params, response); err != nil {
return
}
testChannel.topics = make(map[string]*Topic)
storeChannel.topics = make(map[string]*TestTopic)
} else {
token := c.card.Data.CardProfile.Guid + "." + c.card.Data.CardDetail.Token
revision := strconv.FormatInt(testChannel.channel.Revision, 10)
revision := strconv.FormatInt(storeChannel.channel.Revision, 10)
params := &TestApiParams{ query: "/channels/{channelId}/topics?revision=" + revision,
path: map[string]string{ "channelId": testChannel.channel.Id }, tokenType: APP_TOKENCONTACT, token: token }
path: map[string]string{ "channelId": storeChannel.channel.Id }, tokenType: APP_TOKENCONTACT, token: token }
response := &TestApiResponse{ data: &topics }
if err = TestApiRequest(GetChannelTopics, params, response); err != nil {
return
}
}
for _, topic := range topics {
if topic.Data == nil {
delete(testChannel.topics, topic.Id)
if topic.Data == nil {
delete(storeChannel.topics, topic.Id)
} else {
testChannel.topics[topic.Id] = &topic
storeTopic, set := storeChannel.topics[topic.Id]
if set {
if topic.Revision != storeTopic.topic.Revision {
if err = c.UpdateContactChannelTopic(storeChannel, storeTopic, &topic); err != nil {
return
}
storeTopic.topic.Revision = topic.Revision
}
} else {
storeTopic := &TestTopic{ topic: Topic{ Id: topic.Id, Data: &TopicData{} } }
storeChannel.topics[topic.Id] = storeTopic
if err = c.UpdateContactChannelTopic(storeChannel, storeTopic, &topic); err != nil {
return
}
storeTopic.topic.Revision = topic.Revision
}
}
}
return
}
func (c *TestContactData) UpdateContactChannelTopic(storeChannel *TestChannel, storeTopic *TestTopic, topic *Topic) (err error) {
if storeTopic.topic.Revision != topic.Revision {
if storeTopic.topic.Data.TagRevision != topic.Data.TagRevision {
if err = c.UpdateContactChannelTopicTags(storeChannel, storeTopic); err != nil {
return
}
storeTopic.topic.Data.TagRevision = topic.Data.TagRevision
}
if topic.Data.TopicDetail != nil {
storeTopic.topic.Data.TopicDetail = topic.Data.TopicDetail
storeTopic.topic.Data.DetailRevision = topic.Data.DetailRevision
} else if storeTopic.topic.Data.DetailRevision != topic.Data.DetailRevision {
token := c.card.Data.CardProfile.Guid + "." + c.card.Data.CardDetail.Token
params := &TestApiParams{ query: "/channels/{channelId}/topics/{topicId}",
path: map[string]string{ "channelId": storeChannel.channel.Id, "topicId": topic.Id },
tokenType: APP_TOKENCONTACT, token: token }
topic := Topic{}
response := &TestApiResponse{ data: &topic }
if err = TestApiRequest(GetChannelTopic, params, response); err != nil {
return
}
if topic.Data == nil {
err = errors.New("topic removed during update")
return
}
storeTopic.topic.Data.TopicDetail = topic.Data.TopicDetail
storeTopic.topic.Data.DetailRevision = topic.Data.DetailRevision
}
}
return
}
func (c *TestContactData) UpdateContactChannelTopicTags(storeChannel *TestChannel, storeTopic *TestTopic) (err error) {
var tags []Tag
if storeTopic.topic.Revision == 0 {
token := c.card.Data.CardProfile.Guid + "." + c.card.Data.CardDetail.Token
params := &TestApiParams{ query: "/channels/{channelId}/topics/{topicId}/tags",
path: map[string]string{ "channelId": storeChannel.channel.Id, "topicId": storeTopic.topic.Id },
tokenType: APP_TOKENCONTACT, token: token }
response := &TestApiResponse{ data: &tags }
if err = TestApiRequest(GetChannelTopicTags, params, response); err != nil {
return
}
storeTopic.tags = make(map[string]*Tag)
} else {
revision := strconv.FormatInt(storeTopic.topic.Revision, 10)
token := c.card.Data.CardProfile.Guid + "." + c.card.Data.CardDetail.Token
params := &TestApiParams{ query: "/channels/{channelId}/topics/{topicId}/tags?revision=" + revision,
path: map[string]string{ "channelId": storeChannel.channel.Id, "topicId": storeTopic.topic.Id },
tokenType: APP_TOKENCONTACT, token: token }
response := &TestApiResponse{ data: &tags }
if err = TestApiRequest(GetChannelTopicTags, params, response); err != nil {
return
}
}
for _, tag := range tags {
if tag.Data == nil {
delete(storeTopic.tags, tag.Id)
} else {
storeTopic.tags[tag.Id] = &tag
}
}
return
@ -435,30 +522,109 @@ func (a *TestApp) UpdateChannel(storeChannel *TestChannel, channel *Channel) (er
return
}
func (a *TestApp) UpdateChannelTopics(testChannel *TestChannel) (err error) {
func (a *TestApp) UpdateChannelTopics(storeChannel *TestChannel) (err error) {
var topics []Topic
if testChannel.channel.Revision == 0 {
if storeChannel.channel.Revision == 0 {
params := &TestApiParams{ query: "/channels/{channelId}/topics",
path: map[string]string{ "channelId": testChannel.channel.Id }, tokenType: APP_TOKENAPP, token: a.token }
path: map[string]string{ "channelId": storeChannel.channel.Id }, tokenType: APP_TOKENAPP, token: a.token }
response := &TestApiResponse{ data: &topics }
if err = TestApiRequest(GetChannelTopics, params, response); err != nil {
return
}
testChannel.topics = make(map[string]*Topic)
storeChannel.topics = make(map[string]*TestTopic)
} else {
revision := strconv.FormatInt(testChannel.channel.Revision, 10)
revision := strconv.FormatInt(storeChannel.channel.Revision, 10)
params := &TestApiParams{ query: "/channels/{channelId}/topics?revision=" + revision,
path: map[string]string{ "channelId": testChannel.channel.Id }, tokenType: APP_TOKENAPP, token: a.token }
path: map[string]string{ "channelId": storeChannel.channel.Id }, tokenType: APP_TOKENAPP, token: a.token }
response := &TestApiResponse{ data: &topics }
if err = TestApiRequest(GetChannelTopics, params, response); err != nil {
return
}
}
for _, topic := range topics {
if topic.Data == nil {
delete(testChannel.topics, topic.Id)
if topic.Data == nil {
delete(storeChannel.topics, topic.Id)
} else {
testChannel.topics[topic.Id] = &topic
storeTopic, set := storeChannel.topics[topic.Id]
if set {
if topic.Revision != storeTopic.topic.Revision {
if err = a.UpdateChannelTopic(storeChannel, storeTopic, &topic); err != nil {
return
}
storeTopic.topic.Revision = topic.Revision
}
} else {
storeTopic := &TestTopic{ topic: Topic{ Id: topic.Id, Data: &TopicData{} } }
storeChannel.topics[topic.Id] = storeTopic
if err = a.UpdateChannelTopic(storeChannel, storeTopic, &topic); err != nil {
return
}
storeTopic.topic.Revision = topic.Revision
}
}
}
return
}
func (a *TestApp) UpdateChannelTopic(storeChannel *TestChannel, storeTopic *TestTopic, topic *Topic) (err error) {
if storeTopic.topic.Revision != topic.Revision {
if storeTopic.topic.Data.TagRevision != topic.Data.TagRevision {
if err = a.UpdateChannelTopicTags(storeChannel, storeTopic); err != nil {
return
}
storeTopic.topic.Data.TagRevision = topic.Data.TagRevision
}
if topic.Data.TopicDetail != nil {
storeTopic.topic.Data.TopicDetail = topic.Data.TopicDetail
storeTopic.topic.Data.DetailRevision = topic.Data.DetailRevision
} else if storeTopic.topic.Data.DetailRevision != topic.Data.DetailRevision {
params := &TestApiParams{ query: "/channels/{channelId}/topics/{topicId}",
path: map[string]string{ "channelId": storeChannel.channel.Id, "topicId": topic.Id },
tokenType: APP_TOKENAPP, token: a.token }
topic := Topic{}
response := &TestApiResponse{ data: &topic }
if err = TestApiRequest(GetChannelTopic, params, response); err != nil {
return
}
if topic.Data == nil {
err = errors.New("topic removed during update")
return
}
storeTopic.topic.Data.TopicDetail = topic.Data.TopicDetail
storeTopic.topic.Data.DetailRevision = topic.Data.DetailRevision
}
}
return
}
func (a *TestApp) UpdateChannelTopicTags(storeChannel *TestChannel, storeTopic *TestTopic) (err error) {
var tags []Tag
if storeTopic.topic.Revision == 0 {
params := &TestApiParams{ query: "/channels/{channelId}/topics/{topicId}/tags",
path: map[string]string{ "channelId": storeChannel.channel.Id, "topicId": storeTopic.topic.Id },
tokenType: APP_TOKENAPP, token: a.token }
response := &TestApiResponse{ data: &tags }
if err = TestApiRequest(GetChannelTopicTags, params, response); err != nil {
return
}
storeTopic.tags = make(map[string]*Tag)
} else {
revision := strconv.FormatInt(storeTopic.topic.Revision, 10)
params := &TestApiParams{ query: "/channels/{channelId}/topics/{topicId}/tags?revision=" + revision,
path: map[string]string{ "channelId": storeChannel.channel.Id, "topicId": storeTopic.topic.Id },
tokenType: APP_TOKENAPP, token: a.token }
response := &TestApiResponse{ data: &tags }
if err = TestApiRequest(GetChannelTopicTags, params, response); err != nil {
return
}
}
for _, tag := range tags {
if tag.Data == nil {
delete(storeTopic.tags, tag.Id)
} else {
storeTopic.tags[tag.Id] = &tag
}
}
return

79
net/server/internal/ucMessangerApp_test.go
View File

@ -10,6 +10,7 @@ func TestMessangerApp(t *testing.T) {
var response *TestApiResponse
var channel *Channel
var topic *Topic
var tag *Tag
// allocate test accounts
set, err := AddTestGroup("messangerapp")
@ -95,7 +96,7 @@ func TestMessangerApp(t *testing.T) {
for _, c := range testApp.channels {
if c.channel.Id == channel.Id {
for _, t := range c.topics {
if t.Id == topic.Id {
if t.topic.Id == topic.Id {
return true
}
}
@ -104,6 +105,41 @@ func TestMessangerApp(t *testing.T) {
return false
}))
// add a tag to channel topic
params = &TestApiParams{
restType: "POST",
query: "/content/channels/{channelId}/topics/{topicId}/tags",
path: map[string]string{ "channelId": channel.Id, "topicId": topic.Id },
body: &Subject{
Data: "channeltopictagdataA",
DataType: "channeltopictagdatatypeA",
},
tokenType: APP_TOKENAPP,
token: set.A.Token,
}
tag = &Tag{}
response = &TestApiResponse{ data: tag }
assert.NoError(t, TestApiRequest(AddChannelTopicTag, params, response))
// wait for test
assert.NoError(t, app.WaitFor(func(testApp *TestApp)bool{
for _, testChannel := range testApp.channels {
if testChannel.channel.Id == channel.Id {
for _, testTopic := range testChannel.topics {
if testTopic.topic.Id == topic.Id {
for _, testTag := range testTopic.tags {
if testTag.Id == tag.Id {
return true
}
}
}
}
}
}
return false
}))
// add a channel
params = &TestApiParams{
restType: "POST",
@ -167,7 +203,7 @@ func TestMessangerApp(t *testing.T) {
for _, testChannel := range testContact.channels {
if testChannel.channel.Id == channel.Id {
for _, t := range testChannel.topics {
if t.Id == topic.Id {
if t.topic.Id == topic.Id {
return true
}
}
@ -177,5 +213,44 @@ func TestMessangerApp(t *testing.T) {
}
return false
}))
// add a tag to channel topic
params = &TestApiParams{
restType: "POST",
query: "/content/channels/{channelId}/topics/{topicId}/tags",
path: map[string]string{ "channelId": channel.Id, "topicId": topic.Id },
body: &Subject{
Data: "channeltopictagdataB",
DataType: "channeltopictagdatatypeB",
},
tokenType: APP_TOKENAPP,
token: set.B.Token,
}
tag = &Tag{}
response = &TestApiResponse{ data: tag }
assert.NoError(t, TestApiRequest(AddChannelTopicTag, params, response))
// wait for test
assert.NoError(t, app.WaitFor(func(testApp *TestApp)bool{
for _, testContact := range testApp.contacts {
if testContact.card.Id == set.A.B.CardId {
for _, testChannel := range testContact.channels {
if testChannel.channel.Id == channel.Id {
for _, testTopic := range testChannel.topics {
if testTopic.topic.Id == topic.Id {
for _, testTag := range testTopic.tags {
if testTag.Id == tag.Id {
return true
}
}
}
}
}
}
}
}
return false
}))
}