v1.6.5 fix mock data bug and event api bug(#143)

lyrebird/db/database_server.py

@@ -68,12 +68,19 @@ def session(self):
 
     def get_event(self, channel_rules, offset=0, limit=20):
         session = self._scoped_session()
-        result = session.query(Event) \
-            .order_by(Event.id.desc()) \
-            .filter(Event.channel.in_(channel_rules)) \
-            .offset(offset) \
-            .limit(limit) \
-            .all()
+        if len(channel_rules) == 0:
+            result = session.query(Event) \
+                .order_by(Event.id.desc()) \
+                .offset(offset) \
+                .limit(limit) \
+                .all()
+        else:
+            result = session.query(Event) \
+                .order_by(Event.id.desc()) \
+                .filter(Event.channel.in_(channel_rules)) \
+                .offset(offset) \
+                .limit(limit) \
+                .all()
         self._scoped_session.remove()
         return result
 

lyrebird/mock/blueprints/apis/event.py

@@ -7,7 +7,10 @@ class Event(Resource):
 
     def get(self, channel=None, page=0):
         db = application.server['db']
-        events = db.get_event(channel.split('+'), offset=page*20)
+        channel_rules = []
+        if channel:
+            channel_rules = channel.split('+')
+        events = db.get_event(channel_rules, offset=page*20)
         result = []
         for event in events:
             event_str = event.json()

lyrebird/mock/blueprints/apis/flow.py

@@ -25,9 +25,9 @@ def get(self):
         req_list = []
         for item in all_items:
             info = dict(
-                id=item['id'], 
+                id=item['id'],
                 size=item['size'],
-                duration=item['duration'], 
+                duration=item['duration'],
                 start_time=item['start_time'],
                 request=dict(
                     url=item['request'].get('url'),
@@ -41,7 +41,7 @@ def get(self):
                     )if item.get('response') else {}
                 )
             req_list.append(info)
-        def gen():        
+        def gen():
             yield json.dumps(req_list)
         return context.make_streamed_response(gen)
 
@@ -66,11 +66,13 @@ def post(self):
         activated_group = dm.groups.get(dm.activated_group_id)
         if not activated_group:
             return context.make_fail_response('Not activate any group')
-        
+
         flow_list = context.application.cache.items()
         for flow in flow_list:
             if flow['id'] in _ids:
                 data = activated_group.create_data(flow=flow)
                 data.save()
 
+        dm.router.switch_group(activated_group)
+
         return context.make_ok_response()

lyrebird/mock/blueprints/apis/mock.py

@@ -119,7 +119,7 @@ def delete(self, group_id=None, data_id=None):
             return context.make_fail_response('Group not found')
         ids = request.json.get('ids')
         for data_id in ids:
-            _group.delete_data(data_id)        
+            _group.delete_data(data_id)
         return context.make_ok_response()
 
 

lyrebird/version.py

@@ -1,3 +1,3 @@
-IVERSION = (1, 6, 4)
+IVERSION = (1, 6, 5)
 VERSION = ".".join(str(i) for i in IVERSION)
 LYREBIRD = "Lyrebird " + VERSION