Merge pull request #53 from HumanDynamics/fix/get-meeting

Support both data log version 2.0 and 2.1

Author: OrenLederman

openbadge-server/openbadge/models.py

@@ -468,15 +468,24 @@ def get_meta(self):
 
         meta["members"] = []
 
+        log_version = meta["data"]["log_version"]
         # seek to beginning in case it was written out of order
         f.seek(0)
         # the following few lines should be members joining
         line = simplejson.loads(f.readline())
         while "received" not in line["type"] and "ended" not in line["type"]:
             # make sure we're getting a member change event
             # ANYTHING IS POSSIBLE
-            if "member" in line["type"] and line["data"]["change"] == "join":
+            if log_version == "2.0" and line["type"] == "member changed" and line["data"]["change"] == "join":
+                # in log version 2.0 the type is "member changed"
+                # and you need to check the `change` property
                 meta["members"].append(line["data"]["member_key"])
+            elif log_version == "2.1" and line["type"] == "member joined":
+                # in log version 2.1 the type is just "member joined"
+                # and it has no `change` property
+                # also it uses `key` instead of `member_key`
+                meta["members"].append(line["data"]["key"])
+
             try:
                 line = simplejson.loads(f.readline())
                 if not line: break