Minor changes to support 11/6/2016 certification suite.

andyfmiller · Nov 6, 2016 · 3f7c354 · 3f7c354
1 parent 8364d69
commit 3f7c354
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 10 deletions.
diff --git a/ConsumerCertification/ConsumerCertification.csproj b/ConsumerCertification/ConsumerCertification.csproj
@@ -174,12 +174,13 @@
     <Content Include="Content\bootstrap.css.map" />
     <Content Include="Content\bootstrap-theme.min.css.map" />
     <Content Include="Content\bootstrap-theme.css.map" />
-    <None Include="Properties\PublishProfiles\ConsumerCertification.pubxml" />
     <Content Include="Scripts\bootstrap.js" />
     <Content Include="Scripts\bootstrap.min.js" />
     <Content Include="Scripts\jquery-2.2.1.js" />
     <Content Include="Scripts\jquery-2.2.1.min.js" />
     <Content Include="Scripts\jquery-2.2.1.min.map" />
+    <None Include="Properties\PublishProfiles\ConsumerCertification - FTP.pubxml" />
+    <None Include="Properties\PublishProfiles\ConsumerCertification - Web Deploy.pubxml" />
     <None Include="Scripts\jquery.validate-vsdoc.js" />
     <Content Include="Scripts\jquery.validate.js" />
     <Content Include="Scripts\jquery.validate.min.js" />

diff --git a/ConsumerCertification/Controllers/Lti1Controller.cs b/ConsumerCertification/Controllers/Lti1Controller.cs
@@ -200,7 +200,7 @@ public ActionResult LtiLaunch(Lti1TestLaunch model, int link)
                     request.LisPersonNameFamily = Student.FamilyName;
                     request.LisPersonNameGiven = Student.GivenName;
                     request.LisPersonSourcedId = Student.UserId;
-                    request.LisResultSourcedId = Student.UserId;
+                    request.LisResultSourcedId = $"{Student.UserId}-{Course1.Links[0].LinkId}";
                     request.UserId = Student.UserId;
                     request.UserName = Student.Username;
                     request.Roles = Role.Learner.ToString();
@@ -217,7 +217,7 @@ public ActionResult LtiLaunch(Lti1TestLaunch model, int link)
                     request.LisPersonNameFamily = Student.FamilyName;
                     request.LisPersonNameGiven = Student.GivenName;
                     request.LisPersonSourcedId = Student.UserId;
-                    request.LisResultSourcedId = Student.UserId;
+                    request.LisResultSourcedId = $"{Student.UserId}-{Course1.Links[1].LinkId}";
                     request.UserId = Student.UserId;
                     request.UserName = Student.Username;
                     request.Roles = Role.Learner.ToString();
@@ -234,7 +234,7 @@ public ActionResult LtiLaunch(Lti1TestLaunch model, int link)
                     //request.LisPersonNameFamily = Student.FamilyName;
                     //request.LisPersonNameGiven = Student.GivenName;
                     request.LisPersonSourcedId = Student.UserId;
-                    request.LisResultSourcedId = Student.UserId;
+                    request.LisResultSourcedId = $"{Student.UserId}-{Course2.Links[0].LinkId}";
                     request.UserId = Student.UserId;
                     request.UserName = Student.Username;
                     request.Roles = Role.Learner.ToString();

diff --git a/ConsumerCertification/Controllers/OutcomesController.cs b/ConsumerCertification/Controllers/OutcomesController.cs
@@ -20,8 +20,7 @@ public class OutcomesController : OutcomesControllerBase
         /// <returns>True if the score is deleted.</returns>
         protected override bool DeleteResult(string lisResultSourcedId)
         {
-            // Only valid SourcedId values are "1", "2", and "3" (see Lti1Controller)
-            if (lisResultSourcedId.Equals("1") || lisResultSourcedId.Equals("2") || lisResultSourcedId.Equals("3"))
+            if (LisResultSourcedIdIsValid(lisResultSourcedId))
             {
                 _lisResult = null;
                 return true;
@@ -36,8 +35,7 @@ protected override bool DeleteResult(string lisResultSourcedId)
         /// <returns>The LisResult representing the score.</returns>
         protected override LisResult ReadResult(string lisResultSourcedId)
         {
-            // Only valid SourcedId values are "1", "2", and "3" (see Lti1Controller)
-            if (lisResultSourcedId.Equals("1") || lisResultSourcedId.Equals("2") || lisResultSourcedId.Equals("3"))
+            if (LisResultSourcedIdIsValid(lisResultSourcedId))
             {
                 if (_lisResult == null || !lisResultSourcedId.Equals(_lisResult.SourcedId, StringComparison.InvariantCultureIgnoreCase))
                 {
@@ -55,8 +53,7 @@ protected override LisResult ReadResult(string lisResultSourcedId)
         /// <returns>True if the score is saved.</returns>
         protected override bool ReplaceResult(LisResult result)
         {
-            // Only valid SourcedId values are "1", "2", and "3" (see Lti1Controller)
-            if (result.SourcedId.Equals("1") || result.SourcedId.Equals("2") || result.SourcedId.Equals("3"))
+            if (LisResultSourcedIdIsValid(result.SourcedId))
             {
                 if (_lisResult == null)
                 {
@@ -69,5 +66,22 @@ protected override bool ReplaceResult(LisResult result)
             }
             return false;
         }
+
+        private bool LisResultSourcedIdIsValid(string lisResultSourcedId)
+        {
+            // LisResultSourcedId is {userId}-{linkId} (see Lti1Controller)
+            var sourcedId = lisResultSourcedId.Split('-');
+            if (sourcedId.Length < 2)
+            {
+                return false;
+            }
+            // Only valid userIds are 1, 2, 3
+            if (!sourcedId[0].Equals("1") && !sourcedId[0].Equals("2") && !sourcedId[0].Equals("3"))
+            {
+                return false;
+            }
+            // Only valid linkIds are link1, link2
+            return sourcedId[1].Equals("link1") || sourcedId[1].Equals("link2");
+        }
     }
 }