Categories out of subscriptions of user

src/Server/FeedCompositions.fs

@@ -37,7 +37,14 @@ module FeedCompositions =
 
     let getCategoriesComposition eventStore =
         let events = allFeedsEvents eventStore
-        ok (getCategories events)
+        let feeds = getFeeds events
+        ok (getCategories feeds)
+
+    let getCategoriesOfFeedsComposition eventStore feedIds =
+        let events = allFeedsEvents eventStore
+        let feeds = getFeeds events
+                    |> List.filter (fun f -> List.contains f.Id feedIds)
+        ok (getCategories feeds)
 
     let addEpisodeComposition eventStore feedId rendition =
         let (events, version) = getAllEventsFromStreamById eventStore (getFeedStreamId feedId)

src/Server/Feeds.fs

@@ -130,8 +130,8 @@ module FeedSource =
                        Length = rendition.Length
                        ReleaseDate = rendition.ReleaseDate }
 
-    let getCategories events =
-        getFeeds events
+    let getCategories (feeds:FeedListItemRendition list) =
+        feeds
         |> List.map (fun s -> s.Category)
         |> List.distinct
         |> List.filter (System.String.IsNullOrWhiteSpace >> not)

src/Server/Server.fsproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk.Web">
+<Project Sdk="Microsoft.NET.Sdk.Web">
   <PropertyGroup>
     <OutputType>Exe</OutputType>
     <TargetFramework>netcoreapp3.0</TargetFramework>
@@ -17,11 +17,11 @@
     <Compile Include="Http.fs" />
     <Compile Include="Feeds.fs" />
     <Compile Include="FeedCompositions.fs" />
+    <Compile Include="Subscriptions.fs" />
     <Compile Include="Smapi.fs" />
     <Compile Include="SmapiComposition.fs" />
     <Compile Include="Users.fs" />
     <Compile Include="UserCompositions.fs" />
-    <Compile Include="Subscriptions.fs" />
     <Compile Include="Server.fs" />
   </ItemGroup>
   <Import Project="..\..\.paket\Paket.Restore.targets" />

src/Server/Smapi.fs

@@ -8,6 +8,7 @@ open FSharp.Data
 open System.Text.RegularExpressions
 
 open FeedCompositions
+open SubscriptionCompositions
 
 type SmapiMethod =
     | GetMetadata of string*(UserId option)
@@ -92,7 +93,7 @@ module Smapi =
         | Some t -> Some t.UserId
 
     let getCategories eventStore userId =
-        let result = getCategoriesComposition eventStore
+        let result = SubscriptionCompositions.getSubscriptionsCategoriesComposition eventStore userId
         match result with
         | Success (categories) -> categories
                                   |> List.sort

src/Server/Subscriptions.fs

@@ -85,6 +85,14 @@ module SubscriptionCompositions =
         let evs = subscriptionEvents eventStore user.Id
         ok (getSubscriptions evs)
 
+    let getSubscriptionsCategoriesComposition eventStore userId =
+        let feedIds = subscriptionEvents eventStore userId
+                            |> getSubscriptions
+                            |> List.map (fun s -> s.FeedId)
+                            |> List.distinct
+        FeedCompositions.getCategoriesOfFeedsComposition eventStore feedIds
+
+
     let subscriptionsRouter eventStore = router {
         pipe_through authorize
         get "" (processAuthorizedAsync getSubscriptionsComposition eventStore)