Skip to content

enhance exceptions raising & status codes returning #60

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

enhance exceptions raising & status codes returning #60

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions const.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
('医用面罩式雾化器', ),
('测体温设备', ),
('空气消毒设备', ),
('医用紫外线消毒车', ),
('医用紫外线消毒车', )
]

"""
Expand All @@ -45,7 +45,7 @@
'donate_account_info',
'donate_cur_status',
'donate_audit_status',
'donate_audit_person',
'donate_audit_person'
]
FACTORY_HEADERS = [
'factory_prov',
Expand All @@ -57,7 +57,7 @@
'factory_note',
'factory_link',
'factory_audit_status',
'factory_reviewer',
'factory_reviewer'
]
CLINIC_HEADERS = [
'clinic_unit',
Expand All @@ -76,7 +76,7 @@
'hotel_note',
'hotel_link',
'hotel_audit_status',
'hotel_audit_person',
'hotel_audit_person'
]
LOGISTICS_HEADERS = [
'logistics_name',
Expand All @@ -100,5 +100,5 @@
'hospital_contact',
'hospital_note',
'hospital_audit_status',
'hospital_audit_person',
'hospital_audit_person'
]
71 changes: 41 additions & 30 deletions utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# -*- coding: utf-8 -*-
from flask import Blueprint, current_app, request
from werkzeug.exceptions import *
import os
import json
import datetime
Expand All @@ -17,47 +18,54 @@
data = Blueprint('register', __name__)


@data.route('/json_test')
@data.route('/json_test', methods=['GET'])
def json_test():
path = os.path.join("/root/api-server/", "test.json")
return json_helper(path)


@data.route('/xml_test')
@data.route('/xml_test', methods=['GET'])
def xml_test():
path = os.path.join("/root/api-server/", "test.xml")
return xml_helper(path)


@data.route('/hospital_list')
@data.route('/hospital_list', methods=['GET'])
def hospital_list():
resp = {
'success': False,
'data': [],
'msg': '',
}
code = 200
try:
hosptials_data = csv_with_medical_supplier(current_app.config['HOSPITAL_PATH'], HOSPITAL_HEADERS)
hosptials_data = csv_with_medical_supplier(
current_app.config['HOSPITAL_PATH'], HOSPITAL_HEADERS)
if 'limit' in request.args or 'skip' in request.args:
skip = request.args.get('skip', type=int)
limit = request.args.get('limit', type=int)
hosptials_data_len = len(hosptials_data)
if skip < 0 or limit < 0 or limit > 50:
raise Exception('Bad input parameter.')
raise BadRequest('Bad input parameter.')
if skip > hosptials_data_len:
raise Exception("Index out of range.")
raise BadRequest("Index out of range.")
if skip + limit > hosptials_data_len:
limit = hosptials_data_len - skip
resp['data'] = hosptials_data[skip:skip+limit]
else:
resp['data'] = hosptials_data
resp['success'] = True
except Exception as e:
except HTTPException as e:
code = e.code
resp['msg'] = str(e)
return json.dumps(resp, ensure_ascii=False),(400 if not resp['success'] else 200)
except Exception as ex:
code = 500
resp['msg'] = str(ex)

return json.dumps(resp, ensure_ascii=False), code


@data.route('/hotel_list')
@data.route('/hotel_list', methods=['GET'])
@auth.login_required
def hotel_list():
resp = {
Expand All @@ -74,24 +82,25 @@ def hotel_list():
return json.dumps(resp, ensure_ascii=False)


@data.route('/logistical_list')
@data.route('/logistics_list', methods=['GET'])
@auth.login_required
def logistical_list():
def logistics_list():
resp = {
'success': False,
'data': [],
'msg': '',
}
try:
resp_data = csv_with_medical_supplier(current_app.config['LOGISITICAL_PATH'], LOGISTICS_HEADERS)
resp_data = csv_with_medical_supplier(
current_app.config['LOGISITICAL_PATH'], LOGISTICS_HEADERS)
resp['success'] = True
resp['data'] = resp_data
except Exception as e:
resp['msg'] = str(e)
return json.dumps(resp, ensure_ascii=False)


@data.route('/news_list')
@data.route('/news_list', methods=['GET'])
@auth.login_required
def news_list():
resp = {
Expand All @@ -108,7 +117,7 @@ def news_list():
return json.dumps(resp, ensure_ascii=False)


@data.route('/donation_list')
@data.route('/donation_list', methods=['GET'])
@auth.login_required
def donation_list():
resp = {
Expand All @@ -117,15 +126,16 @@ def donation_list():
'msg': '',
}
try:
resp_data = csv_helper(current_app.config['DONATION_PATH'], DONATION_HEADERS)
resp_data = csv_helper(
current_app.config['DONATION_PATH'], DONATION_HEADERS)
resp['success'] = True
resp['data'] = resp_data
except Exception as e:
resp['msg'] = str(e)
return json.dumps(resp, ensure_ascii=False)


@data.route('/factory_list')
@data.route('/factory_list', methods=['GET'])
@auth.login_required
def factory_list():
resp = {
Expand All @@ -134,15 +144,16 @@ def factory_list():
'msg': '',
}
try:
resp_data = csv_with_medical_supplier(current_app.config['FACTORY_PATH'], FACTORY_HEADERS)
resp_data = csv_with_medical_supplier(
current_app.config['FACTORY_PATH'], FACTORY_HEADERS)
resp['success'] = True
resp['data'] = resp_data
except Exception as e:
resp['msg'] = str(e)
return json.dumps(resp, ensure_ascii=False)


@data.route('/clinic_list')
@data.route('/clinic_list', methods=['GET'])
@auth.login_required
def clinic_list():
resp = {
Expand All @@ -151,32 +162,32 @@ def clinic_list():
'msg': '',
}
try:
resp_data = csv_helper(current_app.config['CLINIC_PATH'], CLINIC_HEADERS)
resp_data = csv_helper(
current_app.config['CLINIC_PATH'], CLINIC_HEADERS)
resp['success'] = True
resp['data'] = resp_data
except Exception as e:
resp['msg'] = str(e)
return json.dumps(resp, ensure_ascii=False)

@data.route('/hospital_list_json')

@data.route('/hospital_list_json', methods=['GET'])
def hospital_list_json():
resp = {
'success': False,
'data': [],
'msg': '',
}
try:
resp_data= json_helper(current_app.config['JSON_HOSPITAL_PATH'])
resp_data = json_helper(current_app.config['JSON_HOSPITAL_PATH'])
resp['success'] = True
resp['data'] = resp_data
except Exception as e:
resp['msg'] = str(e)
return json.dumps(resp, ensure_ascii=False)




@data.route('/hotel_list_json')
@data.route('/hotel_list_json', methods=['GET'])
def hotel_list_json():
resp = {
'success': False,
Expand All @@ -192,8 +203,8 @@ def hotel_list_json():
return json.dumps(resp, ensure_ascii=False)


@data.route('/logstics_list_json')
def logstics_list_json():
@data.route('/logistics_list_json', methods=['GET'])
def logistics_list_json():
resp = {
'success': False,
'data': [],
Expand All @@ -208,7 +219,7 @@ def logstics_list_json():
return json.dumps(resp, ensure_ascii=False)


@data.route('/news_list_json')
@data.route('/news_list_json', methods=['GET'])
def news_list_json():
resp = {
'success': False,
Expand All @@ -224,7 +235,7 @@ def news_list_json():
return json.dumps(resp, ensure_ascii=False)


@data.route('/donation_list_json')
@data.route('/donation_list_json', methods=['GET'])
def donation_list_json():
resp = {
'success': False,
Expand All @@ -240,7 +251,7 @@ def donation_list_json():
return json.dumps(resp, ensure_ascii=False)


@data.route('/factory_list_json')
@data.route('/factory_list_json', methods=['GET'])
def factory_list_json():
resp = {
'success': False,
Expand All @@ -256,7 +267,7 @@ def factory_list_json():
return json.dumps(resp, ensure_ascii=False)


@data.route('/clinic_list_json')
@data.route('/clinic_list_json', methods=['GET'])
def clinic_list_json():
resp = {
'success': False,
Expand Down