Restructured Plugin API Responses

ProjektAdLer · Aug 26, 2024 · 47d4136 · 47d4136
1 parent 933c5a8
commit 47d4136
Show file tree

Hide file tree

Showing 15 changed files with 62 additions and 52 deletions.
diff --git a/AdLerBackend.API.UnitTests/BackendConfigExtentionTests.cs b/AdLerBackend.API.UnitTests/BackendConfigExtentionTests.cs
@@ -1,11 +1,11 @@
 using System.Configuration;
-using AdLerBackend.API;
 using AdLerBackend.Application.Configuration;
-using Microsoft.AspNetCore.Mvc.DataAnnotations;
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.Configuration.Memory;
 using Microsoft.Extensions.DependencyInjection;
 
+namespace AdLerBackend.API.UnitTests;
+
 [TestFixture]
 public class BackendConfigExtensionsTests
 {

diff --git a/AdLerBackend.Infrastructure.UnitTests/DTOTests/DtosTest.cs b/AdLerBackend.Infrastructure.UnitTests/DTOTests/DtosTest.cs
@@ -1,4 +1,6 @@
 using AdLerBackend.Infrastructure.Moodle.ApiResponses;
+using AdLerBackend.Infrastructure.Moodle.ApiResponses.Common;
+using AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
 using AutoBogus;
 using FluentAssertions;
 using Force.DeepCloner;

diff --git a/AdLerBackend.Infrastructure.UnitTests/Moodle/MoodleWebApi.test.cs b/AdLerBackend.Infrastructure.UnitTests/Moodle/MoodleWebApi.test.cs
@@ -4,6 +4,8 @@
 using AdLerBackend.Application.Configuration;
 using AdLerBackend.Infrastructure.Moodle;
 using AdLerBackend.Infrastructure.Moodle.ApiResponses;
+using AdLerBackend.Infrastructure.Moodle.ApiResponses.Common;
+using AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 using Newtonsoft.Json;

diff --git a/AdLerBackend.Infrastructure/Moodle/ApiResponses/AdaptivityModuleAnsweredResponse.cs b/AdLerBackend.Infrastructure/Moodle/ApiResponses/AdaptivityModuleAnsweredResponse.cs
diff --git a/...e/Moodle/ApiResponses/ResponseWithData.cs → ...e/ApiResponses/Common/ResponseWithData.cs b/...e/Moodle/ApiResponses/ResponseWithData.cs → ...e/ApiResponses/Common/ResponseWithData.cs
@@ -1,4 +1,4 @@
-namespace AdLerBackend.Infrastructure.Moodle.ApiResponses;
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.Common;
 
 internal class ResponseWithData<T>
 {

diff --git a/...dle/ApiResponses/ResponseWithDataArray.cs → ...Responses/Common/ResponseWithDataArray.cs b/...dle/ApiResponses/ResponseWithDataArray.cs → ...Responses/Common/ResponseWithDataArray.cs
@@ -1,4 +1,4 @@
-namespace AdLerBackend.Infrastructure.Moodle.ApiResponses;
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.Common;
 
 internal class ResponseWithDataArray<T>
 {

diff --git a/...structure/Moodle/ApiResponses/PluginResponses/PluginAdaptivityAnsweredQuestionResponse.cs b/...structure/Moodle/ApiResponses/PluginResponses/PluginAdaptivityAnsweredQuestionResponse.cs
@@ -0,0 +1,13 @@
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
+
+public class PluginAdaptivityAnsweredQuestionResponse
+{
+    public AdaptivityModuleInfo Module { get; set; }
+    public IList<PluginAdaptivityTaskResponse> Tasks { get; set; }
+    public IList<PluginAdaptivityQuestionsDetailResponse.PluginAdaptivityQuestion> Questions { get; set; }
+
+    public class AdaptivityModuleInfo
+    { 
+        public string Status { get; set; }
+    }
+}
diff --git a/...esponses/PluginQuestionsDetailResponse.cs → ...luginAdaptivityQuestionsDetailResponse.cs b/...esponses/PluginQuestionsDetailResponse.cs → ...luginAdaptivityQuestionsDetailResponse.cs
@@ -1,9 +1,10 @@
-using JetBrains.Annotations;
+using System.Text.Json.Serialization;
+using JetBrains.Annotations;
 
-namespace AdLerBackend.Infrastructure.Moodle.ApiResponses;
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
 
 [UsedImplicitly]
-public class PluginQuestionsDetailResponse
+public class PluginAdaptivityQuestionsDetailResponse
 {
     public List<PluginAdaptivityQuestion> Questions { get; set; }
 
@@ -13,6 +14,8 @@ public class PluginAdaptivityQuestion
         public string Uuid { get; set; }
 
         public string Status { get; set; }
+        [JsonPropertyName("status_best_try")]
+        public string StatusBestTry { get; set; }
         public string? Answers { get; set; }
     }
 }
diff --git a/...ackend.Infrastructure/Moodle/ApiResponses/PluginResponses/PluginAdaptivityTaskResponse.cs b/...ackend.Infrastructure/Moodle/ApiResponses/PluginResponses/PluginAdaptivityTaskResponse.cs
@@ -0,0 +1,7 @@
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
+
+public class PluginAdaptivityTaskResponse
+{
+    public string Uuid { get; set; }
+    public string Status { get; set; }
+}
diff --git a/...ckend.Infrastructure/Moodle/ApiResponses/PluginResponses/PluginAdaptivityTasksResponse.cs b/...ckend.Infrastructure/Moodle/ApiResponses/PluginResponses/PluginAdaptivityTasksResponse.cs
@@ -0,0 +1,6 @@
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
+
+public class PluginAdaptivityTasksResponse
+{
+    public IList<PluginAdaptivityTaskResponse> Tasks { get; set; }
+}
diff --git a/...Responses/PluginCourseCreationResponse.cs → ...Responses/PluginCourseCreationResponse.cs b/...Responses/PluginCourseCreationResponse.cs → ...Responses/PluginCourseCreationResponse.cs
@@ -1,4 +1,4 @@
-namespace AdLerBackend.Infrastructure.Moodle.ApiResponses;
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
 
 internal class PluginCourseCreationResponse
 {

diff --git a/...le/ApiResponses/PluginElementScoreData.cs → ...PluginResponses/PluginElementScoreData.cs b/...le/ApiResponses/PluginElementScoreData.cs → ...PluginResponses/PluginElementScoreData.cs
@@ -1,4 +1,4 @@
-namespace AdLerBackend.Infrastructure.Moodle.ApiResponses;
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
 
 internal class PluginElementScoreData
 {

diff --git a/...Moodle/ApiResponses/PluginUUIDResponse.cs → ...ses/PluginResponses/PluginUUIDResponse.cs b/...Moodle/ApiResponses/PluginUUIDResponse.cs → ...ses/PluginResponses/PluginUUIDResponse.cs
@@ -1,16 +1,16 @@
-using System.Text.Json.Serialization;
-
-namespace AdLerBackend.Infrastructure.Moodle.ApiResponses;
-
-public class PluginUUIDResponse
-{
-    [JsonPropertyName("course_id")] public string CourseId { get; set; }
-
-    [JsonPropertyName("element_type")] public string ElementType { get; set; }
-
-    [JsonPropertyName("Uuid")] public Guid Uuid { get; set; }
-
-    [JsonPropertyName("moodle_id")] public int MoodleId { get; set; }
-
-    [JsonPropertyName("context_id")] public int ContextId { get; set; }
+using System.Text.Json.Serialization;
+
+namespace AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
+
+public class PluginUUIDResponse
+{
+    [JsonPropertyName("course_id")] public string CourseId { get; set; }
+
+    [JsonPropertyName("element_type")] public string ElementType { get; set; }
+
+    [JsonPropertyName("Uuid")] public Guid Uuid { get; set; }
+
+    [JsonPropertyName("moodle_id")] public int MoodleId { get; set; }
+
+    [JsonPropertyName("context_id")] public int ContextId { get; set; }
 }
diff --git a/AdLerBackend.Infrastructure/Moodle/ApiResponses/PluginTasksResponse.cs b/AdLerBackend.Infrastructure/Moodle/ApiResponses/PluginTasksResponse.cs
diff --git a/AdLerBackend.Infrastructure/Moodle/MoodleWebApi.cs b/AdLerBackend.Infrastructure/Moodle/MoodleWebApi.cs
@@ -6,6 +6,8 @@
 using AdLerBackend.Application.Common.Responses.LMSAdapter.Adaptivity;
 using AdLerBackend.Application.Configuration;
 using AdLerBackend.Infrastructure.Moodle.ApiResponses;
+using AdLerBackend.Infrastructure.Moodle.ApiResponses.Common;
+using AdLerBackend.Infrastructure.Moodle.ApiResponses.PluginResponses;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
 
@@ -90,7 +92,7 @@ public async Task DeleteCourseAsync(string token, int courseId)
     public async Task<IEnumerable<LMSAdaptivityQuestionStateResponse>> GetAdaptivityElementDetailsAsync(string token,
         int elementId)
     {
-        var rawResponse = await MoodleCallAsync<ResponseWithData<PluginQuestionsDetailResponse>>(
+        var rawResponse = await MoodleCallAsync<ResponseWithData<PluginAdaptivityQuestionsDetailResponse>>(
             new Dictionary<string, HttpContent>
             {
                 {"wstoken", new StringContent(token)},
@@ -117,7 +119,7 @@ public async Task<IEnumerable<LMSAdaptivityQuestionStateResponse>> GetAdaptivity
     public async Task<IEnumerable<LMSAdaptivityTaskStateResponse>> GetAdaptivityTaskDetailsAsync(string token,
         int elementId)
     {
-        var rawResponse = await MoodleCallAsync<ResponseWithData<PluginTasksResponse>>(
+        var rawResponse = await MoodleCallAsync<ResponseWithData<PluginAdaptivityTasksResponse>>(
             new Dictionary<string, HttpContent>
             {
                 {"wstoken", new StringContent(token)},
@@ -289,7 +291,7 @@ public async Task<AdaptivityModuleStateResponseAfterAnswer> AnswerAdaptivityQues
             wsParams.Add($"questions[{i}][answer]", new StringContent(answeredQuestions.ElementAt(i).Answer));
         }
 
-        var result = await MoodleCallAsync<ResponseWithData<AdaptivityModuleAnsweredResponse>>(wsParams);
+        var result = await MoodleCallAsync<ResponseWithData<PluginAdaptivityAnsweredQuestionResponse>>(wsParams);
 
         return new AdaptivityModuleStateResponseAfterAnswer
         {