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

Fix not working Get/DeleteMessagesWithApplication apis

This commit is contained in:
Jannis Mattheis 2018-03-10 22:04:57 +01:00 committed by Jannis Mattheis
parent 7e37c34d2f
commit fb972ec9a6
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
api/message.go
View File

@ -42,7 +42,7 @@ func (a *MessageAPI) GetMessages(ctx *gin.Context) {
// GetMessagesWithApplication returns all messages from a specific application. // GetMessagesWithApplication returns all messages from a specific application.
func (a *MessageAPI) GetMessagesWithApplication(ctx *gin.Context) { func (a *MessageAPI) GetMessagesWithApplication(ctx *gin.Context) {
withID(ctx, "appid", func(id uint) { withID(ctx, "id", func(id uint) {
if app := a.DB.GetApplicationByID(id); app != nil && app.UserID == auth.GetUserID(ctx) { if app := a.DB.GetApplicationByID(id); app != nil && app.UserID == auth.GetUserID(ctx) {
messages := a.DB.GetMessagesByApplication(id) messages := a.DB.GetMessagesByApplication(id)
ctx.JSON(200, messages) ctx.JSON(200, messages)
@ -60,7 +60,7 @@ func (a *MessageAPI) DeleteMessages(ctx *gin.Context) {
// DeleteMessageWithApplication deletes all messages from a specific application. // DeleteMessageWithApplication deletes all messages from a specific application.
func (a *MessageAPI) DeleteMessageWithApplication(ctx *gin.Context) { func (a *MessageAPI) DeleteMessageWithApplication(ctx *gin.Context) {
withID(ctx, "appid", func(id uint) { withID(ctx, "id", func(id uint) {
if application := a.DB.GetApplicationByID(id); application != nil && application.UserID == auth.GetUserID(ctx) { if application := a.DB.GetApplicationByID(id); application != nil && application.UserID == auth.GetUserID(ctx) {
a.DB.DeleteMessagesByApplication(id) a.DB.DeleteMessagesByApplication(id)
} else { } else {

10
api/message_test.go
View File

@ -61,7 +61,7 @@ func (s *MessageSuite) Test_GetMessagesWithToken() {
t, _ := time.Parse("2006/01/02", "2021/01/02") t, _ := time.Parse("2006/01/02", "2021/01/02")
s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}}) s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}})
s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 4}) s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 4})
s.ctx.Params = gin.Params{{Key: "appid", Value: "1"}} s.ctx.Params = gin.Params{{Key: "id", Value: "1"}}
s.a.GetMessagesWithApplication(s.ctx) s.a.GetMessagesWithApplication(s.ctx)
@ -75,7 +75,7 @@ func (s *MessageSuite) Test_GetMessagesWithToken_withWrongUser_expectNotFound()
t, _ := time.Parse("2006/01/02", "2021/01/02") t, _ := time.Parse("2006/01/02", "2021/01/02")
s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 2}) s.db.On("GetApplicationByID", uint(1)).Return(&model.Application{ID: 1, Token:"irrelevant", UserID: 2})
s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}}) s.db.On("GetMessagesByApplication", uint(1)).Return([]*model.Message{{ID: 2, ApplicationID: 1, Message: "hi", Title: "hi", Date: t, Priority: 4}})
s.ctx.Params = gin.Params{{Key: "appid", Value: "1"}} s.ctx.Params = gin.Params{{Key: "id", Value: "1"}}
s.a.GetMessagesWithApplication(s.ctx) s.a.GetMessagesWithApplication(s.ctx)
@ -125,7 +125,7 @@ func (s *MessageSuite) Test_DeleteMessage() {
func (s *MessageSuite) Test_DeleteMessageWithToken() { func (s *MessageSuite) Test_DeleteMessageWithToken() {
auth.RegisterAuthentication(s.ctx, nil, 2, "") auth.RegisterAuthentication(s.ctx, nil, 2, "")
s.ctx.Params = gin.Params{{Key: "appid", Value: "5"}} s.ctx.Params = gin.Params{{Key: "id", Value: "5"}}
s.db.On("GetApplicationByID", uint(5)).Return(&model.Application{ID: 5, Token: "mytoken", UserID: 2}) s.db.On("GetApplicationByID", uint(5)).Return(&model.Application{ID: 5, Token: "mytoken", UserID: 2})
s.db.On("DeleteMessagesByApplication", uint(5)).Return(nil) s.db.On("DeleteMessagesByApplication", uint(5)).Return(nil)
@ -137,7 +137,7 @@ func (s *MessageSuite) Test_DeleteMessageWithToken() {
func (s *MessageSuite) Test_DeleteMessageWithToken_notExistingToken() { func (s *MessageSuite) Test_DeleteMessageWithToken_notExistingToken() {
auth.RegisterAuthentication(s.ctx, nil, 2, "") auth.RegisterAuthentication(s.ctx, nil, 2, "")
s.ctx.Params = gin.Params{{Key: "appid", Value: "55"}} s.ctx.Params = gin.Params{{Key: "id", Value: "55"}}
s.db.On("GetApplicationByID", uint(55)).Return(nil) s.db.On("GetApplicationByID", uint(55)).Return(nil)
s.db.On("DeleteMessagesByApplication", mock.Anything).Return(nil) s.db.On("DeleteMessagesByApplication", mock.Anything).Return(nil)
@ -149,7 +149,7 @@ func (s *MessageSuite) Test_DeleteMessageWithToken_notExistingToken() {
func (s *MessageSuite) Test_DeleteMessageWithToken_notOwner() { func (s *MessageSuite) Test_DeleteMessageWithToken_notOwner() {
auth.RegisterAuthentication(s.ctx, nil, 4, "") auth.RegisterAuthentication(s.ctx, nil, 4, "")
s.ctx.Params = gin.Params{{Key: "appid", Value: "55"}} s.ctx.Params = gin.Params{{Key: "id", Value: "55"}}
s.db.On("GetApplicationByID", uint(55)).Return(&model.Application{ID: 55, Token: "mytoken", UserID: 2}) s.db.On("GetApplicationByID", uint(55)).Return(&model.Application{ID: 55, Token: "mytoken", UserID: 2})
s.db.On("DeleteMessagesByApplication", uint(55)).Return(nil) s.db.On("DeleteMessagesByApplication", uint(55)).Return(nil)