adding link to browse streams from more places

thefringeninja · thefringeninja · commit 91c182a079e9 · 2018-10-28T23:07:48.000+10:00
diff --git a/src/SqlStreamStore.HAL/AllStream/AllStreamResource.cs b/src/SqlStreamStore.HAL/AllStream/AllStreamResource.cs
@@ -57,6 +57,7 @@ public async Task<Response> Get(
                             .FromOperation(operation)
                             .Index()
                             .Find()
+                            .Browse()
                             .AllStreamNavigation(page, operation))
                     .AddEmbeddedCollection(
                         Constants.Relations.Message,
diff --git a/src/SqlStreamStore.HAL/AllStreamMessage/AllStreamMessageResource.cs b/src/SqlStreamStore.HAL/AllStreamMessage/AllStreamMessageResource.cs
@@ -29,6 +29,7 @@ public async Task<Response> Get(
                 .FromOperation(operation)
                 .Index()
                 .Find()
+                .Browse()
                 .Add(
                     Constants.Relations.Message,
                     $"stream/{message.Position}",
diff --git a/src/SqlStreamStore.HAL/Constants.cs b/src/SqlStreamStore.HAL/Constants.cs
@@ -60,7 +60,7 @@ public static class Relations
             public const string DeleteStream = StreamStorePrefix + ":delete-stream";
             public const string DeleteMessage = StreamStorePrefix + ":delete-message";
             public const string Find = StreamStorePrefix + ":find";
-            public const string ListStreams = StreamStorePrefix + ":feed-browser";
+            public const string Browse = StreamStorePrefix + ":feed-browser";
         }
 
         public static class Streams
diff --git a/src/SqlStreamStore.HAL/Index/IndexResource.cs b/src/SqlStreamStore.HAL/Index/IndexResource.cs
@@ -4,7 +4,6 @@ namespace SqlStreamStore.HAL.Index
     using System.Reflection;
     using Halcyon.HAL;
     using Microsoft.AspNetCore.Http;
-    using Newtonsoft.Json;
     using Newtonsoft.Json.Linq;
 
     internal class IndexResource : IResource
@@ -43,8 +42,7 @@ private static string GetVersion(Type type)
                     .FromPath(PathString.Empty)
                     .Index().Self()
                     .Find()
+                    .Browse()
                     .Add(Constants.Relations.Feed, Constants.Streams.All)));
-
-        public override string ToString() => _data.ToString(Formatting.None);
     }
 }
diff --git a/src/SqlStreamStore.HAL/LinksExtensions.cs b/src/SqlStreamStore.HAL/LinksExtensions.cs
@@ -9,6 +9,6 @@ public static Links Find(this Links links)
             => links.Add(Constants.Relations.Find, "streams/{streamId}", "Find a Stream");
 
         public static Links Browse(this Links links)
-            => links.Add(Constants.Relations.Browse, "stream/browse{?p,t,m}");
+            => links.Add(Constants.Relations.Browse, "stream/browse{?p,t,m}", "Browse Streams");
     }
 }
diff --git a/src/SqlStreamStore.HAL/SqlStreamStoreHalMiddleware.cs b/src/SqlStreamStore.HAL/SqlStreamStoreHalMiddleware.cs
@@ -11,7 +11,6 @@
     using SqlStreamStore.HAL.Docs;
     using SqlStreamStore.HAL.Index;
     using SqlStreamStore.HAL.Logging;
-    using SqlStreamStore.HAL.Resources;
     using SqlStreamStore.HAL.StreamBrowser;
     using SqlStreamStore.HAL.StreamMessage;
     using SqlStreamStore.HAL.StreamMetadata;
diff --git a/src/SqlStreamStore.HAL/StreamBrowser/ListStreamsMiddleware.cs b/src/SqlStreamStore.HAL/StreamBrowser/ListStreamsMiddleware.cs
@@ -4,7 +4,6 @@ namespace SqlStreamStore.HAL.StreamBrowser
     using System.Net.Http;
     using Microsoft.AspNetCore.Builder;
     using Microsoft.AspNetCore.Http;
-    using SqlStreamStore.HAL.Resources;
     using MidFunc = System.Func<
         Microsoft.AspNetCore.Http.HttpContext,
         System.Func<System.Threading.Tasks.Task>,
diff --git a/src/SqlStreamStore.HAL/StreamBrowser/StreamBrowserLinkExtensions.cs b/src/SqlStreamStore.HAL/StreamBrowser/StreamBrowserLinkExtensions.cs
@@ -0,0 +1,37 @@
+namespace SqlStreamStore.HAL.StreamBrowser
+{
+    using SqlStreamStore.Streams;
+
+    internal static class StreamBrowserLinkExtensions
+    {
+        public static Links StreamBrowserNavigation(
+            this Links links,
+            ListStreamsPage listStreamsPage,
+            ListStreamsOperation operation)
+        {
+            if(operation.ContinuationToken != null)
+            {
+                links.Add(
+                    Constants.Relations.Next,
+                    FormatLink(operation, listStreamsPage.ContinuationToken));
+            }
+
+            if(listStreamsPage.ContinuationToken != null)
+            {
+                links.Add(
+                    Constants.Relations.Next,
+                    FormatLink(operation, listStreamsPage.ContinuationToken));
+            }
+
+
+            return links
+                .Add(
+                    Constants.Relations.Browse,
+                    FormatLink(operation, listStreamsPage.ContinuationToken))
+                .Self();
+        }
+
+        private static string FormatLink(ListStreamsOperation operation, string continuationToken) =>
+            $"stream/browser?p={operation.Pattern.Value}&t={operation.PatternType}&c={continuationToken}&m={operation.MaxCount}";
+    }
+}
diff --git a/src/SqlStreamStore.HAL/StreamBrowser/StreamBrowserResource.cs b/src/SqlStreamStore.HAL/StreamBrowser/StreamBrowserResource.cs
@@ -1,4 +1,4 @@
-namespace SqlStreamStore.HAL.Resources
+namespace SqlStreamStore.HAL.StreamBrowser
 {
     using System;
     using System.Threading;
@@ -19,7 +19,7 @@ public async Task<Response> Get(ListStreamsOperation operation, CancellationToke
         {
             var listStreamsPage = await operation.Invoke(_streamStore, cancellationToken);
 
-            var halResponse = new HALResponse(new
+            return new HalJsonResponse(new HALResponse(new
                 {
                     listStreamsPage.ContinuationToken
                 })
@@ -29,23 +29,15 @@ public async Task<Response> Get(ListStreamsOperation operation, CancellationToke
                         listStreamsPage.StreamIds,
                         streamId =>
                         {
-                            var href = $"../../streams/{streamId}";
                             return new HALResponse(null)
                                 .AddLinks(
-                                    new Link(Constants.Relations.Self, href, streamId),
-                                    new Link(Constants.Relations.Feed, href, streamId));
+                                    Links
+                                        .FromOperation(operation)
+                                        .Index()
+                                        .Find()
+                                        .StreamBrowserNavigation(listStreamsPage, operation));
                         }
-                    ));
-
-            if(listStreamsPage.ContinuationToken != null)
-            {
-                halResponse.AddLinks(
-                    new Link(
-                        Constants.Relations.Next,
-                        $"browser?p={operation.Pattern.Value}&t={operation.PatternType}&c={listStreamsPage.ContinuationToken}&m={operation.MaxCount}"));
-            }
-
-            return new HalJsonResponse(halResponse);
+                    )));
         }
     }
 }
diff --git a/src/SqlStreamStore.HAL/StreamMessage/StreamMessageResource.cs b/src/SqlStreamStore.HAL/StreamMessage/StreamMessageResource.cs
@@ -31,6 +31,7 @@ public async Task<Response> Get(
                 .FromPath(operation.Path)
                 .Index()
                 .Find()
+                .Browse()
                 .StreamMessageNavigation(message, operation);
             
             if(message.MessageId == Guid.Empty)
diff --git a/src/SqlStreamStore.HAL/StreamMetadata/StreamMetadataResource.cs b/src/SqlStreamStore.HAL/StreamMetadata/StreamMetadataResource.cs
@@ -39,6 +39,7 @@ public async Task<Response> Get(
                             .FromOperation(operation)
                             .Index()
                             .Find()
+                            .Browse()
                             .StreamMetadataNavigation(operation))
                     .AddEmbeddedResource(
                         Constants.Relations.Metadata,
diff --git a/src/SqlStreamStore.HAL/Streams/StreamResource.cs b/src/SqlStreamStore.HAL/Streams/StreamResource.cs
@@ -47,6 +47,7 @@ public async Task<Response> Post(
                 .FromOperation(operation)
                 .Index()
                 .Find()
+                .Browse()
                 .Add(Constants.Relations.Feed, $"streams/{operation.StreamId}").Self();
 
             var response = new HalJsonResponse(
@@ -98,6 +99,7 @@ public async Task<Response> Get(ReadStreamOperation operation, CancellationToken
                         .FromOperation(operation)
                         .Index()
                         .Find()
+                        .Browse()
                         .StreamsNavigation(page, operation))
                     .AddEmbeddedResource(
                         Constants.Relations.AppendToStream,

Original file line number	Diff line number	Diff line change
`@@ -60,7 +60,7 @@ public static class Relations`
`60`	`60`	`public const string DeleteStream = StreamStorePrefix + ":delete-stream";`
`61`	`61`	`public const string DeleteMessage = StreamStorePrefix + ":delete-message";`
`62`	`62`	`public const string Find = StreamStorePrefix + ":find";`
`63`		`- public const string ListStreams = StreamStorePrefix + ":feed-browser";`
	`63`	`+ public const string Browse = StreamStorePrefix + ":feed-browser";`
`64`	`64`	`}`
`65`	`65`
`66`	`66`	`public static class Streams`
Original file line number	Diff line number	Diff line change
`@@ -9,6 +9,6 @@ public static Links Find(this Links links)`
`9`	`9`	`=> links.Add(Constants.Relations.Find, "streams/{streamId}", "Find a Stream");`
`10`	`10`
`11`	`11`	`public static Links Browse(this Links links)`
`12`		`- => links.Add(Constants.Relations.Browse, "stream/browse{?p,t,m}");`
	`12`	`+ => links.Add(Constants.Relations.Browse, "stream/browse{?p,t,m}", "Browse Streams");`
`13`	`13`	`}`
`14`	`14`	`}`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-namespace SqlStreamStore.HAL.Resources`
	`1`	`+namespace SqlStreamStore.HAL.StreamBrowser`
`2`	`2`	`{`
`3`	`3`	`using System;`
`4`	`4`	`using System.Threading;`
`@@ -19,7 +19,7 @@ public async Task<Response> Get(ListStreamsOperation operation, CancellationToke`
`19`	`19`	`{`
`20`	`20`	`var listStreamsPage = await operation.Invoke(_streamStore, cancellationToken);`
`21`	`21`
`22`		`- var halResponse = new HALResponse(new`
	`22`	`+ return new HalJsonResponse(new HALResponse(new`
`23`	`23`	`{`
`24`	`24`	`listStreamsPage.ContinuationToken`
`25`	`25`	`})`
`@@ -29,23 +29,15 @@ public async Task<Response> Get(ListStreamsOperation operation, CancellationToke`
`29`	`29`	`listStreamsPage.StreamIds,`
`30`	`30`	`streamId =>`
`31`	`31`	`{`
`32`		`- var href = $"../../streams/{streamId}";`
`33`	`32`	`return new HALResponse(null)`
`34`	`33`	`.AddLinks(`
`35`		`- new Link(Constants.Relations.Self, href, streamId),`
`36`		`- new Link(Constants.Relations.Feed, href, streamId));`
	`34`	`+ Links`
	`35`	`+ .FromOperation(operation)`
	`36`	`+ .Index()`
	`37`	`+ .Find()`
	`38`	`+ .StreamBrowserNavigation(listStreamsPage, operation));`
`37`	`39`	`}`
`38`		`- ));`
`39`		`-`
`40`		`- if(listStreamsPage.ContinuationToken != null)`
`41`		`- {`
`42`		`- halResponse.AddLinks(`
`43`		`- new Link(`
`44`		`- Constants.Relations.Next,`
`45`		`- $"browser?p={operation.Pattern.Value}&t={operation.PatternType}&c={listStreamsPage.ContinuationToken}&m={operation.MaxCount}"));`
`46`		`- }`
`47`		`-`
`48`		`- return new HalJsonResponse(halResponse);`
	`40`	`+ )));`
`49`	`41`	`}`
`50`	`42`	`}`
`51`	`43`	`}`