Remove unnecessary backend code

Ed-Fi-Alliance-OSS · Jan 9, 2025 · db73cd0 · db73cd0
1 parent 52bcadf
commit db73cd0
Show file tree

Hide file tree

Showing 7 changed files with 9 additions and 25 deletions.
diff --git a/src/dms/backend/EdFi.DataManagementService.Backend.Postgresql/Operation/UpsertDocument.cs b/src/dms/backend/EdFi.DataManagementService.Backend.Postgresql/Operation/UpsertDocument.cs
@@ -155,10 +155,7 @@ await _sqlAction.InsertAlias(
         }
 
         _logger.LogDebug("Upsert success as insert - {TraceId}", upsertRequest.TraceId.Value);
-        return new UpsertResult.InsertSuccess(
-            upsertRequest.DocumentUuid,
-            new Etag(upsertRequest.EdfiDoc["_etag"]?.ToString() ?? "")
-        );
+        return new UpsertResult.InsertSuccess(upsertRequest.DocumentUuid);
     }
 
     public async Task<UpsertResult> AsUpdate(

diff --git a/src/dms/core/EdFi.DataManagementService.Core.External/Backend/UpsertResult.cs b/src/dms/core/EdFi.DataManagementService.Core.External/Backend/UpsertResult.cs
@@ -16,8 +16,7 @@ public record UpsertResult
     /// A successful upsert request that took the form of an insert
     /// </summary>
     /// <param name="NewDocumentUuid">The DocumentUuid of the new document</param>
-    /// <param name="Etag">The Etag of the new document</param>
-    public record InsertSuccess(DocumentUuid NewDocumentUuid, Etag Etag) : UpsertResult();
+    public record InsertSuccess(DocumentUuid NewDocumentUuid) : UpsertResult();
 
     /// <summary>
     /// A successful upsert request that took the form of an update

diff --git a/src/dms/core/EdFi.DataManagementService.Core.External/Model/Etag.cs b/src/dms/core/EdFi.DataManagementService.Core.External/Model/Etag.cs
diff --git a/src/dms/core/EdFi.DataManagementService.Core.Tests.Unit/Handler/UpsertHandlerTests.cs b/src/dms/core/EdFi.DataManagementService.Core.Tests.Unit/Handler/UpsertHandlerTests.cs
@@ -4,7 +4,6 @@
 // See the LICENSE and NOTICES files in the project root for more information.
 
 using System.Text.Json.Nodes;
-using EdFi.DataManagementService.Core.ApiSchema;
 using EdFi.DataManagementService.Core.Backend;
 using EdFi.DataManagementService.Core.External.Backend;
 using EdFi.DataManagementService.Core.External.Interface;
@@ -58,7 +57,7 @@ public void It_has_the_correct_response()
         {
             context.FrontendResponse.StatusCode.Should().Be(200);
             context.FrontendResponse.Body.Should().BeNull();
-            context.FrontendResponse.Headers.Count.Should().Be(0);
+            context.FrontendResponse.Headers.Count.Should().Be(1);
             context.FrontendResponse.LocationHeaderPath.Should().NotBeNullOrEmpty();
         }
     }

diff --git a/src/dms/core/EdFi.DataManagementService.Core/Backend/SuccessDocumentStoreRepository.cs b/src/dms/core/EdFi.DataManagementService.Core/Backend/SuccessDocumentStoreRepository.cs
@@ -25,7 +25,7 @@ public async Task<UpsertResult> UpsertDocument(IUpsertRequest upsertRequest)
             upsertRequest.TraceId
         );
         return await Task.FromResult<UpsertResult>(
-            new UpsertResult.InsertSuccess(upsertRequest.DocumentUuid, new Etag(""))
+            new UpsertResult.InsertSuccess(upsertRequest.DocumentUuid)
         );
     }
 

diff --git a/src/dms/core/EdFi.DataManagementService.Core/Backend/UpsertRequest.cs b/src/dms/core/EdFi.DataManagementService.Core/Backend/UpsertRequest.cs
@@ -42,6 +42,4 @@ internal record UpsertRequest(
     IUpdateCascadeHandler UpdateCascadeHandler
 )
     : UpdateRequest(ResourceInfo, DocumentInfo, EdfiDoc, TraceId, DocumentUuid, UpdateCascadeHandler),
-        IUpsertRequest
-{
-}
+        IUpsertRequest;
diff --git a/src/dms/core/EdFi.DataManagementService.Core/Handler/UpsertHandler.cs b/src/dms/core/EdFi.DataManagementService.Core/Handler/UpsertHandler.cs
@@ -59,9 +59,9 @@ public async Task Execute(PipelineContext context, Func<Task> next)
         context.FrontendResponse = upsertResult switch
         {
             InsertSuccess insertSuccess => new FrontendResponse(
-                StatusCode: 201,
-                Body: null,
-                Headers: new Dictionary<string, string>() { { "etag", insertSuccess.Etag.Value } },
+            StatusCode: 201,
+            Body: null,
+                Headers: new Dictionary<string, string>() { { "etag", context.ParsedBody["_etag"]?.ToString() ?? "" } },
                 LocationHeaderPath: PathComponents.ToResourcePath(
                     context.PathComponents,
                     insertSuccess.NewDocumentUuid
@@ -70,7 +70,7 @@ public async Task Execute(PipelineContext context, Func<Task> next)
             UpdateSuccess updateSuccess => new(
                 StatusCode: 200,
                 Body: null,
-                Headers: [],
+                Headers: new Dictionary<string, string>() { { "etag", context.ParsedBody["_etag"]?.ToString() ?? "" } },
                 LocationHeaderPath: PathComponents.ToResourcePath(
                     context.PathComponents,
                     updateSuccess.ExistingDocumentUuid