fix: clear only the node_id in the router record

Closes #401
mozilla-services · Mar 11, 2016 · d3cdee3 · d3cdee3
1 parent c233a20
commit d3cdee3
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 2 deletions.
diff --git a/autopush/db.py b/autopush/db.py
@@ -671,7 +671,7 @@ def clear_node(self, item):
             cond = "(node_id = :node) and (connected_at = :conn)"
             conn.put_item(
                 self.table.table_name,
-                item=item.get_raw_keys(),
+                item=self.encode(item),
                 condition_expression=cond,
                 expression_attribute_values=self.encode({
                     ":node": node_id,

diff --git a/autopush/tests/test_db.py b/autopush/tests/test_db.py
@@ -478,18 +478,23 @@ def test_node_clear(self):
 
         # Register a node user
         router.register_user(dict(uaid=dummy_uaid, node_id="asdf",
-                                  connected_at=1234))
+                                  connected_at=1234,
+                                  router_key="webpush"))
 
         # Verify
         user = router.get_uaid(dummy_uaid)
         eq_(user["node_id"], "asdf")
+        eq_(user["connected_at"], 1234)
+        eq_(user["router_key"], "webpush")
 
         # Clear
         router.clear_node(user)
 
         # Verify
         user = router.get_uaid(dummy_uaid)
         eq_(user.get("node_id"), None)
+        eq_(user["connected_at"], 1234)
+        eq_(user["router_key"], "webpush")
 
     def test_node_clear_fail(self):
         r = get_router_table()