Features/continue recreating dbcontext extensions (#4)

* A bunch of clean-up

* Update migrations and continue with FileDetail extensions

* Fix missed test

* Glad that the password isn't for production!

Or, for that matter anywhere but still... Oops!

* Quite possibly pointless but playing with separating the Sonar step

* Bring in offline updates

* Update test data and impacted tests

* Fix path in the previous commit. My bad

* Small cleanup

---------

Co-authored-by: Jason Barden <[email protected]>

Author: jaybarden1

.editorconfig

@@ -1,4 +1,4 @@
-name: Build .NET Core application
+name: Build and analyse the DatabaseTesting Solution
 on:
   pull_request:
     types: [ opened, synchronize, reopened ]
@@ -50,14 +50,23 @@ jobs:
           New-Item -Path .\.sonar\scanner -ItemType Directory 
           dotnet tool update dotnet-sonarscanner --tool-path .\.sonar\scanner
 
-      - name: 🔍 Restore, 🛠 Build and 🧪 Test with ☁️ SonarCloud / Qube
+      - name: 🔍 Restore,
+        shell: powershell
+        run: |
+          dotnet restore
+
+      - name: 🛠 Build
+        shell: powershell
+        run: |
+          dotnet build --no-restore
+
+      - name: 🧪 Test and analyse with ☁️ SonarCloud / Qube
         env:
           SONAR_TOKEN: ${{ secrets.SONAR_TOKEN }}
         shell: powershell
         run: |
           dotnet tool install --global dotnet-coverage
           .\.sonar\scanner\dotnet-sonarscanner begin /k:"astar-development_astar-dev-database-testing" /o:"astar-development" /d:sonar.token="${{ secrets.SONAR_TOKEN }}" /d:sonar.host.url="https://sonarcloud.io" /d:sonar.scanner.scanAll=false /d:sonar.scanner.skipJreProvisioning=true
-          dotnet build
           dotnet-coverage collect 'dotnet test --filter "FullyQualifiedName!~Tests.EndToEnd"' -f xml -o 'coverage.xml'
           .\.sonar\scanner\dotnet-sonarscanner end /d:sonar.token="${{ secrets.SONAR_TOKEN }}"
 #

.github/workflows/main_astar-dev.yml

@@ -20,29 +20,29 @@
     </PropertyGroup>
 
     <ItemGroup>
-        <PackageReference Include="AStar.Dev.Functional.Extensions" Version="0.2.0" />
-        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.0.15" />
-        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7" />
+        <PackageReference Include="AStar.Dev.Functional.Extensions" Version="0.2.0"/>
+        <PackageReference Include="TestableIO.System.IO.Abstractions.Wrappers" Version="22.0.15"/>
+        <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="9.0.7"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="9.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
-        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.7" />
+        <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.7"/>
         <PackageReference Include="Microsoft.EntityFrameworkCore.Design" Version="9.0.7">
             <PrivateAssets>all</PrivateAssets>
             <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
         </PackageReference>
     </ItemGroup>
 
     <ItemGroup>
-        <None Include="LICENSE" Pack="true" PackagePath="" />
-        <None Include="Readme.md" Pack="true" PackagePath="" />
+        <None Include="LICENSE" Pack="true" PackagePath=""/>
+        <None Include="Readme.md" Pack="true" PackagePath=""/>
     </ItemGroup>
 
     <ItemGroup>
         <ProjectReference Include="..\..\support\AStar.Dev.Technical.Debt.Reporting\AStar.Dev.Technical.Debt.Reporting.csproj"/>
         <ProjectReference Include="..\..\support\AStar.Dev.Utilities\AStar.Dev.Utilities.csproj"/>
-        <ProjectReference Include="..\AStar.Dev.Infrastructure\AStar.Dev.Infrastructure.csproj" />
+        <ProjectReference Include="..\AStar.Dev.Infrastructure\AStar.Dev.Infrastructure.csproj"/>
     </ItemGroup>
 
     <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">

src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.csproj

@@ -7,10 +7,8 @@ namespace AStar.Dev.Infrastructure.FilesDb.Data.Configurations;
 
 internal sealed class DirectoryNameConfiguration : IComplexPropertyConfiguration<DirectoryName>
 {
-    public void Configure(ComplexPropertyBuilder<DirectoryName> builder)
-    {
+    public void Configure(ComplexPropertyBuilder<DirectoryName> builder) =>
         builder.Property(directoryName => directoryName.Value)
-            .HasColumnName("DirectoryName")
-            .HasColumnType("nvarchar(256)");
-    }
+               .HasColumnName("DirectoryName")
+               .HasColumnType("nvarchar(256)");
 }

src/AStar.Dev.Infrastructure.FilesDb/AStar.Dev.Infrastructure.FilesDb.xml

@@ -1,4 +1,4 @@
-using AStar.Dev.Infrastructure.Data.Configurations;
+using AStar.Dev.Infrastructure.Data.Configurations;
 using AStar.Dev.Infrastructure.FilesDb.Models;
 using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Metadata.Builders;
@@ -19,10 +19,7 @@ public void Configure(EntityTypeBuilder<FileDetail> builder)
         builder.Property(file => file.Id)
                .HasConversion(fileId => fileId.Value, fileId => new (fileId));
 
-        builder.Property(file => file.FileName)
-               .HasColumnType("nvarchar(256)")
-               .HasConversion(fileName => fileName.Value, fileName => new (fileName));
-
+        builder.Ignore(fileDetail => fileDetail.FileName);
         builder.Ignore(fileDetail => fileDetail.DirectoryName);
         builder.Ignore(fileDetail => fileDetail.FullNameWithPath);
 
@@ -31,16 +28,23 @@ public void Configure(EntityTypeBuilder<FileDetail> builder)
                .HasConversion(fileHandle => fileHandle.Value, fileHandle => new (fileHandle));
 
         builder.ComplexProperty(fileDetail => fileDetail.ImageDetail)
-            .Configure(new ImageDetailConfiguration());
+               .Configure(new ImageDetailConfiguration());
+
         builder.ComplexProperty(fileDetail => fileDetail.DirectoryName)
-            .Configure(new DirectoryNameConfiguration());
+               .Configure(new DirectoryNameConfiguration());
+
+        builder.ComplexProperty(fileDetail => fileDetail.FileName)
+               .Configure(new FileNameConfiguration());
 
         builder.ComplexProperty(fileDetail => fileDetail.DeletionStatus)
                .Configure(new DeletionStatusConfiguration());
 
-        // Will want the handle to be unique, but not yet
-        builder.HasIndex(fileDetail => fileDetail.FileHandle);
-        builder.HasIndex(fileDetail => fileDetail.FileName);
+        builder.HasIndex(fileDetail => fileDetail.FileHandle).IsUnique();
         builder.HasIndex(fileDetail => fileDetail.FileSize);
+
+        // Composite index to optimize duplicate images search (partial optimization)
+        // Note: ImageHeight and ImageWidth can't be indexed directly as they're complex properties
+        builder.HasIndex(fileDetail => new { fileDetail.IsImage, fileDetail.FileSize })
+               .HasDatabaseName("IX_FileDetail_DuplicateImages");
     }
 }

src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/DirectoryNameConfiguration.cs

@@ -0,0 +1,14 @@
+using AStar.Dev.Infrastructure.Data.Configurations;
+using AStar.Dev.Infrastructure.FilesDb.Models;
+using Microsoft.EntityFrameworkCore;
+using Microsoft.EntityFrameworkCore.Metadata.Builders;
+
+namespace AStar.Dev.Infrastructure.FilesDb.Data.Configurations;
+
+internal sealed class FileNameConfiguration : IComplexPropertyConfiguration<FileName>
+{
+    public void Configure(ComplexPropertyBuilder<FileName> builder) =>
+        builder.Property(fileName => fileName.Value)
+               .HasColumnName("FileName")
+               .HasColumnType("nvarchar(256)");
+}

src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileDetailConfiguration.cs

@@ -0,0 +1,20 @@
+using AStar.Dev.Infrastructure.FilesDb.Models;
+
+namespace AStar.Dev.Infrastructure.FilesDb.Data;
+
+/// <summary>
+/// </summary>
+public static class FileDetailDeletionStatusExtensions
+{
+    /// <summary>
+    /// </summary>
+    /// <param name="files"></param>
+    /// <param name="includeDeleted"></param>
+    /// <returns></returns>
+    public static IQueryable<FileDetail> IncludeDeletedOrDeletePending(this IQueryable<FileDetail> files, bool includeDeleted)
+        => includeDeleted
+               ? files
+               : files.Where(f => f.DeletionStatus.HardDeletePending    == null
+                                  && f.DeletionStatus.SoftDeletePending == null
+                                  && f.DeletionStatus.SoftDeleted       == null);
+}

src/AStar.Dev.Infrastructure.FilesDb/Data/Configurations/FileNameConfiguration.cs

@@ -4,19 +4,17 @@
 namespace AStar.Dev.Infrastructure.FilesDb.Data;
 
 /// <summary>
-///
 /// </summary>
 public static class FileDetailDirectoryNameExtensions
 {
     /// <summary>
-    ///
     /// </summary>
-    /// <param name="filesContext"></param>
+    /// <param name="files"></param>
     /// <param name="directoryName"></param>
     /// <param name="includeSubDirectories"></param>
     /// <returns></returns>
-    public static IQueryable<FileDetail> WhereDirectoryNameMatches(this IQueryable<FileDetail> filesContext, string directoryName, bool includeSubDirectories) =>
+    public static IQueryable<FileDetail> WhereDirectoryNameMatches(this IQueryable<FileDetail> files, string directoryName, bool includeSubDirectories) =>
         includeSubDirectories
-            ? filesContext.Where(file => file.DirectoryName.Value.StartsWith(directoryName.RemoveTrailing(@"\")))
-            : filesContext.Where(file => file.DirectoryName.Value == directoryName.RemoveTrailing(@"\"));
+            ? files.Where(file => file.DirectoryName.Value.Contains(directoryName.RemoveTrailing(@"\")))
+            : files.Where(file => file.DirectoryName.Value == directoryName.RemoveTrailing(@"\"));
 }

src/AStar.Dev.Infrastructure.FilesDb/Data/FileDetailDeletionStatusExtensions.cs

@@ -3,20 +3,19 @@
 namespace AStar.Dev.Infrastructure.FilesDb.Data;
 
 /// <summary>
-///
 /// </summary>
 public static class FileDetailLastViewedExtensions
 {
     /// <summary>
-    /// A lot of variations of this method have been tried, but none of them worked as expected.
-    /// This one does not work as we're using SQLite for testing, and it does not support DateTimeOffset.
+    ///     A lot of variations of this method have been tried, but none of them worked as expected.
+    ///     This one does not work as we're using SQLite for testing, and it does not support DateTimeOffset.
     /// </summary>
-    /// <param name="filesContext"></param>
+    /// <param name="files"></param>
     /// <param name="days"></param>
     /// <param name="time"></param>
     /// <returns></returns>
-    public static IQueryable<FileDetail> WhereLastViewedIsOlderThan(this IQueryable<FileDetail> filesContext, int days, TimeProvider time)
+    public static IQueryable<FileDetail> WhereLastViewedIsOlderThan(this IQueryable<FileDetail> files, int days, TimeProvider time)
         => days == 0
-               ? filesContext
-               : filesContext.Where(file => !file.FileLastViewed.HasValue || file.FileLastViewed.Value <= time.GetUtcNow().AddDays(-days));
+               ? files
+               : files.Where(file => !file.FileLastViewed.HasValue || file.FileLastViewed.Value <= time.GetUtcNow().AddDays(-days));
 }