colin
/
sharded-gotify
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Adjust message database impl

This commit is contained in:
Jannis Mattheis 2018-03-10 21:35:06 +01:00 committed by Jannis Mattheis
parent a10fe96ea7
commit 2c9de20c2a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
database/message.go
View File

@ -28,7 +28,7 @@ func (d *GormDatabase) GetMessagesByUser(userID uint) []*model.Message {
} }
// GetMessagesByApplication returns all messages from an application. // GetMessagesByApplication returns all messages from an application.
func (d *GormDatabase) GetMessagesByApplication(tokenID string) []*model.Message { func (d *GormDatabase) GetMessagesByApplication(tokenID uint) []*model.Message {
var messages []*model.Message var messages []*model.Message
d.DB.Where("application_id = ?", tokenID).Order("date desc").Find(&messages) d.DB.Where("application_id = ?", tokenID).Order("date desc").Find(&messages)
return messages return messages
@ -40,7 +40,7 @@ func (d *GormDatabase) DeleteMessageByID(id uint) error {
} }
// DeleteMessagesByApplication deletes all messages from an application. // DeleteMessagesByApplication deletes all messages from an application.
func (d *GormDatabase) DeleteMessagesByApplication(applicationID string) error { func (d *GormDatabase) DeleteMessagesByApplication(applicationID uint) error {
return d.DB.Where("application_id = ?", applicationID).Delete(&model.Message{}).Error return d.DB.Where("application_id = ?", applicationID).Delete(&model.Message{}).Error
} }

4
database/message_test.go
View File

@ -15,7 +15,7 @@ func (s *DatabaseSuite) TestMessage() {
s.db.CreateUser(user) s.db.CreateUser(user)
assert.NotEqual(s.T(), 0, user.ID) assert.NotEqual(s.T(), 0, user.ID)
backupServer := &model.Application{UserID: user.ID, ID: "A0000000000", Name: "backupserver"} backupServer := &model.Application{UserID: user.ID, Token: "A0000000000", Name: "backupserver"}
s.db.CreateApplication(backupServer) s.db.CreateApplication(backupServer)
assert.NotEqual(s.T(), 0, backupServer.ID) assert.NotEqual(s.T(), 0, backupServer.ID)
@ -38,7 +38,7 @@ func (s *DatabaseSuite) TestMessage() {
assert.Len(s.T(), msgs, 1) assert.Len(s.T(), msgs, 1)
assertEquals(s.T(), msgs[0], backupdone) assertEquals(s.T(), msgs[0], backupdone)
loginServer := &model.Application{UserID: user.ID, ID: "A0000000001", Name: "loginserver"} loginServer := &model.Application{UserID: user.ID, Token: "A0000000001", Name: "loginserver"}
s.db.CreateApplication(loginServer) s.db.CreateApplication(loginServer)
assert.NotEqual(s.T(), 0, loginServer.ID) assert.NotEqual(s.T(), 0, loginServer.ID)