From 2c9de20c2a5ce3dbaa401e7985d822e3f3379653 Mon Sep 17 00:00:00 2001 From: Jannis Mattheis Date: Sat, 10 Mar 2018 21:35:06 +0100 Subject: [PATCH] Adjust message database impl --- database/message.go | 4 ++-- database/message_test.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/database/message.go b/database/message.go index 41f5885..1e128ff 100644 --- a/database/message.go +++ b/database/message.go @@ -28,7 +28,7 @@ func (d *GormDatabase) GetMessagesByUser(userID uint) []*model.Message { } // 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 d.DB.Where("application_id = ?", tokenID).Order("date desc").Find(&messages) return messages @@ -40,7 +40,7 @@ func (d *GormDatabase) DeleteMessageByID(id uint) error { } // 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 } diff --git a/database/message_test.go b/database/message_test.go index 29ee4fb..15c72e5 100644 --- a/database/message_test.go +++ b/database/message_test.go @@ -15,7 +15,7 @@ func (s *DatabaseSuite) TestMessage() { s.db.CreateUser(user) 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) assert.NotEqual(s.T(), 0, backupServer.ID) @@ -38,7 +38,7 @@ func (s *DatabaseSuite) TestMessage() { assert.Len(s.T(), msgs, 1) 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) assert.NotEqual(s.T(), 0, loginServer.ID)