Upgrade API version to v2

Author: prijendev

mambu_tests/tap_generators/test_audit_trail_generator.py

@@ -24,9 +24,9 @@ def test_audit_trail_generator_endpoint_config_init(utc_now_mock):
 
     generator = generators[0]
 
-    assert generator.endpoint_path == 'v1/events'
+    assert generator.endpoint_path == 'v2/events'
     assert generator.endpoint_api_method == "GET"
-    assert generator.endpoint_api_version == "v1"
+    assert generator.endpoint_api_version == "v2"
     assert generator.endpoint_api_key_type == "audit"
     assert generator.endpoint_params == {
         "sort_order": "asc",

tap_mambu/helpers/datetime_utils.py

@@ -1,8 +1,12 @@
+import singer
 from pytz import timezone
 from datetime import datetime
 from tap_mambu import MambuClient
+from tap_mambu.helpers.client import MambuForbiddenError
 import dateutil.parser
 
+LOGGER = singer.get_logger()
+
 
 _timezone = None
 _datetime_formats = [
@@ -22,11 +26,17 @@
 ]
 
 
-def get_timezone_info(client: MambuClient):
+def get_timezone_info(client: MambuClient, config_timezone: str = None):
     global _timezone
-    response = client.request(method="GET", path="settings/organization", version="v1")
-    _timezone = timezone(response.get("timeZoneID"))
-
+    try:
+        response = client.request(method="GET", path="setup/organization", version="v2")
+        _timezone = timezone(response.get("timeZoneID"))
+    except MambuForbiddenError:
+        if config_timezone:
+            LOGGER.warning("Could not get timezone information from Mambu endpoint, using config timezone")
+            _timezone = timezone(config_timezone)
+        else:
+            raise RuntimeError("Could not get timezone information from Mambu endpoint. Please provide valid timezone in config(e.g. US/Pacific).")
 
 def localize(dttm: datetime) -> datetime:
     if _timezone is None:

tap_mambu/sync.py

@@ -35,7 +35,7 @@ def sync_all_streams(client, config, catalog, state):
     from .tap_generators.child_generator import ChildGenerator
     from .tap_processors.child_processor import ChildProcessor
 
-    get_timezone_info(client)
+    get_timezone_info(client, config_timezone=config.get("timezone"))
 
     selected_streams = get_selected_streams(catalog)
     LOGGER.info('selected_streams: {}'.format(selected_streams))

tap_mambu/tap_generators/audit_trail_generator.py

@@ -10,7 +10,7 @@
 class AuditTrailGenerator(TapGenerator):
     def _init_endpoint_config(self):
         super(AuditTrailGenerator, self)._init_endpoint_config()
-        self.endpoint_path = "v1/events"
+        self.endpoint_path = "v2/events"
         self.endpoint_api_method = "GET"
         self.endpoint_api_version = "v2"
         self.endpoint_api_key_type = "audit"

tests/base.py

@@ -250,6 +250,7 @@ def get_properties(self, original_properties=True):
             'username': os.environ['TAP_MAMBU_USERNAME'],
             'subdomain': os.environ['TAP_MAMBU_SUBDOMAIN'],
             'page_size': '90',
+            'timezone': 'US/Pacific',
             'window_size': 30
         }
 

tests/unittests/test_client.py

@@ -53,8 +53,8 @@ def test_client_check_access_api_key(mock_requests_session_get):
     assert client.base_url == base_url
     assert client.page_size == DEFAULT_PAGE_SIZE
 
-    mock_requests_session_get.assert_called_once_with(url=f'{base_url}/settings/organization',
-                                                      headers={'Accept': 'application/vnd.mambu.v1+json',
+    mock_requests_session_get.assert_called_once_with(url=f'{base_url}/users',
+                                                      headers={'Accept': 'application/vnd.mambu.v2+json',
                                                                'User-Agent': 'MambuTap-User_Agent_Test'})
 
 
@@ -77,8 +77,8 @@ def test_client_check_access_user_pass(mock_requests_session_get):
     assert client.base_url == base_url
     assert client.page_size == 100
 
-    mock_requests_session_get.assert_called_once_with(url=f'{base_url}/settings/organization',
-                                                      headers={'Accept': 'application/vnd.mambu.v1+json',
+    mock_requests_session_get.assert_called_once_with(url=f'{base_url}/users',
+                                                      headers={'Accept': 'application/vnd.mambu.v2+json',
                                                                'User-Agent': 'MambuTap'})