(#102) ContentProxy: redesign the attribute optionality

codingteam · Aug 28, 2022 · f6bcfff · f6bcfff
1 parent b2cccee
commit f6bcfff
Show file tree

Hide file tree

Showing 10 changed files with 27 additions and 33 deletions.
diff --git a/Emulsion.ContentProxy/ContentStorage.fs b/Emulsion.ContentProxy/ContentStorage.fs
@@ -9,8 +9,8 @@ type MessageContentIdentity = {
     ChatUserName: string
     MessageId: int64
     FileId: string
-    FileName: string option
-    MimeType: string option
+    FileName: string
+    MimeType: string
 }
 
 let getOrCreateMessageRecord (context: EmulsionDbContext) (id: MessageContentIdentity): Async<TelegramContent> = async {

diff --git a/Emulsion.Database/EmulsionDbContext.fs b/Emulsion.Database/EmulsionDbContext.fs
@@ -1,6 +1,5 @@
 namespace Emulsion.Database
 
-open EntityFrameworkCore.FSharp.Extensions
 open Microsoft.EntityFrameworkCore
 open Microsoft.EntityFrameworkCore.Design
 
@@ -9,9 +8,6 @@ open Emulsion.Database.Entities
 type EmulsionDbContext(options: DbContextOptions) =
     inherit DbContext(options)
 
-    override _.OnModelCreating builder =
-        builder.RegisterOptionTypes()
-
     [<DefaultValue>] val mutable private telegramContents: DbSet<TelegramContent>
     member this.TelegramContents with get() = this.telegramContents and set v = this.telegramContents <- v
 

diff --git a/Emulsion.Database/Entities.fs b/Emulsion.Database/Entities.fs
@@ -8,6 +8,6 @@ type TelegramContent = {
     ChatUserName: string
     MessageId: int64
     FileId: string
-    FileName: string option
-    MimeType: string option
+    FileName: string
+    MimeType: string
 }
diff --git a/...ons/20220828121717_FileNameAndMimeType.fs → ...20828133844_ContentFileNameAndMimeType.fs b/...ons/20220828121717_FileNameAndMimeType.fs → ...20828133844_ContentFileNameAndMimeType.fs
@@ -5,13 +5,11 @@ open System
 open Emulsion.Database
 open Microsoft.EntityFrameworkCore
 open Microsoft.EntityFrameworkCore.Infrastructure
-open Microsoft.EntityFrameworkCore.Metadata
 open Microsoft.EntityFrameworkCore.Migrations
-open Microsoft.EntityFrameworkCore.Storage.ValueConversion
 
 [<DbContext(typeof<EmulsionDbContext>)>]
-[<Migration("20220828121717_FileNameAndMimeType")>]
-type FileNameAndMimeType() =
+[<Migration("20220828133844_ContentFileNameAndMimeType")>]
+type ContentFileNameAndMimeType() =
     inherit Migration()
 
     override this.Up(migrationBuilder:MigrationBuilder) =
@@ -20,13 +18,15 @@ type FileNameAndMimeType() =
             ,table = "TelegramContents"
             ,``type`` = "TEXT"
             ,nullable = true
+            ,defaultValue = "file.bin"
             ) |> ignore
 
         migrationBuilder.AddColumn<string>(
             name = "MimeType"
             ,table = "TelegramContents"
             ,``type`` = "TEXT"
             ,nullable = true
+            ,defaultValue = "application/octet-stream"
             ) |> ignore
 
 
@@ -59,13 +59,13 @@ type FileNameAndMimeType() =
             b.Property<string>("FileId")
                 .IsRequired(false)
                 .HasColumnType("TEXT") |> ignore
-            b.Property<string option>("FileName")
+            b.Property<string>("FileName")
                 .IsRequired(false)
                 .HasColumnType("TEXT") |> ignore
             b.Property<Int64>("MessageId")
                 .IsRequired(true)
                 .HasColumnType("INTEGER") |> ignore
-            b.Property<string option>("MimeType")
+            b.Property<string>("MimeType")
                 .IsRequired(false)
                 .HasColumnType("TEXT") |> ignore
 

diff --git a/Emulsion.Database/Migrations/EmulsionDbContextModelSnapshot.fs b/Emulsion.Database/Migrations/EmulsionDbContextModelSnapshot.fs
@@ -27,13 +27,13 @@ type EmulsionDbContextModelSnapshot() =
             b.Property<string>("FileId")
                 .IsRequired(false)
                 .HasColumnType("TEXT") |> ignore
-            b.Property<string option>("FileName")
+            b.Property<string>("FileName")
                 .IsRequired(false)
                 .HasColumnType("TEXT") |> ignore
             b.Property<Int64>("MessageId")
                 .IsRequired(true)
                 .HasColumnType("INTEGER") |> ignore
-            b.Property<string option>("MimeType")
+            b.Property<string>("MimeType")
                 .IsRequired(false)
                 .HasColumnType("TEXT") |> ignore
 

diff --git a/Emulsion.Telegram/LinkGenerator.fs b/Emulsion.Telegram/LinkGenerator.fs
@@ -96,8 +96,8 @@ let private getContentIdentities(message: FunogramMessage): ContentStorage.Messa
                 ChatUserName = chatName
                 MessageId = message.MessageId
                 FileId = fileInfo.FileId
-                FileName = fileInfo.FileName
-                MimeType = fileInfo.MimeType
+                FileName = Option.defaultValue "file.bin" fileInfo.FileName
+                MimeType = Option.defaultValue "application/octet-stream" fileInfo.MimeType
             }
        )
     | _ -> Seq.empty

diff --git a/Emulsion.Tests/ContentProxy/ContentStorageTests.fs b/Emulsion.Tests/ContentProxy/ContentStorageTests.fs
@@ -10,8 +10,8 @@ let private testIdentity = {
     ChatUserName = "test"
     MessageId = 123L
     FileId = "this_is_file"
-    FileName = None
-    MimeType = None
+    FileName = "file.bin"
+    MimeType = "application/octet-stream"
 }
 
 let private executeQuery settings =

diff --git a/Emulsion.Tests/Database/DatabaseStructureTests.fs b/Emulsion.Tests/Database/DatabaseStructureTests.fs
@@ -16,8 +16,8 @@ let ``Unique constraint should hold``(): unit =
                 ChatUserName = "testChat"
                 MessageId = 666L
                 FileId = "foobar"
-                FileName = None
-                MimeType = None
+                FileName = "file.bin"
+                MimeType = "application/octet-stream"
             }
             async {
                 do! DataStorage.addAsync ctx.TelegramContents newContent

diff --git a/Emulsion.Tests/Web/ContentControllerTests.fs b/Emulsion.Tests/Web/ContentControllerTests.fs
@@ -84,8 +84,8 @@ type ContentControllerTests(output: ITestOutputHelper) =
             ChatUserName = chatUserName
             MessageId = messageId
             FileId = "foobar"
-            FileName = None
-            MimeType = None
+            FileName = "file.bin"
+            MimeType = "application/octet-stream"
         }
 
         performTestWithContent None content (fun controller -> async {
@@ -106,8 +106,8 @@ type ContentControllerTests(output: ITestOutputHelper) =
             ChatUserName = chatUserName
             MessageId = messageId
             FileId = fileId
-            FileName = None
-            MimeType = None
+            FileName = "file.bin"
+            MimeType = "application/octet-stream"
         }
 
         telegramClient.SetResponse(fileId, None)
@@ -131,8 +131,8 @@ type ContentControllerTests(output: ITestOutputHelper) =
             ChatUserName = chatUserName
             MessageId = messageId
             FileId = fileId
-            FileName = None
-            MimeType = None
+            FileName = "file.bin"
+            MimeType = "application/octet-stream"
         }
 
         use fileCache = setUpFileCache()
@@ -160,8 +160,8 @@ type ContentControllerTests(output: ITestOutputHelper) =
             ChatUserName = chatUserName
             MessageId = messageId
             FileId = fileId
-            FileName = None
-            MimeType = None
+            FileName = "file.bin"
+            MimeType = "application/octet-stream"
         }
 
         let onServerFileId = "fileIdOnServer"

diff --git a/Emulsion.Web/ContentController.fs b/Emulsion.Web/ContentController.fs
@@ -55,7 +55,5 @@ type ContentController(logger: ILogger<ContentController>,
                             logger.LogWarning $"Link \"{fileInfo}\" could not be downloaded."
                             return this.NotFound() :> IActionResult
                         | Some stream ->
-                            let contentType = Option.defaultValue "application/octet-stream" content.MimeType
-                            let fileName = Option.defaultValue "" content.FileName
-                            return FileStreamResult(stream, contentType, FileDownloadName = fileName)
+                            return FileStreamResult(stream, content.MimeType, FileDownloadName = content.FileName)
     }