Merge pull request #23 from GenghisZahn/master

reedmclean · web-flow · commit a0f5997465e4 · 2018-08-09T09:07:27.000-05:00
Allow Groups in Context.cs
diff --git a/TinCan/Context.cs b/TinCan/Context.cs
@@ -43,13 +43,25 @@ public Context(JObject jobj)
             }
             if (jobj["instructor"] != null)
             {
-                // TODO: can be Group?
-                instructor = (Agent)jobj.Value<JObject>("instructor");
+                if (jobj["instructor"]["objectType"] != null && (String)jobj["instructor"]["objectType"] == Group.OBJECT_TYPE)
+                {
+                    instructor = (Group)jobj.Value<JObject>("instructor");
+                }
+                else
+                {
+                    instructor = (Agent)jobj.Value<JObject>("instructor");
+                }
             }
             if (jobj["team"] != null)
             {
-                // TODO: can be Group?
-                team = (Agent)jobj.Value<JObject>("team");
+                if (jobj["team"]["objectType"] != null && (String)jobj["team"]["objectType"] == Group.OBJECT_TYPE)
+                {
+                    team = (Group)jobj.Value<JObject>("team");
+                }
+                else
+                {
+                    team = (Agent)jobj.Value<JObject>("team");
+                }
             }
             if (jobj["contextActivities"] != null)
             {

Original file line number	Diff line number	Diff line change
`@@ -43,13 +43,25 @@ public Context(JObject jobj)`
`43`	`43`	`}`
`44`	`44`	`if (jobj["instructor"] != null)`
`45`	`45`	`{`
`46`		`- // TODO: can be Group?`
`47`		`- instructor = (Agent)jobj.Value<JObject>("instructor");`
	`46`	`+ if (jobj["instructor"]["objectType"] != null && (String)jobj["instructor"]["objectType"] == Group.OBJECT_TYPE)`
	`47`	`+ {`
	`48`	`+ instructor = (Group)jobj.Value<JObject>("instructor");`
	`49`	`+ }`
	`50`	`+ else`
	`51`	`+ {`
	`52`	`+ instructor = (Agent)jobj.Value<JObject>("instructor");`
	`53`	`+ }`
`48`	`54`	`}`
`49`	`55`	`if (jobj["team"] != null)`
`50`	`56`	`{`
`51`		`- // TODO: can be Group?`
`52`		`- team = (Agent)jobj.Value<JObject>("team");`
	`57`	`+ if (jobj["team"]["objectType"] != null && (String)jobj["team"]["objectType"] == Group.OBJECT_TYPE)`
	`58`	`+ {`
	`59`	`+ team = (Group)jobj.Value<JObject>("team");`
	`60`	`+ }`
	`61`	`+ else`
	`62`	`+ {`
	`63`	`+ team = (Agent)jobj.Value<JObject>("team");`
	`64`	`+ }`
`53`	`65`	`}`
`54`	`66`	`if (jobj["contextActivities"] != null)`
`55`	`67`	`{`