session异常处理

app/api/engine.py

@@ -23,38 +23,6 @@ CFG_FILEPATH = work_dir + '/app/config/config.yaml'
 config = yaml.load(open(CFG_FILEPATH, 'r'), Loader=yaml.FullLoader)
 
 
-class TAMP_SQL(object):
-    """[sqlalchemy 封装]
-
-    Args:
-        object ([type]): [description]
-
-    Returns:
-        [type]: [description]
-    """
-
-    def __init__(self, db_engine):
-        # db = "mysql+mysqlconnector://root:password@localhost:3306/test"
-        # engine = create_engine(db)
-        # 创建DBSession类型:
-        self.DBSession = scoped_session(sessionmaker(bind=db_engine))
-
-    def __enter__(self):
-        self.session = self.DBSession()
-        return self.session
-
-    def __exit__(self, ext_type, exc_val, exc_tb):
-        print(ext_type)
-        self.session.commit()
-        self.session.close()
-
-    def add(self, model):
-        # model = User(id='5', name='Bob')
-        # 添加到session:
-        self.session.add(model)
-        # 提交即保存到数据库:
-        self.session.commit()
-
 tamp_user_engine = create_engine(
     'mysql+pymysql://{user}:{password}@{host}:{port}/{db}?charset={charset}'.format(
         db=config[env]['MySQL']['tamp_user_db'],
@@ -76,8 +44,6 @@ tamp_pay_engine = create_engine(
         charset="utf8"),
     echo=True
 )
-tamp_user_session = scoped_session(sessionmaker(bind=tamp_user_engine))()
-tamp_pay_session = scoped_session(sessionmaker(bind=tamp_pay_engine))()
 
 # redis = redis.StrictRedis(
 #     host=config[env]['redis']['host'],
@@ -92,3 +58,30 @@ logging.basicConfig(level=logging.INFO,
                     datefmt=config[env]['log']['datefmt']
                     )
 
+
+class TAMP_SQL(object):
+    """[sqlalchemy 封装]
+
+    Args:
+        object ([type]): [description]
+
+    Returns:
+        [type]: [description]
+    """
+
+    def __init__(self, db_engine):
+        # 创建DBSession类型:
+        self.DBSession = scoped_session(sessionmaker(bind=db_engine))
+        self.session = self.DBSession()
+
+    def __enter__(self):
+        return self
+
+    def __exit__(self, exc_type, exc_val, exc_tb):
+        try:
+            self.session.commit()
+        except:
+            self.session.rollback()
+        finally:
+            self.session.close()
+

app/config/errors.py

@@ -18,6 +18,7 @@ class Errors:
     INPUT_PARAMS_ERROR = '9006'
     REPEAT_BUY = '9007'
     PROD_NOPRICE = '9008'
+    NO_ORDERS = '9009'
 
     MSG = {
         TOKEN_INVALID: 'TOKEN失效',
@@ -27,5 +28,6 @@ class Errors:
         APPLE_VOCHER_USED: '该支付凭证已使用',
         INPUT_PARAMS_ERROR: '入参错误',
         REPEAT_BUY: '请勿重复购买商品',
-        PROD_NOPRICE: '商品未定价'
+        PROD_NOPRICE: '商品未定价',
+        NO_ORDERS: '未找到订单'
     }

app/controller/order.py

@@ -15,7 +15,7 @@ from app.api import app
 from app.controller.errorhandler import CustomFlaskErr
 from app.config.errors import Errors
 from app.service import order_service
-from app.api.engine import logging, tamp_user_session
+from app.api.engine import logging
 
 
 class TopUpOrder(Resource):
@@ -27,12 +27,13 @@ class TopUpOrder(Resource):
 
     def get(self):
         """."""
-        # raise CustomFlaskErr(Errors.USER_ALREADY_EXISTS)
         self.parser.add_argument('pageNumber', type=int, required=True)
         self.parser.add_argument('pageSize', type=int, required=True)
         args = self.parser.parse_args()
         args['user_id'] = request.user_id
         data = order_service.TopUpOrderService().get_order(args)
+        if not data.get('content', None):
+            raise CustomFlaskErr(Errors.NO_ORDERS)
         resp = request.return_success
         resp['attributes'] = data
         return resp
@@ -75,10 +76,10 @@ class ConsumeOrder(Resource):
         user_id = request.user_id
         args['user_id'] = request.user_id
         data = order_service.CurriculumOrderService().get_order(args)
+        if not data.get('content', None):
+            raise CustomFlaskErr(Errors.NO_ORDERS)
         resp = request.return_success
         resp['attributes'] = data
-        resp = make_response(resp)
-        resp.hearders = {'Content-Type': 'application/json;charset=UTF-8'}
         return resp
 
     def post(self):
@@ -206,10 +207,9 @@ class AllOrders(Resource):
         self.parser.add_argument('pageSize', type=int, required=True)
         args = self.parser.parse_args()
         args['user_id'] = request.user_id
-        try:
-            data = order_service.getAllOrders(args)
-        except InvalidRequestError:
-            tamp_user_session.rollback()
+        data = order_service.getAllOrders(args)
+        if not data.get('content', None):
+            raise CustomFlaskErr(Errors.NO_ORDERS)
         resp = request.return_success
         resp['attributes'] = data
         return resp