Merge pull request #32 from thefringeninja/delete-stream-message-by-id

Delete Stream Message by Id

Author: thefringeninja

src/SqlStreamStore.HAL.Tests/StreamDeleteTests.cs

@@ -33,7 +33,9 @@ public async Task expected_version(int? expectedVersion)
 
             using(var response = await _fixture.HttpClient.SendAsync(request))
             {
-                response.StatusCode.ShouldBe(HttpStatusCode.NoContent);                
+                response.StatusCode.ShouldBe(HttpStatusCode.NoContent);
+                response.Content.Headers.ContentLength.HasValue.ShouldBeTrue();
+                response.Content.Headers.ContentLength.Value.ShouldBe(0);
             }
 
             var page = await _fixture.StreamStore.ReadStreamForwards(StreamId, 0, 1);

src/SqlStreamStore.HAL.Tests/StreamMessageTests.cs

@@ -5,6 +5,7 @@
     using System.Net.Http.Headers;
     using System.Threading.Tasks;
     using Shouldly;
+    using SqlStreamStore.Streams;
     using Xunit;
 
     public class StreamMessageTests : IDisposable
@@ -73,6 +74,8 @@ public async Task delete_single_message_by_version()
             using(var response = await _fixture.HttpClient.DeleteAsync("/streams/a-stream/0"))
             {
                 response.StatusCode.ShouldBe(HttpStatusCode.NoContent);
+                response.Content.Headers.ContentLength.HasValue.ShouldBeTrue();
+                response.Content.Headers.ContentLength.Value.ShouldBe(0);
             }
 
             using(var response = await _fixture.HttpClient.GetAsync("/streams/a-stream/0"))
@@ -81,5 +84,29 @@ public async Task delete_single_message_by_version()
                 response.Headers.ETag.ShouldBeNull();
             }
         }
+        
+        [Fact]
+        public async Task delete_single_message_by_message_id()
+        {
+            var writeResult = await _fixture.WriteNMessages("a-stream", 1);
+
+            var page = await _fixture.StreamStore.ReadStreamForwards("a-stream", StreamVersion.Start, 1);
+
+            var messageId = page.Messages[0].MessageId;
+
+            using(var response = await _fixture.HttpClient.DeleteAsync($"/streams/a-stream/{messageId}"))
+            {
+                response.StatusCode.ShouldBe(HttpStatusCode.NoContent);
+                response.Content.Headers.ContentLength.HasValue.ShouldBeTrue();
+                response.Content.Headers.ContentLength.Value.ShouldBe(0);
+            }
+
+            using(var response = await _fixture.HttpClient.GetAsync("/streams/a-stream/0"))
+            {
+                response.StatusCode.ShouldBe(HttpStatusCode.NotFound);
+                response.Headers.ETag.ShouldBeNull();
+            }
+        }
+
     }
 }

src/SqlStreamStore.HAL/StreamMessage/StreamMessageMiddleware.cs

@@ -12,7 +12,9 @@ namespace SqlStreamStore.HAL.StreamMessage
 
     internal static class StreamMessageMiddleware
     {
-        public static IApplicationBuilder UseStreamMessages(this IApplicationBuilder builder, StreamMessageResource streamMessages)
+        public static IApplicationBuilder UseStreamMessages(
+            this IApplicationBuilder builder,
+            StreamMessageResource streamMessages)
             => builder.MapWhen(IsMatch, Configure(streamMessages));
 
         private static bool IsMatch(HttpContext context)
@@ -27,7 +29,9 @@ public static bool IsStreamMessage(this PathString requestPath)
 
             var segments = requestPath.Value?.Split('/');
 
-            return segments?.Length == 4 && int.TryParse(segments[3], out _);
+            return segments?.Length == 4
+                   && (int.TryParse(segments[3], out _)
+                       || Guid.TryParse(segments[3], out _));
         }
 
         private static Action<IApplicationBuilder> Configure(StreamMessageResource streamMessages)