Fixes #309 - FolderFileStorage doesn't overwrite existing content (#310)

FoundatioFx · Sep 14, 2024 · ad61485 · ad61485
1 parent 3c6ef87
commit ad61485
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 2 deletions.
diff --git a/src/Foundatio.TestHarness/Storage/FileStorageTestsBase.cs b/src/Foundatio.TestHarness/Storage/FileStorageTestsBase.cs
@@ -604,9 +604,28 @@ public virtual void CanUseDataDirectory()
         Assert.NotEqual(DATA_DIRECTORY_QUEUE_FOLDER, storage.Folder);
         Assert.True(storage.Folder.EndsWith("Queue" + Path.DirectorySeparatorChar), storage.Folder);
     }
+
+    public virtual async Task CanSaveOverExistingStoredContent()
+    {
+        using var storage = GetStorage();
+        if (storage == null)
+            return;
+
+        await ResetAsync(storage);
+
+        var shortIdInfo = new PostInfo { ProjectId = "123" };
+        var longIdInfo = new PostInfo { ProjectId = "1234567890" };
+
+        string path = "test.json";
+        await storage.SaveObjectAsync(path, longIdInfo);
+        await storage.SaveObjectAsync(path, shortIdInfo);
+
+        var actualInfo = await storage.GetObjectAsync<PostInfo>(path);
+        Assert.Equal(shortIdInfo, actualInfo);
+    }
 }
 
-public class PostInfo
+public record PostInfo
 {
     public int ApiVersion { get; set; }
     public string CharSet { get; set; }

diff --git a/src/Foundatio/Storage/FolderFileStorage.cs b/src/Foundatio/Storage/FolderFileStorage.cs
@@ -60,7 +60,7 @@ public Task<Stream> GetFileStreamAsync(string path, StreamMode streamMode, Cance
         string fullPath = Path.Combine(Folder, normalizedPath);
         EnsureDirectory(fullPath);
 
-        var stream = streamMode == StreamMode.Read ? File.OpenRead(fullPath) : File.OpenWrite(fullPath);
+        var stream = streamMode == StreamMode.Read ? File.OpenRead(fullPath) : new FileStream(fullPath, FileMode.Create, FileAccess.Write);
         return Task.FromResult<Stream>(stream);
     }
 

diff --git a/tests/Foundatio.Tests/Storage/FolderFileStorageTests.cs b/tests/Foundatio.Tests/Storage/FolderFileStorageTests.cs
@@ -135,6 +135,12 @@ public override Task WillWriteStreamContentAsync()
         return base.WillWriteStreamContentAsync();
     }
 
+    [Fact]
+    public override Task CanSaveOverExistingStoredContent()
+    {
+        return base.CanSaveOverExistingStoredContent();
+    }
+
     [Fact]
     public async Task WillNotReturnDirectoryInGetPagedFileListAsync()
     {

diff --git a/tests/Foundatio.Tests/Storage/InMemoryFileStorageTests.cs b/tests/Foundatio.Tests/Storage/InMemoryFileStorageTests.cs
@@ -133,4 +133,10 @@ public override Task WillWriteStreamContentAsync()
     {
         return base.WillWriteStreamContentAsync();
     }
+
+    [Fact]
+    public override Task CanSaveOverExistingStoredContent()
+    {
+        return base.CanSaveOverExistingStoredContent();
+    }
 }
diff --git a/tests/Foundatio.Tests/Storage/ScopedFolderFileStorageTests.cs b/tests/Foundatio.Tests/Storage/ScopedFolderFileStorageTests.cs
@@ -177,6 +177,12 @@ public override Task WillWriteStreamContentAsync()
         return base.WillWriteStreamContentAsync();
     }
 
+    [Fact]
+    public override Task CanSaveOverExistingStoredContent()
+    {
+        return base.CanSaveOverExistingStoredContent();
+    }
+
     [Fact]
     public async Task WillNotReturnDirectoryInGetPagedFileListAsync()
     {

diff --git a/tests/Foundatio.Tests/Storage/ScopedInMemoryFileStorageTests.cs b/tests/Foundatio.Tests/Storage/ScopedInMemoryFileStorageTests.cs
@@ -133,4 +133,10 @@ public override Task WillWriteStreamContentAsync()
     {
         return base.WillWriteStreamContentAsync();
     }
+
+    [Fact]
+    public override Task CanSaveOverExistingStoredContent()
+    {
+        return base.CanSaveOverExistingStoredContent();
+    }
 }