From 119f1cd2f5c548df7815a3b59c3090953c2ced4a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=AD=94=E7=AE=AD=E8=83=96=E8=83=96?= <1003350679@qq.com> Date: Fri, 4 Sep 2020 09:45:02 +0800 Subject: [PATCH] update packageship/packageship/application/apps/lifecycle/view.py. --- .../application/apps/lifecycle/view.py | 24 +++++++++---------- 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/packageship/packageship/application/apps/lifecycle/view.py b/packageship/packageship/application/apps/lifecycle/view.py index efce4bb4..3b218412 100644 --- a/packageship/packageship/application/apps/lifecycle/view.py +++ b/packageship/packageship/application/apps/lifecycle/view.py @@ -304,7 +304,7 @@ class IssueView(Resource): return issue_data except (SQLAlchemyError, DisconnectionError) as error: current_app.logger.error(error) - return [] + return ResponseCode.response_json(ResponseCode.DATABASE_NOT_FOUND) def get(self): """ @@ -350,10 +350,12 @@ class IssueType(Resource): with DBHelper(db_name='lifecycle') as database: issues_query = database.session.query(PackagesIssue.issue_type).group_by( PackagesIssue.issue_type).all() - return [issue_query[0] for issue_query in issues_query] + return jsonify(ResponseCode.response_json( + ResponseCode.SUCCESS, [issue_query[0] for issue_query in issues_query])) except (SQLAlchemyError, DisconnectionError) as error: current_app.logger.error(error) - return [] + return jsonify(ResponseCode.response_json( + ResponseCode.PARAM_ERROR)) def get(self): """ @@ -370,9 +372,7 @@ class IssueType(Resource): TypeError: Exception of type Error: Abnormal error """ - issue_dict = self._get_issue_type() - return jsonify(ResponseCode.response_json( - ResponseCode.SUCCESS, issue_dict)) + return self._get_issue_type() class IssueStatus(Resource): @@ -389,10 +389,12 @@ class IssueStatus(Resource): with DBHelper(db_name='lifecycle') as database: issues_query = database.session.query(PackagesIssue.issue_status).group_by( PackagesIssue.issue_status).all() - return [issue_query[0] for issue_query in issues_query] + return jsonify(ResponseCode.response_json( + ResponseCode.SUCCESS, [issue_query[0] for issue_query in issues_query])) except (SQLAlchemyError, DisconnectionError) as error: current_app.logger.error(error) - return [] + return jsonify(ResponseCode.response_json( + ResponseCode.PARAM_ERROR)) def get(self): """ @@ -409,10 +411,8 @@ class IssueStatus(Resource): TypeError: Exception of type Error: Abnormal error """ - issue_dict = self._get_issue_status() - return jsonify(ResponseCode.response_json( - ResponseCode.SUCCESS, issue_dict)) - + return self._get_issue_status() + class IssueCatch(Resource): """ -- GitLab