Merge ff2cc8b into b3a7470

TOMToolkit · Sep 27, 2023 · 2ed9bf0 · 2ed9bf0
2 parents b3a7470 + ff2cc8b
commit 2ed9bf0
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/tom_alerts/brokers/alerce.py b/tom_alerts/brokers/alerce.py
@@ -308,7 +308,7 @@ def _clean_parameters(self, parameters):
     def _request_alerts(self, parameters):
         payload = self._clean_parameters(parameters)
         logger.log(msg=f'Fetching alerts from ALeRCE with payload {payload}', level=logging.INFO)
-        args = urlencode(self._clean_parameters(parameters))
+        args = urlencode(payload)
         response = requests.get(f'{ALERCE_SEARCH_URL}/objects/?count=false&{args}')
         response.raise_for_status()
         return response.json()
@@ -317,8 +317,8 @@ def fetch_alerts(self, parameters):
         response = self._request_alerts(parameters)
         alerts = response['items']
         broker_feedback = ''
-        if len(alerts) > 0 and response['page'] < parameters.get('max_pages', 1):
-            parameters['page'] = response.get('page') + 1
+        if len(alerts) > 0 and parameters.get('page', 1) < parameters.get('max_pages', 1):
+            parameters['page'] = parameters.get('page', 1) + 1
             alerts += self.fetch_alerts(parameters)[0]
         return iter(alerts), broker_feedback