probably fixed hillariously broken relative path generation

thefringeninja · thefringeninja · commit ef2a1ed8dca4 · 2018-10-23T09:38:08.000+10:00
diff --git a/src/SqlStreamStore.HAL.Tests/AllStreamMessageTests.cs b/src/SqlStreamStore.HAL.Tests/AllStreamMessageTests.cs
@@ -3,6 +3,7 @@ namespace SqlStreamStore.HAL.Tests
     using System;
     using System.Net;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
     using Shouldly;
     using Xunit;
 
@@ -31,7 +32,7 @@ public async Task read_single_message_all_stream()
 
                 resource.ShouldLink(
                     Links
-                        .RootedAt("../")
+                        .FromRequestMessage(response.RequestMessage)
                         .Find()
                         .Index()
                         .AddSelf(Constants.Relations.Message, "stream/0")
@@ -49,7 +50,7 @@ public async Task read_single_message_does_not_exist_all_stream()
                 var resource = await response.AsHal();
 
                 resource.ShouldLink(Links
-                    .RootedAt("../")
+                    .FromPath(new PathString("/stream/0"))
                     .AddSelf(Constants.Relations.Message, "stream/0")
                     .Add(Constants.Relations.Feed, HeadOfAll));
             }
diff --git a/src/SqlStreamStore.HAL.Tests/StreamMessageTests.cs b/src/SqlStreamStore.HAL.Tests/StreamMessageTests.cs
@@ -31,7 +31,7 @@ public async Task read_single_message_stream()
                 var resource = await response.AsHal();
 
                 resource.ShouldLink(Links
-                    .RootedAt("../../")
+                    .FromRequestMessage(response.RequestMessage)
                     .Index()
                     .Find()
                     .Add(Constants.Relations.Self, "streams/a-stream/0")
@@ -54,7 +54,7 @@ public async Task read_single_message_does_not_exist_stream()
                 var resource = await response.AsHal();
 
                 resource.ShouldLink(Links
-                    .RootedAt("../../")
+                    .FromRequestMessage(response.RequestMessage)
                     .Index()
                     .Find()
                     .Add(Constants.Relations.Self, "streams/a-stream/0")
diff --git a/src/SqlStreamStore.HAL.Tests/StreamMetadataTests.cs b/src/SqlStreamStore.HAL.Tests/StreamMetadataTests.cs
@@ -42,7 +42,7 @@ await _fixture.HttpClient.SendAsync(
 
                 resource.ShouldLink(
                     Links
-                        .RootedAt("../../../")
+                        .FromRequestMessage(response.RequestMessage)
                         .Index()
                         .Find()
                         .Add(Constants.Relations.Metadata, $"streams/{StreamId}/metadata").Self()
@@ -93,7 +93,7 @@ await _fixture.HttpClient.SendAsync(
 
                 resource.ShouldLink(
                     Links
-                        .RootedAt("../../../")
+                        .FromRequestMessage(response.RequestMessage)
                         .Index()
                         .Find()
                         .Add(Constants.Relations.Metadata, $"streams/{StreamId}/metadata").Self()
@@ -139,7 +139,7 @@ public async Task set_metadata()
 
                 resource.ShouldLink(
                     Links
-                        .RootedAt("../../../")
+                        .FromRequestMessage(response.RequestMessage)
                         .Index()
                         .Find()
                         .Add(Constants.Relations.Metadata, $"streams/{StreamId}/metadata").Self()
diff --git a/src/SqlStreamStore.HAL.Tests/StreamNavigationTests.cs b/src/SqlStreamStore.HAL.Tests/StreamNavigationTests.cs
@@ -46,7 +46,7 @@ public async Task read_head_link_no_messages(string path, string root, HttpStatu
                 var resource = await response.AsHal();
 
                 var links = Links
-                    .RootedAt(root)
+                    .FromRequestMessage(response.RequestMessage)
                     .Index()
                     .Find()
                     .Add(Constants.Relations.Self, $"{path}?{LastLinkQuery}")
@@ -85,7 +85,7 @@ public async Task read_head_link_when_multiple_pages(string path, string root)
                 var resource = await response.AsHal();
 
                 var links = Links
-                    .RootedAt(root)
+                    .FromRequestMessage(response.RequestMessage)
                     .Index()
                     .Find()
                     .Add(Constants.Relations.Self, $"{path}?{LastLinkQuery}")
@@ -118,7 +118,8 @@ public async Task read_first_link(string path, string root)
 
                 var resource = await response.AsHal();
 
-                var links = Links.RootedAt(root)
+                var links = Links
+                    .FromRequestMessage(response.RequestMessage)
                     .Index()
                     .Find()
                     .Add(Constants.Relations.Self, $"{path}?{FirstLinkQuery}")
@@ -146,7 +147,8 @@ public async Task read_first_link_when_multiple_pages(string path, string root)
 
                 var resource = await response.AsHal();
 
-                var links = Links.RootedAt(root)
+                var links = Links
+                    .FromRequestMessage(response.RequestMessage)
                     .Index()
                     .Find()
                     .Add(Constants.Relations.Self, $"{path}?{FirstLinkQuery}")
diff --git a/src/SqlStreamStore.HAL/AllStream/AllStreamResource.cs b/src/SqlStreamStore.HAL/AllStream/AllStreamResource.cs
@@ -54,7 +54,7 @@ public async Task<Response> Get(
                     })
                     .AddLinks(
                         Links
-                            .RootedAt(string.Empty)
+                            .FromOperation(operation)
                             .Index()
                             .Find()
                             .AllStreamNavigation(page, operation))
@@ -74,7 +74,8 @@ public async Task<Response> Get(
                                     metadata = message.JsonMetadata
                                 })
                                 .AddLinks(
-                                    Links.RootedAt(string.Empty)
+                                    Links
+                                        .FromOperation(operation)
                                         .Add(
                                             Constants.Relations.Message,
                                             $"streams/{message.StreamId}/{message.StreamVersion}")
diff --git a/src/SqlStreamStore.HAL/AllStream/ReadAllStreamOperation.cs b/src/SqlStreamStore.HAL/AllStream/ReadAllStreamOperation.cs
@@ -12,6 +12,8 @@ internal class ReadAllStreamOperation : IStreamStoreOperation<ReadAllPage>
 
         public ReadAllStreamOperation(HttpRequest request)
         {
+            Path = request.Path;
+            
             EmbedPayload = request.Query.TryGetValueCaseInsensitive('e', out var embedPayload)
                            && embedPayload == "1";
 
@@ -62,6 +64,7 @@ public ReadAllStreamOperation(HttpRequest request)
         public int ReadDirection { get; }
         public string Self { get; }
         public bool IsUriCanonical { get; }
+        public PathString Path { get; }
 
         public Task<ReadAllPage> Invoke(IStreamStore streamStore, CancellationToken ct)
             => ReadDirection == Constants.ReadDirection.Forwards
diff --git a/src/SqlStreamStore.HAL/AllStreamMessage/AllStreamMessageResource.cs b/src/SqlStreamStore.HAL/AllStreamMessage/AllStreamMessageResource.cs
@@ -25,7 +25,8 @@ public async Task<Response> Get(
         {
             var message = await operation.Invoke(_streamStore, cancellationToken);
 
-            var links = Links.RootedAt("../")
+            var links = Links
+                .FromOperation(operation)
                 .Index()
                 .Find()
                 .Add(Constants.Relations.Message, $"stream/{message.Position}").Self()
diff --git a/src/SqlStreamStore.HAL/AllStreamMessage/ReadAllStreamMessageOperation.cs b/src/SqlStreamStore.HAL/AllStreamMessage/ReadAllStreamMessageOperation.cs
@@ -10,10 +10,12 @@ internal class ReadAllStreamMessageOperation : IStreamStoreOperation<StreamMessa
     {
         public ReadAllStreamMessageOperation(HttpRequest request)
         {
+            Path = request.Path;
             Position = long.Parse(request.Path.Value.Remove(0, 2 + Constants.Streams.All.Length));
         }
 
         public long Position { get; }
+        public PathString Path { get; }
 
         public async Task<StreamMessage> Invoke(IStreamStore streamStore, CancellationToken ct)
         {
diff --git a/src/SqlStreamStore.HAL/IStreamStoreOperation.cs b/src/SqlStreamStore.HAL/IStreamStoreOperation.cs
@@ -2,9 +2,11 @@
 {
     using System.Threading;
     using System.Threading.Tasks;
+    using Microsoft.AspNetCore.Http;
 
     internal interface IStreamStoreOperation<T>
     {
+        PathString Path { get; }
         Task<T> Invoke(IStreamStore streamStore, CancellationToken cancellationToken);
     }
 }
diff --git a/src/SqlStreamStore.HAL/Index/IndexResource.cs b/src/SqlStreamStore.HAL/Index/IndexResource.cs
@@ -3,6 +3,7 @@ namespace SqlStreamStore.HAL.Index
     using System;
     using System.Reflection;
     using Halcyon.HAL;
+    using Microsoft.AspNetCore.Http;
     using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
@@ -39,7 +40,7 @@ private static string GetVersion(Type type)
         public Response Get() => new HalJsonResponse(new HALResponse(_data)
             .AddLinks(
                 Links
-                    .RootedAt(string.Empty)
+                    .FromPath(PathString.Empty)
                     .Index().Self()
                     .Find()
                     .Add(Constants.Relations.Feed, Constants.Streams.All)));
diff --git a/src/SqlStreamStore.HAL/Links.cs b/src/SqlStreamStore.HAL/Links.cs
@@ -2,33 +2,36 @@ namespace SqlStreamStore.HAL
 {
     using System;
     using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
     using Halcyon.HAL;
+    using Microsoft.AspNetCore.Http;
+    using SqlStreamStore.HAL.Logging;
 
     internal class Links
     {
+        private static readonly ILog s_log = LogProvider.For<Links>();
+        
+        private readonly PathString _path;
         private readonly List<(string rel, string href, string title)> _links;
         private readonly string _relativePathToRoot;
 
-        public static Links RootedAt(string relativePathToRoot) => new Links(relativePathToRoot);
+        public static Links FromOperation<T>(IStreamStoreOperation<T> operation) => FromPath(operation.Path);
+        
+        public static Links FromPath(PathString path) => new Links(path);
 
-        private Links(string relativePathToRoot)
+        public static Links FromRequestMessage(HttpRequestMessage requestMessage)
+            => FromPath(new PathString(requestMessage.RequestUri.AbsolutePath));
+        
+        private Links(PathString path)
         {
-            if(!String.IsNullOrEmpty(relativePathToRoot))
-            {
-                if(!relativePathToRoot.StartsWith(".."))
-                {
-                    throw new ArgumentException("Non-empty relative path to root must start with '..'",
-                        nameof(relativePathToRoot));
-                }
-
-                if(!relativePathToRoot.EndsWith("/"))
-                {
-                    throw new ArgumentException("Non-empty relative path to root must end with '/'",
-                        nameof(relativePathToRoot));
-                }
-            }
+            _path = path;
+            var segmentCount = path.Value.Split('/').Length;
+            _relativePathToRoot = 
+                segmentCount < 2
+                    ? "./"
+                    : string.Join(string.Empty, Enumerable.Repeat("../", segmentCount - 2));
 
-            _relativePathToRoot = relativePathToRoot ?? String.Empty;
             _links = new List<(string rel, string href, string title)>();
         }
 
@@ -38,16 +41,18 @@ public Links Add(string rel, string href, string title = null)
                 throw new ArgumentNullException(nameof(rel));
             if(href == null)
                 throw new ArgumentNullException(nameof(href));
-
+            
             _links.Add((rel, href, title));
+
+            s_log.Debug($"Added link {_links[_links.Count - 1]} to response for request {_path}");
             return this;
         }
 
         public Links Self()
         {
-            var link = _links[_links.Count - 1];
+            var (_, href, title) = _links[_links.Count - 1];
 
-            return Add(Constants.Relations.Self, link.href, link.title);
+            return Add(Constants.Relations.Self, href, title);
         }
 
         public Links AddSelf(string rel, string href, string title = null)
@@ -61,17 +66,16 @@ public Link[] ToHalLinks()
             for(var i = 0; i < _links.Count; i++)
             {
                 var (rel, href, title) = _links[i];
-                var resolvedHref = $"{_relativePathToRoot}{href}";
 
-                links[i] = new Link(rel, resolvedHref, title, replaceParameters: false)
+                links[i] = new Link(rel, Resolve(href), title, replaceParameters: false)
                 {
                     Type = Constants.MediaTypes.HalJson
                 };
             }
 
             links[_links.Count] = new Link(
                 Constants.Relations.Curies,
-                $"{_relativePathToRoot}docs/{{rel}}",
+                Resolve("docs/{rel}"),
                 "Documentation",
                 replaceParameters: false)
             {
@@ -83,6 +87,8 @@ public Link[] ToHalLinks()
             return links;
         }
 
+        private string Resolve(string relativeUrl) => $"{_relativePathToRoot}{relativeUrl}";
+
         public static implicit operator Link[](Links links) => links.ToHalLinks();
 
         private static string FormatLink(
diff --git a/src/SqlStreamStore.HAL/StreamMessage/DeleteStreamMessageOperation.cs b/src/SqlStreamStore.HAL/StreamMessage/DeleteStreamMessageOperation.cs
@@ -10,6 +10,7 @@ internal class DeleteStreamMessageOperation : IStreamStoreOperation<Unit>
     {
         public DeleteStreamMessageOperation(HttpRequest request)
         {
+            Path = request.Path;
             var pieces = request.Path.Value.Split('/').Reverse().Take(2).ToArray();
 
             StreamId = pieces.LastOrDefault();
@@ -27,9 +28,7 @@ public DeleteStreamMessageOperation(HttpRequest request)
         public string StreamId { get; }
         public int? StreamVersion { get; }
         public Guid? MessageId { get; }
-
-        public Func<IStreamStore, CancellationToken, Task> GetDeleteOperation()
-            => async (streamStore, ct) => { await Invoke(streamStore, ct); };
+        public PathString Path { get; }
 
         public async Task<Unit> Invoke(IStreamStore streamStore, CancellationToken ct)
         {
@@ -44,7 +43,7 @@ public async Task<Unit> Invoke(IStreamStore streamStore, CancellationToken ct)
                                            || message.StreamVersion == StreamVersion)
                             .MessageId;
             await streamStore.DeleteMessage(StreamId, messageId, ct);
-            
+
             return Unit.Instance;
         }
     }
diff --git a/src/SqlStreamStore.HAL/StreamMessage/ReadStreamMessageByStreamVersionOperation.cs b/src/SqlStreamStore.HAL/StreamMessage/ReadStreamMessageByStreamVersionOperation.cs
@@ -10,13 +10,16 @@ internal class ReadStreamMessageByStreamVersionOperation : IStreamStoreOperation
     {
         public ReadStreamMessageByStreamVersionOperation(HttpRequest request)
         {
+            Path = request.Path;
+            
             var pieces = request.Path.Value.Split('/').Reverse().Take(2).ToArray();
 
             StreamId = pieces.LastOrDefault();
 
             StreamVersion = int.Parse(pieces.First());
         }
 
+        public PathString Path { get; }
         public int StreamVersion { get; }
         public string StreamId { get; }
 
diff --git a/src/SqlStreamStore.HAL/StreamMessage/StreamMessageResource.cs b/src/SqlStreamStore.HAL/StreamMessage/StreamMessageResource.cs
@@ -28,7 +28,7 @@ public async Task<Response> Get(
             var message = await operation.Invoke(_streamStore, cancellationToken);
 
             var links = Links
-                .RootedAt("../../")
+                .FromPath(operation.Path)
                 .Index()
                 .Find()
                 .StreamMessageNavigation(message, operation);
diff --git a/src/SqlStreamStore.HAL/StreamMetadata/GetStreamMetadataOperation.cs b/src/SqlStreamStore.HAL/StreamMetadata/GetStreamMetadataOperation.cs
@@ -9,10 +9,12 @@ internal class GetStreamMetadataOperation : IStreamStoreOperation<StreamMetadata
     {
         public GetStreamMetadataOperation(HttpRequest request)
         {
+            Path = request.Path;
             StreamId = request.Path.Value.Split('/')[2];
         }
 
         public string StreamId { get; }
+        public PathString Path { get; }
 
         public Task<StreamMetadataResult> Invoke(IStreamStore streamStore, CancellationToken ct)
             => streamStore.GetStreamMetadata(StreamId, ct);
diff --git a/src/SqlStreamStore.HAL/StreamMetadata/SetStreamMetadataOperation.cs b/src/SqlStreamStore.HAL/StreamMetadata/SetStreamMetadataOperation.cs
@@ -24,13 +24,15 @@ public static async Task<SetStreamMetadataOperation> Create(HttpRequest request,
 
         private SetStreamMetadataOperation(HttpRequest request, JObject body)
         {
+            Path = request.Path;
             StreamId = request.Path.Value.Split('/')[2];
             ExpectedVersion = request.GetExpectedVersion();
             MaxAge = body.Value<int?>("maxAge");
             MaxCount = body.Value<int?>("maxCount");
             MetadataJson = Normalize(body["metadataJson"]?.ToString(Formatting.Indented));
         }
-
+        
+        public PathString Path { get; }
         public string StreamId { get; }
         public int ExpectedVersion { get; }
         public string MetadataJson { get; }
diff --git a/src/SqlStreamStore.HAL/StreamMetadata/StreamMetadataResource.cs b/src/SqlStreamStore.HAL/StreamMetadata/StreamMetadataResource.cs
diff --git a/src/SqlStreamStore.HAL/Streams/AppendStreamOperation.cs b/src/SqlStreamStore.HAL/Streams/AppendStreamOperation.cs
diff --git a/src/SqlStreamStore.HAL/Streams/DeleteStreamOperation.cs b/src/SqlStreamStore.HAL/Streams/DeleteStreamOperation.cs
diff --git a/src/SqlStreamStore.HAL/Streams/LinkExtensions.cs b/src/SqlStreamStore.HAL/Streams/LinkExtensions.cs
diff --git a/src/SqlStreamStore.HAL/Streams/ReadStreamOperation.cs b/src/SqlStreamStore.HAL/Streams/ReadStreamOperation.cs
diff --git a/src/SqlStreamStore.HAL/Streams/StreamResource.cs b/src/SqlStreamStore.HAL/Streams/StreamResource.cs

Original file line number	Diff line number	Diff line change
`@@ -25,7 +25,8 @@ public async Task<Response> Get(`
`25`	`25`	`{`
`26`	`26`	`var message = await operation.Invoke(_streamStore, cancellationToken);`
`27`	`27`
`28`		`- var links = Links.RootedAt("../")`
	`28`	`+ var links = Links`
	`29`	`+ .FromOperation(operation)`
`29`	`30`	`.Index()`
`30`	`31`	`.Find()`
`31`	`32`	`.Add(Constants.Relations.Message, $"stream/{message.Position}").Self()`
Original file line number	Diff line number	Diff line change
`@@ -10,10 +10,12 @@ internal class ReadAllStreamMessageOperation : IStreamStoreOperation<StreamMessa`
`10`	`10`	`{`
`11`	`11`	`public ReadAllStreamMessageOperation(HttpRequest request)`
`12`	`12`	`{`
	`13`	`+ Path = request.Path;`
`13`	`14`	`Position = long.Parse(request.Path.Value.Remove(0, 2 + Constants.Streams.All.Length));`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`public long Position { get; }`
	`18`	`+ public PathString Path { get; }`
`17`	`19`
`18`	`20`	`public async Task<StreamMessage> Invoke(IStreamStore streamStore, CancellationToken ct)`
`19`	`21`	`{`
Original file line number	Diff line number	Diff line change
`@@ -2,9 +2,11 @@`
`2`	`2`	`{`
`3`	`3`	`using System.Threading;`
`4`	`4`	`using System.Threading.Tasks;`
	`5`	`+ using Microsoft.AspNetCore.Http;`
`5`	`6`
`6`	`7`	`internal interface IStreamStoreOperation<T>`
`7`	`8`	`{`
	`9`	`+ PathString Path { get; }`
`8`	`10`	`Task<T> Invoke(IStreamStore streamStore, CancellationToken cancellationToken);`
`9`	`11`	`}`
`10`	`12`	`}`