|
@@ -1,4 +1,5 @@
|
|
|
# -*- coding:utf-8 -*-
|
|
|
+from flask import request
|
|
|
from flask_restful import fields, marshal_with, reqparse
|
|
|
from flask_restful.inputs import int_range
|
|
|
from werkzeug.exceptions import NotFound
|
|
@@ -56,16 +57,14 @@ class ConversationDetailApi(AppApiResource):
|
|
|
|
|
|
conversation_id = str(c_id)
|
|
|
|
|
|
- parser = reqparse.RequestParser()
|
|
|
- parser.add_argument('user', type=str, location='args')
|
|
|
- args = parser.parse_args()
|
|
|
+ user = request.get_json().get('user')
|
|
|
|
|
|
- if end_user is None and args['user'] is not None:
|
|
|
- end_user = create_or_update_end_user_for_user_id(app_model, args['user'])
|
|
|
+ if end_user is None and user is not None:
|
|
|
+ end_user = create_or_update_end_user_for_user_id(app_model, user)
|
|
|
|
|
|
try:
|
|
|
ConversationService.delete(app_model, conversation_id, end_user)
|
|
|
- return {"result": "success"}, 204
|
|
|
+ return {"result": "success"}
|
|
|
except services.errors.conversation.ConversationNotExistsError:
|
|
|
raise NotFound("Conversation Not Exists.")
|
|
|
|
|
@@ -95,3 +94,4 @@ class ConversationRenameApi(AppApiResource):
|
|
|
api.add_resource(ConversationRenameApi, '/conversations/<uuid:c_id>/name', endpoint='conversation_name')
|
|
|
api.add_resource(ConversationApi, '/conversations')
|
|
|
api.add_resource(ConversationApi, '/conversations/<uuid:c_id>', endpoint='conversation')
|
|
|
+api.add_resource(ConversationDetailApi, '/conversations/<uuid:c_id>', endpoint='conversation_detail')
|