fix for issue #667 (#668)

* fix for issue 667 * Update RELEASE_NOTES.md * Fix for issue #667 * Resolved TODO in test_timescale_types.py * Update RELEASE_NOTES.md
orchestracities · Sep 8, 2022 · af8877c · af8877c
1 parent 1c3ce68
commit af8877c
Show file tree

Hide file tree

Showing 3 changed files with 19 additions and 20 deletions.
diff --git a/RELEASE_NOTES.md b/RELEASE_NOTES.md
@@ -23,6 +23,7 @@
 - Added logs in src/wq/core/task.py (#662)
 - Replaced entity with getter (#652)
 - Resolved TODO in Dockerfile (#680)
+- Resolved TODO at src/reporter/tests/test_timescale_types.py (#667)
 
 ### Bug fixes
 

diff --git a/src/reporter/tests/test_timescale_types.py b/src/reporter/tests/test_timescale_types.py
@@ -12,7 +12,7 @@
 from utils.kvt import merge_dicts
 
 from .geo_queries_fixture import query_1t1ena
-from .utils import notify_url
+from .utils import notify_url, insert_entities
 from src.utils.tests.tenant import gen_tenant_id
 
 
@@ -109,25 +109,6 @@ def gen_entity(entity_id: int,
 # Similar to gen_entity in test_timescale_insert module in translators.tests.
 
 
-def insert_entities(entities: Union[List[dict], dict],
-                    service: str = None, service_path: str = None,
-                    expected_status_code=200) -> Response:
-    headers = {
-        'Content-Type': 'application/json',
-        'fiware-Service': service,
-        'fiware-ServicePath': service_path
-    }
-    body = json.dumps({
-        'data': entities if isinstance(entities, List) else [entities]
-    })
-    response = requests.post(notify_url(), data=body, headers=headers)
-    assert response.status_code == expected_status_code
-    return response
-# TODO: factor out?
-# This function could sit in a separate module and be shared across all
-# reporter tests.
-
-
 def entity_name_value_pairs(entity: dict) -> dict:
     """
     Transform an NGSI entity ``e`` into the format::

diff --git a/src/reporter/tests/utils.py b/src/reporter/tests/utils.py
@@ -6,6 +6,7 @@
 from typing import Callable, Iterable, List, Optional, Tuple, Union
 import re
 import random
+from requests import Response
 
 from translators.factory import translator_for
 from translators.sql_translator import ENTITY_ID_COL, TENANT_PREFIX, \
@@ -96,6 +97,22 @@ def get_notification_different_types(
     }
 
 
+def insert_entities(entities: Union[List[dict], dict],
+                    service: str = None, service_path: str = None,
+                    expected_status_code=200) -> Response:
+    headers = {
+        'Content-Type': 'application/json',
+        'fiware-Service': service,
+        'fiware-ServicePath': service_path
+    }
+    body = json.dumps({
+        'data': entities if isinstance(entities, List) else [entities]
+    })
+    response = requests.post(notify_url(), data=body, headers=headers)
+    assert response.status_code == expected_status_code
+    return response
+
+
 def send_notifications(service, notifications, service_path='/'):
     assert isinstance(notifications, list)
     h = {'Content-Type': 'application/json'}