Added fallback detection to the SmartThingsManager.

Author: andrewsayre

pysmartapp/__init__.py

@@ -1,4 +1,4 @@
 """Define the pysmartapp package."""
 
 __title__ = "pysmartapp"
-__version__ = "0.2.0"
+__version__ = "0.2.1"

pysmartapp/consts.py

@@ -11,3 +11,4 @@
 LIFECYCLE_UNINSTALL = 'UNINSTALL'
 EVENT_TYPE_DEVICE = 'DEVICE_EVENT'
 EVENT_TYPE_TIMER = 'TIMER_EVENT'
+SETTINGS_APP_ID = 'appId'

pysmartapp/smartapp.py

@@ -3,7 +3,7 @@
 import logging
 from typing import Dict, Sequence
 
-from .consts import LIFECYCLE_PING
+from .consts import LIFECYCLE_PING, SETTINGS_APP_ID
 from .errors import SmartAppNotRegisteredError
 from .eventhook import EventHook
 from .utilities import create_request
@@ -124,6 +124,9 @@ def handle_request(self, data: dict, headers: dict = None,
             resp = req.process(self, headers, validate_signature)
         else:
             smartapp = self._installed_apps.get(req.installed_app_id)
+            if not smartapp and SETTINGS_APP_ID in req.settings:
+                # try finding using fallback...
+                smartapp = self._smartapps.get(req.settings[SETTINGS_APP_ID])
             if not smartapp:
                 raise SmartAppNotRegisteredError(req.installed_app_id)
             resp = req.process(smartapp, headers, validate_signature)

tests/fixtures/config_init_request.json

@@ -13,6 +13,6 @@
     }
   },
   "settings": {
-
+    "appId": "f6c071aa-6ae7-463f-b0ad-8620ac23140f"
   }
 }

tests/test_smartapp.py

@@ -352,6 +352,27 @@ def test_handle_request_not_registered():
         # Assert
         assert e_info.value.installed_app_id == INSTALLED_APP_ID
 
+    @staticmethod
+    def test_handle_request_fallback():
+        """Tests processing a request when no SmartApp has been registered."""
+        # Arrange
+        request = get_fixture("config_init_request")
+        manager = SmartAppManager()
+        smartapp = SmartApp("Test Name", "Test Description", [])
+        smartapp.app_id = APP_ID
+        manager.register(smartapp)
+        fired = False
+
+        def handler(req, resp, app):
+            nonlocal fired
+            fired = True
+            assert app == smartapp
+        manager.on_config += handler
+        # Act
+        manager.handle_request(request, None, False)
+        # Assert
+        assert fired
+
     @staticmethod
     def test_register():
         """Test register"""