move tests from using error code to ErrorTypeUri

dlcs · Sep 18, 2024 · 733b424 · 733b424
1 parent 14b65a4
commit 733b424
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 10 deletions.
diff --git a/src/IIIFPresentation/API.Tests/Integration/ModifyCollectionTests.cs b/src/IIIFPresentation/API.Tests/Integration/ModifyCollectionTests.cs
@@ -534,7 +534,7 @@ public async Task DeleteCollection_FailsToDeleteCollection_WhenAttemptingToDelet
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-        errorResponse!.Code.Should().Be(1);
+        errorResponse!.ErrorTypeUri.Should().Be("http://localhost/errors/DeleteCollectionType/CannotDeleteRootCollection");
         errorResponse.Detail.Should().Be("Cannot delete a root collection");
     }
 
@@ -553,7 +553,7 @@ public async Task DeleteCollection_FailsToDeleteCollection_WhenAttemptingToDelet
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-        errorResponse!.Code.Should().Be(1);
+        errorResponse!.ErrorTypeUri.Should().Be("http://localhost/errors/DeleteCollectionType/CannotDeleteRootCollection");
         errorResponse.Detail.Should().Be("Cannot delete a root collection");
     }
 
@@ -571,7 +571,7 @@ public async Task DeleteCollection_FailsToDeleteCollection_WhenAttemptingToDelet
 
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.BadRequest);
-        errorResponse!.Code.Should().Be(2);
+        errorResponse!.ErrorTypeUri.Should().Be("http://localhost/errors/DeleteCollectionType/CollectionNotEmpty");
         errorResponse.Detail.Should().Be("Cannot delete a collection with child items");
     }
 }
diff --git a/src/IIIFPresentation/API/Infrastructure/ControllerBaseX.cs b/src/IIIFPresentation/API/Infrastructure/ControllerBaseX.cs
@@ -115,25 +115,22 @@ public static ObjectResult ValidationFailed(this ControllerBase controller, Vali
         /// <param name="instance">The value for <see cref="Error.Instance" />.</param>
         /// <param name="title">The value for <see cref="Error.Title" />.</param>
         /// <param name="type">The value for <see cref="Error.Type" />.</param>
-        /// <param name="errorCode">The value for <see cref="Error.Code" />.</param>
         /// <returns>The created <see cref="ObjectResult"/> for the response.</returns>
         public static ObjectResult PresentationProblem(
             this ControllerBase controller,
             string? detail = null,
             string? instance = null,
             int? statusCode = null,
             string? title = null,
-            string? type = null,
-            int? errorCode = null)
+            string? type = null)
         {
             var error = new Error
             {
                 Detail = detail,
                 Instance = instance ?? controller.Request.GetDisplayUrl(),
                 Status = statusCode ?? 500,
                 Title = title,
-                ErrorTypeUri = type,
-                Code = errorCode
+                ErrorTypeUri = type
             };
 
             return new ObjectResult(error)

diff --git a/src/IIIFPresentation/Models/API/General/Error.cs b/src/IIIFPresentation/Models/API/General/Error.cs
@@ -15,6 +15,4 @@ public class Error : JsonLdBase
     public string? ErrorTypeUri { get; set; }
 
     public int Status { get; set; }
-
-    public int? Code { get; set; }
 }