Merge pull request #26 from Scandie/a912343845581673_update_streams_view

A912343845581673 update streams view

openprocurement/chronograph/constants.py

@@ -19,6 +19,7 @@
 # value should be greater than SMOOTHING_MIN and SMOOTHING_REMIN
 SMOOTHING_MAX = 300
 NOT_CLASSIC_AUCTIONS = ['dgfInsider', 'sellout.insider']
+STREAMS_KEYS = ['streams', 'dutch_streams', 'texas_streams']
 DEFAULT_STREAMS_DOC = {
     '_id': STREAMS_ID,
     'streams': 10,

openprocurement/chronograph/tests/test.py

@@ -90,6 +90,10 @@ def test_streams(self):
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json, DEFAULT_STREAMS_DOC['dutch_streams'])
 
+        response = self.app.get('/streams?texas_streams=true')
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json, DEFAULT_STREAMS_DOC['texas_streams'])
+
         # POST /streams
         response = self.app.post('/streams', {'streams': 20})
         self.assertEqual(response.status, '200 OK')
@@ -110,15 +114,30 @@ def test_streams(self):
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json, 21)
 
+        # POST /streams
+        response = self.app.post('/streams', {'texas_streams': 42})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json, True)
+
+        # GET /streams
+        response = self.app.get('/streams?texas_streams=true')
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json, 42)
+
+
         # POST /streams
         response = self.app.post('/streams', {'streams': -20})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json, False)
         response = self.app.post('/streams', {'dutch_streams': -20})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json, False)
+        response = self.app.post('/streams', {'texas_streams': -20})
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json, False)
         response = self.app.post('/streams', {'streams': 11,
-                                              'dutch_streams': 12})
+                                              'dutch_streams': 12,
+                                              'texas_streams': 13})
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json, True)
 
@@ -131,6 +150,10 @@ def test_streams(self):
         self.assertEqual(response.status, '200 OK')
         self.assertEqual(response.json, 12)
 
+        response = self.app.get('/streams?texas_streams=true')
+        self.assertEqual(response.status, '200 OK')
+        self.assertEqual(response.json, 13)
+
         # POST /streams
         response = self.app.patch('/streams')
         self.assertEqual(response.status, '200 OK')

openprocurement/chronograph/utils.py

@@ -107,25 +107,19 @@ def delete_holiday(db, day):
         db.save(calendar)
 
 
-def get_streams(db, streams_id=STREAMS_ID, classic_auction=True):
+def get_streams(db, stream_key='streams', streams_id=STREAMS_ID):
     """
     Backward compatibility version of managers.BaseAuctionsManager method,
     which is left due to views.streams_view dependency
     """
     streams = db.get(streams_id, deepcopy(DEFAULT_STREAMS_DOC))
-    if classic_auction:
-        return streams.get('streams', DEFAULT_STREAMS_DOC['streams'])
-    else:
-        return streams.get('dutch_streams',
-                           DEFAULT_STREAMS_DOC['dutch_streams'])
+    return streams.get(stream_key, DEFAULT_STREAMS_DOC[stream_key])
 
 
-def set_streams(db, streams=None, dutch_streams=None, streams_id=STREAMS_ID):
+def set_streams(db, streams=None, stream_key=None, streams_id=STREAMS_ID):
     streams_doc = db.get(streams_id, deepcopy(DEFAULT_STREAMS_DOC))
-    if streams is not None:
-        streams_doc['streams'] = streams
-    if dutch_streams is not None:
-        streams_doc['dutch_streams'] = dutch_streams
+    if streams is not None and stream_key is not None:
+        streams_doc[stream_key] = streams
     db.save(streams_doc)
 
 

openprocurement/chronograph/views.py

@@ -1,4 +1,6 @@
 from pyramid.view import view_config
+
+from openprocurement.chronograph.constants import STREAMS_KEYS
 from openprocurement.chronograph.scheduler import (
     get_calendar,
     recheck_auction,
@@ -63,22 +65,20 @@ def calendar_entry_view(request):
 @view_config(route_name='streams', renderer='json')
 def streams_view(request):
     if request.method == 'GET':
-        classic_auction = request.params.get('dutch_streams', '') not in [
-            'True', 'true', 'y', 'yes', 'Yes'
-        ]
-        return get_streams(request.registry.db,
-                           classic_auction=classic_auction)
+        for stream_key in STREAMS_KEYS:
+            if request.params.get(stream_key, '') in [
+                'True', 'true', 'y', 'yes', 'Yes'
+            ]:
+                break
+        else:
+            stream_key = 'streams'
+        return get_streams(request.registry.db, stream_key)
     elif request.method == 'POST':
-        streams = request.params.get('streams', '')
-        dutch_streams = request.params.get('dutch_streams', '')
         result = False
-        if streams and streams.isdigit():
-            set_streams(request.registry.db,
-                        streams=int(streams))
-            result = True
-        if dutch_streams and dutch_streams.isdigit():
-            set_streams(request.registry.db,
-                        dutch_streams=int(dutch_streams))
-            result = True
+        for stream_key in STREAMS_KEYS:
+            streams = request.params.get(stream_key, '')
+            if streams and streams.isdigit():
+                set_streams(request.registry.db, int(streams), stream_key)
+                result = True
         return result
     return False