updating query to use || and fixing some tests

dlcs · Feb 28, 2024 · 01b9db7 · 01b9db7
1 parent 01a3e42
commit 01b9db7
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 11 deletions.
diff --git a/src/protagonist/API.Tests/Integration/CustomerDefaultDeliveryChannelsTest.cs b/src/protagonist/API.Tests/Integration/CustomerDefaultDeliveryChannelsTest.cs
@@ -65,7 +65,7 @@ public async Task Get_RetrieveADefaultDeliveryChannelForCustomer_200()
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.OK);
         data.MediaType.Should().Be(mediaType);
-        data.Id.Should().Be(defaultDeliveryChannel.Id.ToString());
+        data.Id.Should().Be($"{httpClient.BaseAddress}customers/{customerId}/defaultDeliveryChannels/{defaultDeliveryChannel.Id.ToString()}");
     }
 
     [Fact]
@@ -145,7 +145,7 @@ public async Task Post_CreateDefaultDeliveryChannelForCustomer_201(string mediaT
         // Assert
         response.StatusCode.Should().Be(HttpStatusCode.Created);
         data.MediaType.Should().Be(mediaType);
-        data.Id.Should().Be(dbEntry.Id.ToString());
+        data.Id.Should().Be($"{httpClient.BaseAddress}customers/{customerId}/defaultDeliveryChannels/{dbEntry.Id.ToString()}");
         dbEntry.DeliveryChannelPolicyId.Should().Be(policy.Id);
     }
 
@@ -282,7 +282,7 @@ dlcsContext.DefaultDeliveryChannels .Include(d => d.DeliveryChannelPolicy)
 
         response.StatusCode.Should().Be(HttpStatusCode.OK);
         data.MediaType.Should().Be(mediaType);
-        data.Id.Should().Be(dbEntry.Id.ToString());
+        data.Id.Should().Be($"{httpClient.BaseAddress}customers/{customerId}/defaultDeliveryChannels/{dbEntry.Id.ToString()}");
         modifiedDbEntry.DeliveryChannelPolicy.Name.Should().Be(policyName.Split("/", StringSplitOptions.None).Last());
     }
 

diff --git a/src/protagonist/API/Features/DeliveryChannels/Converters/DefaultDeliveryChannelConverters.cs b/src/protagonist/API/Features/DeliveryChannels/Converters/DefaultDeliveryChannelConverters.cs
@@ -14,7 +14,7 @@ public static DLCS.HydraModel.DefaultDeliveryChannel ToHydra(this DefaultDeliver
             Policy = defaultDeliveryChannel.DeliveryChannelPolicy.System ? defaultDeliveryChannel.DeliveryChannelPolicy.Name : GetFullyQualifiedPolicyName(defaultDeliveryChannel, baseUrl),
             Channel = defaultDeliveryChannel.DeliveryChannelPolicy.Channel,
             MediaType = defaultDeliveryChannel.MediaType, 
-            Id = $"{baseUrl}/{defaultDeliveryChannel.Customer}/defaultDeliveryChannels/{defaultDeliveryChannel.Id.ToString()}"
+            Id = $"{baseUrl}/customers/{defaultDeliveryChannel.Customer}/defaultDeliveryChannels/{defaultDeliveryChannel.Id.ToString()}"
         };
 
         return hydra;
@@ -37,6 +37,6 @@ public static DefaultDeliveryChannel ToDlcsModelWithoutPolicy(this DLCS.HydraMod
 
     private static string? GetFullyQualifiedPolicyName(DefaultDeliveryChannel defaultDeliveryChannel, string baseUrl)
     {
-        return $"{baseUrl}/{defaultDeliveryChannel.Customer}/deliveryChannels/{defaultDeliveryChannel.DeliveryChannelPolicy.Channel}/{defaultDeliveryChannel.DeliveryChannelPolicy.Name}";
+        return $"{baseUrl}customers/{defaultDeliveryChannel.Customer}/deliveryChannels/{defaultDeliveryChannel.DeliveryChannelPolicy.Channel}/{defaultDeliveryChannel.DeliveryChannelPolicy.Name}";
     }
 }
diff --git a/...rotagonist/API/Features/DeliveryChannels/Requests/CreateCustomerDefaultDeliveryChannel.cs b/...rotagonist/API/Features/DeliveryChannels/Requests/CreateCustomerDefaultDeliveryChannel.cs
@@ -65,13 +65,12 @@ public async Task<ModifyEntityResult<CreateDefaultDeliveryChannelResult>> Handle
 
         try
         {
-            var deliveryChannelPolicy = dbContext.DeliveryChannelPolicies.SingleOrDefault(p =>
+            var deliveryChannelPolicy = dbContext.DeliveryChannelPolicies.Single(p =>
                                             p.Customer == request.Customer &&
                                             p.System == false &&
                                             p.Channel == request.DefaultDeliveryChannel
                                                 .Channel &&
-                                            p.Name == request.DefaultDeliveryChannel.Policy!.Split('/', StringSplitOptions.None).Last()) ??
-                                        dbContext.DeliveryChannelPolicies.Single(p =>
+                                            p.Name == request.DefaultDeliveryChannel.Policy!.Split('/', StringSplitOptions.None).Last() || 
                                             p.Customer == 1 &&
                                             p.System == true &&
                                             p.Channel == request.DefaultDeliveryChannel

diff --git a/...rotagonist/API/Features/DeliveryChannels/Requests/UpdateCustomerDefaultDeliveryChannel.cs b/...rotagonist/API/Features/DeliveryChannels/Requests/UpdateCustomerDefaultDeliveryChannel.cs
@@ -57,13 +57,12 @@ public async Task<ModifyEntityResult<UpdateDefaultDeliveryChannelResult>> Handle
         {
             try
             {
-                var deliveryChannelPolicy = dbContext.DeliveryChannelPolicies.SingleOrDefault(p =>
+                var deliveryChannelPolicy = dbContext.DeliveryChannelPolicies.Single(p =>
                                                 p.Customer == request.Customer &&
                                                 p.System == false &&
                                                 p.Channel == request.DefaultDeliveryChannel.Channel &&
                                                 p.Name == request.DefaultDeliveryChannel.Policy!
-                                                    .Split('/', StringSplitOptions.None).Last()) ??
-                                            dbContext.DeliveryChannelPolicies.Single(p =>
+                                                    .Split('/', StringSplitOptions.None).Last() ||
                                                 p.Customer == 1 &&
                                                 p.System == true &&
                                                 p.Channel == request.DefaultDeliveryChannel.Channel &&