Merge pull request #40 from okdtsk/support_bm

Add DeviceMessage property to BeaconEvent

Author: be-hase

README.rst

@@ -523,6 +523,7 @@ Event
     - beacon: Beacon
         - type
         - hwid
+        - device_message
 
 Source
 ^^^^^^

examples/flask-kitchensink/app.py

@@ -250,7 +250,8 @@ def handle_postback(event):
 def handle_beacon(event):
     line_bot_api.reply_message(
         event.reply_token,
-        TextSendMessage(text='Got beacon event. hwid=' + event.beacon.hwid))
+        TextSendMessage(text='Got beacon event. hwid={}, device_message={}'
+                             .format(event.beacon.hwid, event.beacon.device_message)))
 
 
 if __name__ == "__main__":

linebot/models/events.py

@@ -282,14 +282,16 @@ class Beacon(Base):
     https://devdocs.line.me/en/#beacon-event
     """
 
-    def __init__(self, type=None, hwid=None, **kwargs):
+    def __init__(self, type=None, hwid=None, dm=None, **kwargs):
         """__init__ method.
 
         :param str type: Type of beacon event
         :param str hwid: Hardware ID of the beacon that was detected
+        :param str dm: Optional. Device message of beacon that was detected in bytearray
         :param kwargs:
         """
         super(Beacon, self).__init__(**kwargs)
 
         self.type = type
         self.hwid = hwid
+        self.device_message = bytearray.fromhex(dm) if dm is not None else None

tests/test_webhook.py

@@ -204,6 +204,20 @@ def test_parse(self):
         self.assertEqual(events[11].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
         self.assertEqual(events[11].beacon.hwid, 'd41d8cd98f')
         self.assertEqual(events[11].beacon.type, 'enter')
+        self.assertEqual(events[11].beacon.device_message, None)
+
+        # BeaconEvent, SourceUser (with device message)
+        self.assertIsInstance(events[12], BeaconEvent)
+        self.assertEqual(events[12].reply_token, 'nHuyWiB7yP5Zw52FIkcQobQuGDXCTA')
+        self.assertEqual(events[12].type, 'beacon')
+        self.assertEqual(events[12].timestamp, 1462629479859)
+        self.assertIsInstance(events[12].source, SourceUser)
+        self.assertEqual(events[12].source.type, 'user')
+        self.assertEqual(events[12].source.user_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[12].source.sender_id, 'U206d25c2ea6bd87c17655609a1c37cb8')
+        self.assertEqual(events[12].beacon.hwid, 'd41d8cd98f')
+        self.assertEqual(events[12].beacon.type, 'enter')
+        self.assertEqual(events[12].beacon.device_message, bytearray(b'\x124Vx\x90\xab\xcd\xef'))
 
 
 class TestWebhookHandler(unittest.TestCase):
@@ -271,6 +285,7 @@ def test_handler(self):
         self.assertEqual(self.calls[9], 'default leave')
         self.assertEqual(self.calls[10], '6 postback')
         self.assertEqual(self.calls[11], '7 beacon')
+        self.assertEqual(self.calls[12], '7 beacon')
 
 
 if __name__ == '__main__':

tests/text/webhook.json

@@ -131,5 +131,18 @@
       "hwid": "d41d8cd98f",
       "type": "enter"
     }
+  }, {
+    "replyToken": "nHuyWiB7yP5Zw52FIkcQobQuGDXCTA",
+    "type": "beacon",
+    "timestamp": 1462629479859,
+    "source": {
+      "type": "user",
+      "userId": "U206d25c2ea6bd87c17655609a1c37cb8"
+    },
+    "beacon": {
+      "hwid": "d41d8cd98f",
+      "type": "enter",
+      "dm": "1234567890abcdef"
+    }
   }]
 }