feat: allow context property to be omitted for background functions (GoogleCloudPlatform#34)

bshaffer · web-flow · commit a460291a47e8 · 2020-06-15T11:33:29.000-07:00
diff --git a/src/BackgroundFunctionWrapper.php b/src/BackgroundFunctionWrapper.php
@@ -41,7 +41,15 @@ public function execute(ServerRequestInterface $request): ResponseInterface
         }
 
         $data = $event['data'];
-        $context = Context::fromArray($event['context']);
+
+        if (array_key_exists('context', $event)) {
+            $context = $event['context'];
+        } else {
+            unset($event['data']);
+            $context = $event;
+        }
+
+        $context = Context::fromArray($context);
         call_user_func($this->function, $data, $context);
 
         return new Response();
diff --git a/tests/BackgroundFunctionWrapperTest.php b/tests/BackgroundFunctionWrapperTest.php
@@ -47,7 +47,7 @@ public function testEmptyRequestBody()
         $backgroundFunctionWrapper->execute($request);
     }
 
-    public function testHttpBackgroundFunctionWrapper()
+    public function testWithContextProperty()
     {
         $backgroundFunctionWrapper = new BackgroundFunctionWrapper([$this, 'invokeThis']);
         $request = new ServerRequest('GET', '/', [], json_encode([
@@ -63,6 +63,20 @@ public function testHttpBackgroundFunctionWrapper()
         $this->assertTrue(self::$functionCalled);
     }
 
+    public function testWrapperWithoutContextProperty()
+    {
+        $backgroundFunctionWrapper = new BackgroundFunctionWrapper([$this, 'invokeThis']);
+        $request = new ServerRequest('GET', '/', [], json_encode([
+            'data' => 'foo',
+            'eventId' => 'abc',
+            'timestamp' => 'def',
+            'eventType' => 'ghi',
+            'resource' => 'jkl',
+        ]));
+        $backgroundFunctionWrapper->execute($request);
+        $this->assertTrue(self::$functionCalled);
+    }
+
     public function invokeThis($data, Context $context)
     {
         self::$functionCalled = true;
