Add and delete uploaded files (#2)

src/MyWebLog.Data/Interfaces.fs

@@ -205,6 +205,9 @@ type IUploadData =
     /// Add an uploaded file
     abstract member add : Upload -> Task<unit>
     
+    /// Delete an uploaded file
+    abstract member delete : UploadId -> WebLogId -> Task<Result<string, string>>
+    
     /// Find an uploaded file by its path for the given web log
     abstract member findByPath : string -> WebLogId -> Task<Upload option>
     

src/MyWebLog.Data/RethinkDbData.fs

@@ -746,10 +746,30 @@ type RethinkDbData (conn : Net.IConnection, config : DataConfig, log : ILogger<R
                     write; withRetryDefault; ignoreResult conn
                 }
                 
+                member _.delete uploadId webLogId = backgroundTask {
+                    let! upload =
+                        rethink<Upload> {
+                            withTable Table.Upload
+                            get uploadId
+                            resultOption; withRetryOptionDefault
+                        }
+                        |> verifyWebLog<Upload> webLogId (fun u -> u.webLogId) <| conn
+                    match upload with
+                    | Some up ->
+                        do! rethink {
+                            withTable Table.Upload
+                            get uploadId
+                            delete
+                            write; withRetryDefault; ignoreResult conn
+                        }
+                        return Ok (Permalink.toString up.path)
+                    | None -> return Result.Error $"Upload ID {UploadId.toString uploadId} not found"
+                }
+                
                 member _.findByPath path webLogId =
                     rethink<Upload> {
                         withTable Table.Upload
-                        getAll [ r.Array (path, webLogId) ] "webLogAndPath"
+                        getAll [ r.Array (webLogId, path) ] "webLogAndPath"
                         resultCursor; withRetryCursorDefault; toList
                     }
                     |> tryFirst <| conn

src/MyWebLog.Data/SQLite/SQLiteUploadData.fs

@@ -37,6 +37,27 @@ type SQLiteUploadData (conn : SqliteConnection) =
         do! dataStream.CopyToAsync blobStream
     }
     
+    /// Delete an uploaded file by its ID
+    let delete uploadId webLogId = backgroundTask {
+        use cmd = conn.CreateCommand ()
+        cmd.CommandText <- """
+            SELECT id, web_log_id, path, updated_on
+              FROM upload
+             WHERE id         = @id
+               AND web_log_id = @webLogId"""
+        addWebLogId cmd webLogId
+        cmd.Parameters.AddWithValue ("@id", UploadId.toString uploadId) |> ignore
+        let! rdr = cmd.ExecuteReaderAsync ()
+        if (rdr.Read ()) then
+            let upload = Map.toUpload false rdr
+            do! rdr.CloseAsync ()
+            cmd.CommandText <- "DELETE FROM upload WHERE id = @id AND web_log_id = @webLogId"
+            do! write cmd
+            return Ok (Permalink.toString upload.path)
+        else
+            return Error $"""Upload ID {cmd.Parameters["@id"]} not found"""
+    }
+    
     /// Find an uploaded file by its path for the given web log
     let findByPath (path : string) webLogId = backgroundTask {
         use cmd = conn.CreateCommand ()
@@ -72,6 +93,7 @@ type SQLiteUploadData (conn : SqliteConnection) =
     
     interface IUploadData with
         member _.add upload = add upload
+        member _.delete uploadId webLogId = delete uploadId webLogId
         member _.findByPath path webLogId = findByPath path webLogId
         member _.findByWebLog webLogId = findByWebLog webLogId
         member _.findByWebLogWithData webLogId = findByWebLogWithData webLogId