Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

move store.GetUid() from adapter to store #313

Merged
merged 2 commits into from
Nov 16, 2019
Merged

move store.GetUid() from adapter to store #313

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
7c331cc
move store.GetUid() from adapter to store
Googlom Nov 15, 2019
dcff3c9
GetUid fix
Googlom Nov 16, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 0 additions & 2 deletions server/db/rethinkdb/adapter.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1514,7 +1514,6 @@ func (a *adapter) FindTopics(req, opt []string) ([]t.Subscription, error) {

// Messages
func (a *adapter) MessageSave(msg *t.Message) error {
msg.SetUid(store.GetUid())
_, err := rdb.DB(a.dbName).Table("messages").Insert(msg).RunWrite(a.conn)
return err
}
Expand Down Expand Up @@ -1653,7 +1652,6 @@ func (a *adapter) MessageDeleteList(topic string, toDel *t.DelMessage) error {
err = a.messagesHardDelete(topic)
} else {
// Only some messages are being deleted
toDel.SetUid(store.GetUid())

// Start with making a log entry
_, err = rdb.DB(a.dbName).Table("dellog").Insert(toDel).RunWrite(a.conn)
Expand Down
3 changes: 2 additions & 1 deletion server/store/store.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -510,7 +510,7 @@ var Messages MessagesObjMapper
// Save message
func (MessagesObjMapper) Save(msg *types.Message, readBySender bool) error {
msg.InitTimes()

msg.SetUid(GetUid())
// Increment topic's or user's SeqId
err := adp.TopicUpdateOnMessage(msg.Topic, msg)
if err != nil {
Expand Down Expand Up @@ -571,6 +571,7 @@ func (MessagesObjMapper) DeleteList(topic string, delID int, forUser types.Uid,
DelId: delID,
DeletedFor: forUser.String(),
SeqIdRanges: ranges}
toDel.SetUid(GetUid())
toDel.InitTimes()
}

Expand Down