(#147) Web: initial controller implementation

ForNeVeR · ForNeVeR · commit 9e7305ec5ecc · 2022-07-02T13:31:45.000+07:00
diff --git a/Emulsion.ContentProxy/ContentStorage.fs b/Emulsion.ContentProxy/ContentStorage.fs
@@ -32,9 +32,9 @@ let getOrCreateMessageRecord (context: EmulsionDbContext) (id: MessageContentIde
     | Some item -> return item
 }
 
-let getById (context: EmulsionDbContext) (id: int64): Async<TelegramContent> = async {
+let getById (context: EmulsionDbContext) (id: int64): Async<TelegramContent option> = async {
     return! query {
         for content in context.TelegramContents do
         where (content.Id = id)
-    } |> exactlyOneAsync
+    } |> tryExactlyOneAsync
 }
diff --git a/Emulsion.Settings/Emulsion.Settings.fsproj b/Emulsion.Settings/Emulsion.Settings.fsproj
@@ -0,0 +1,16 @@
+﻿<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <TargetFramework>net6.0</TargetFramework>
+        <GenerateDocumentationFile>true</GenerateDocumentationFile>
+    </PropertyGroup>
+
+    <ItemGroup>
+        <Compile Include="Settings.fs" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Emulsion.Database\Emulsion.Database.fsproj" />
+    </ItemGroup>
+
+</Project>
diff --git a/Emulsion.Settings/Settings.fs b/Emulsion.Settings/Settings.fs
diff --git a/Emulsion.Tests/Telegram/LinkGeneratorTests.fs b/Emulsion.Tests/Telegram/LinkGeneratorTests.fs
@@ -155,6 +155,7 @@ let private doDatabaseLinksTest (fileIds: string[]) message =
                 let! content = DataStorage.transaction databaseSettings (fun context ->
                     ContentStorage.getById context (Proxy.decodeHashId hostingSettings.HashIdSalt id)
                 )
+                let content = Option.get content
 
                 Assert.Equal(message.MessageId, content.MessageId)
                 Assert.Equal(message.Chat.Username, Some content.ChatUserName)
diff --git a/Emulsion.Web/Controllers/ContentController.fs b/Emulsion.Web/Controllers/ContentController.fs
@@ -0,0 +1,47 @@
+﻿namespace Emulsion.Web.Controllers
+
+open System.Globalization
+open System.Threading.Tasks
+
+open Microsoft.AspNetCore.Mvc
+open Microsoft.Extensions.Logging
+
+open Emulsion.ContentProxy
+open Emulsion.Database
+open Emulsion.Settings
+
+[<ApiController>]
+[<Route("content")>]
+type ContentController(logger: ILogger<ContentController>,
+                       configuration: HostingSettings,
+                       context: EmulsionDbContext) =
+    inherit ControllerBase()
+
+    let decodeHashId hashId =
+        try
+            Some <| Proxy.decodeHashId configuration.HashIdSalt hashId
+        with
+            | ex ->
+                logger.LogWarning(ex, "Error during hashId deserializing")
+                None
+
+    let produceRedirect contentId: Async<IActionResult option> = async {
+        let! content = ContentStorage.getById context contentId
+        return
+            content
+            |> Option.map(fun c ->
+                let url = $"https://t.me/{c.ChatUserName}/{c.MessageId.ToString(CultureInfo.InvariantCulture)}"
+                RedirectResult url
+            )
+    }
+
+
+    [<HttpGet>]
+    member this.Get(hashId: string): Task<IActionResult> = task {
+        match decodeHashId hashId with
+        | None -> return this.BadRequest()
+        | Some contentId ->
+            match! produceRedirect contentId with
+            | None -> return this.NotFound() :> IActionResult
+            | Some redirect -> return redirect
+    }
diff --git a/Emulsion.Web/Controllers/WeatherForecastController.fs b/Emulsion.Web/Controllers/WeatherForecastController.fs
diff --git a/Emulsion.Web/Emulsion.Web.fsproj b/Emulsion.Web/Emulsion.Web.fsproj
@@ -5,8 +5,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <Compile Include="WeatherForecast.fs"/>
-    <Compile Include="Controllers/WeatherForecastController.fs"/>
-    <Compile Include="WebServer.fs"/>
+    <Compile Include="Controllers\ContentController.fs" />
+    <Compile Include="WebServer.fs" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\Emulsion.ContentProxy\Emulsion.ContentProxy.fsproj" />
+    <ProjectReference Include="..\Emulsion.Settings\Emulsion.Settings.fsproj" />
   </ItemGroup>
 </Project>
diff --git a/Emulsion.Web/WeatherForecast.fs b/Emulsion.Web/WeatherForecast.fs
diff --git a/Emulsion.Web/WebServer.fs b/Emulsion.Web/WebServer.fs
@@ -3,16 +3,17 @@ module Emulsion.Web.WebServer
 open System
 open System.Threading.Tasks
 
-open Emulsion.Web.Controllers
 open Microsoft.AspNetCore.Builder
 open Microsoft.Extensions.DependencyInjection
 
+open Emulsion.Web.Controllers
+
 let run(baseUri: Uri): Task =
     // TODO: Pass baseUri
     let builder = WebApplication.CreateBuilder()
     builder.Services
         .AddControllers()
-        .AddApplicationPart(typeof<WeatherForecastController>.Assembly)
+        .AddApplicationPart(typeof<ContentController>.Assembly)
     |> ignore
 
     let app = builder.Build()
diff --git a/Emulsion.sln b/Emulsion.sln
@@ -42,6 +42,8 @@ Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Emulsion.ContentProxy", "Em
 EndProject
 Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Emulsion.Web", "Emulsion.Web\Emulsion.Web.fsproj", "{8EFD8F6C-43D3-4CE0-ADB8-63401E4A64FE}"
 EndProject
+Project("{F2A71F9B-5D33-465A-A702-920D77279786}") = "Emulsion.Settings", "Emulsion.Settings\Emulsion.Settings.fsproj", "{88331E40-EF70-4AF1-99CA-8A849208CAB7}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -71,6 +73,10 @@ Global
 		{8EFD8F6C-43D3-4CE0-ADB8-63401E4A64FE}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{8EFD8F6C-43D3-4CE0-ADB8-63401E4A64FE}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{8EFD8F6C-43D3-4CE0-ADB8-63401E4A64FE}.Release|Any CPU.Build.0 = Release|Any CPU
+		{88331E40-EF70-4AF1-99CA-8A849208CAB7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{88331E40-EF70-4AF1-99CA-8A849208CAB7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{88331E40-EF70-4AF1-99CA-8A849208CAB7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{88331E40-EF70-4AF1-99CA-8A849208CAB7}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(NestedProjects) = preSolution
 		{7D1ADF47-BF1C-4007-BB9B-08C283044467} = {973131E1-E645-4A50-A0D2-1886A1A8F0C6}
diff --git a/Emulsion/Emulsion.fsproj b/Emulsion/Emulsion.fsproj
@@ -7,7 +7,6 @@
   </PropertyGroup>
   <ItemGroup>
     <Compile Include="AssemblyInfo.fs" />
-    <Compile Include="Settings.fs" />
     <Compile Include="Message.fs" />
     <Compile Include="MessageSender.fs" />
     <Compile Include="MessageSystem.fs" />

Original file line number	Diff line number	Diff line change
`@@ -32,9 +32,9 @@ let getOrCreateMessageRecord (context: EmulsionDbContext) (id: MessageContentIde`
`32`	`32`	`\| Some item -> return item`
`33`	`33`	`}`
`34`	`34`
`35`		`-let getById (context: EmulsionDbContext) (id: int64): Async<TelegramContent> = async {`
	`35`	`+let getById (context: EmulsionDbContext) (id: int64): Async<TelegramContent option> = async {`
`36`	`36`	`return! query {`
`37`	`37`	`for content in context.TelegramContents do`
`38`	`38`	`where (content.Id = id)`
`39`		`- } \|> exactlyOneAsync`
	`39`	`+ } \|> tryExactlyOneAsync`
`40`	`40`	`}`
Original file line number	Diff line number	Diff line change
`@@ -155,6 +155,7 @@ let private doDatabaseLinksTest (fileIds: string[]) message =`
`155`	`155`	`let! content = DataStorage.transaction databaseSettings (fun context ->`
`156`	`156`	`ContentStorage.getById context (Proxy.decodeHashId hostingSettings.HashIdSalt id)`
`157`	`157`	`)`
	`158`	`+ let content = Option.get content`
`158`	`159`
`159`	`160`	`Assert.Equal(message.MessageId, content.MessageId)`
`160`	`161`	`Assert.Equal(message.Chat.Username, Some content.ChatUserName)`