Add data interface for globalmessages API
This commit is contained in:
parent
fe6760749a
commit
4ca6c37e54
3 changed files with 68 additions and 13 deletions
|
@ -6,10 +6,10 @@ from flask import request
|
|||
import features
|
||||
from auth import scopes
|
||||
from auth.permissions import SuperUserPermission
|
||||
from data import model
|
||||
from endpoints.api import (ApiResource, resource, nickname,
|
||||
require_fresh_login, verify_not_prod, validate_json_request,
|
||||
require_scope, show_if,)
|
||||
from globalmessages_models_pre_oci import pre_oci_model as model
|
||||
|
||||
|
||||
@resource('/v1/messages')
|
||||
|
@ -88,7 +88,7 @@ class GlobalUserMessages(ApiResource):
|
|||
def get(self):
|
||||
""" Return a super users messages """
|
||||
return {
|
||||
'messages': [message_view(m) for m in model.message.get_messages()],
|
||||
'messages': [m.to_dict() for m in model.get_all_messages()],
|
||||
}
|
||||
|
||||
@require_fresh_login
|
||||
|
@ -102,7 +102,7 @@ class GlobalUserMessages(ApiResource):
|
|||
abort(404)
|
||||
|
||||
if SuperUserPermission().can():
|
||||
model.message.create([request.get_json()['message']])
|
||||
model.create_message(request.get_json()['message'])
|
||||
return make_response('', 201)
|
||||
|
||||
abort(403)
|
||||
|
@ -119,16 +119,7 @@ class GlobalUserMessage(ApiResource):
|
|||
def delete(self, uuid):
|
||||
""" Delete a message """
|
||||
if SuperUserPermission().can():
|
||||
model.message.delete_message([uuid])
|
||||
model.delete_message(uuid)
|
||||
return make_response('', 204)
|
||||
|
||||
abort(403)
|
||||
|
||||
|
||||
def message_view(message):
|
||||
return {
|
||||
'uuid': message.uuid,
|
||||
'content': message.content,
|
||||
'severity': message.severity,
|
||||
'media_type': message.media_type.name,
|
||||
}
|
||||
|
|
Reference in a new issue