1 files changed, 10 insertions, 43 deletions

diff --git a/api/views.py b/api/views.py
index 928d8e9eb..ee13b47a9 100644
--- a/api/views.py
+++ b/api/views.py
@@ -9,18 +9,13 @@
 import logging
 import os
 
-from flask import request
-from flask_restful import Resource
 from flasgger.utils import swag_from
 
-from api.utils import common as common_utils
+from api.base import ApiResource
 from api.swagger import models
-from api.actions import test as test_action
-from api.actions import samples as samples_action
-from api.actions import result as result_action
-from api.actions import env as env_action
 
 logger = logging.getLogger(__name__)
+logger.setLevel(logging.DEBUG)
 
 
 TestCaseActionModel = models.TestCaseActionModel
@@ -29,54 +24,26 @@ TestCaseActionArgsOptsModel = models.TestCaseActionArgsOptsModel
 TestCaseActionArgsOptsTaskArgModel = models.TestCaseActionArgsOptsTaskArgModel
 
 
-class Release(Resource):
+class ReleaseAction(ApiResource):
     @swag_from(os.getcwd() + '/swagger/docs/testcases.yaml')
     def post(self):
-        action = common_utils.translate_to_str(request.json.get('action', ''))
-        args = common_utils.translate_to_str(request.json.get('args', {}))
-        logger.debug('Input args is: action: %s, args: %s', action, args)
+        return self._dispatch_post()
 
-        try:
-            return getattr(test_action, action)(args)
-        except AttributeError:
-            return common_utils.error_handler('Wrong action')
 
-
-class Samples(Resource):
+class SamplesAction(ApiResource):
     def post(self):
-        action = common_utils.translate_to_str(request.json.get('action', ''))
-        args = common_utils.translate_to_str(request.json.get('args', {}))
-        logger.debug('Input args is: action: %s, args: %s', action, args)
-
-        try:
-            return getattr(samples_action, action)(args)
-        except AttributeError:
-            return common_utils.error_handler('Wrong action')
+        return self._dispatch_post()
 
 
 ResultModel = models.ResultModel
 
 
-class Results(Resource):
+class Results(ApiResource):
     @swag_from(os.getcwd() + '/swagger/docs/results.yaml')
     def get(self):
-        args = common_utils.translate_to_str(request.args)
-        action = args.get('action', '')
-        logger.debug('Input args is: action: %s, args: %s', action, args)
+        return self._dispatch_get()
 
-        try:
-            return getattr(result_action, action)(args)
-        except AttributeError:
-            return common_utils.error_handler('Wrong action')
 
-
-class Env(Resource):
+class EnvAction(ApiResource):
     def post(self):
-        action = common_utils.translate_to_str(request.json.get('action', ''))
-        args = common_utils.translate_to_str(request.json.get('args', {}))
-        logger.debug('Input args is: action: %s, args: %s', action, args)
-
-        try:
-            return getattr(env_action, action)(args)
-        except AttributeError:
-            return common_utils.error_handler('Wrong action')
+        return self._dispatch_post()