More fixing for nullable indexed values

Author: TechLiam

Examples/IntegrationTestApp/Program.cs

@@ -118,6 +118,7 @@ private static async Task Main()
                     logger.LogInformation($"Name: {data.Firstname} {data.Lastname}");
                     logger.LogInformation($"Year of birth: {data.YearOfBirth}");
                     logger.LogInformation($"Phone number: {data.PhoneNumber}");
+                    logger.LogInformation($"Priority number: {data.PriorityNumber}");
                 }
 
                 var indexKeys = dataManager.ReadIndexKeys<TestIndexData, string>(x => x.PhoneNumber);
@@ -130,6 +131,10 @@ private static async Task Main()
                         logger.LogInformation($"Id: {id}");
                     }
                 }
+
+                var nulledIndexValue = await dataManager.Read<TestIndexData>(2);
+                nulledIndexValue.PriorityNumber = 2;
+                await dataManager.Write(nulledIndexValue);
 
                 write = await dataManager.Write(new TestUniqueIndexData
                 {

Examples/IntegrationTestApp/TestIndexData.cs

@@ -8,5 +8,6 @@ namespace IntegrationTestApp
     public class TestIndexData : TestData
     {
         [Index] [Key(5)] public string PhoneNumber { get; set; }
+        [Index] [Key(6)] public int? PriorityNumber { get; set; }
     }
 }

PackDB.FileSystem/IndexWorker/FileIndexWorker.cs

@@ -141,7 +141,16 @@ public async Task<bool> Index<TDataType>(TDataType data) where TDataType : DataE
                             index = await FileStreamer.ReadDataFromStream<Index<object>>(indexFileName);
                             _logger.LogTrace("Loaded index data");
                             var otherKeys = index.Keys
-                                .Where(x => (x.Value is null || !x.Value.Equals(indexKey)) && x.Ids.Any(y => y == data.Id))
+                                .Where(x => (
+                                        (x.Value is null && indexKey != null) || 
+                                        (indexKey is null && x.Value != null) || 
+                                        (
+                                            x.Value is null ||
+                                            !x.Value.Equals(indexKey)
+                                        )
+                                    ) && 
+                                    x.Ids.Any(y => y == data.Id)
+                                )
                                 .ToArray();
                             if (otherKeys.Any())
                             {
@@ -155,7 +164,7 @@ public async Task<bool> Index<TDataType>(TDataType data) where TDataType : DataE
                                 _logger.LogTrace("Removed old index key");
                             }
 
-                            var key = index.Keys.FirstOrDefault(x => x.Value.Equals(indexKey));
+                            var key = index.Keys.FirstOrDefault(x => (x.Value is null && indexKey is null) || (x.Value != null && x.Value.Equals(indexKey)));
                             if (key is null)
                             {
                                 _logger.LogTrace("Index key doesn't already exist");

PackDB.FileSystem/PackDB.FileSystem.csproj

@@ -24,6 +24,7 @@
 0.4.0 - Handled unique indexes
 0.5.0 - Allowed keys to be read from index
 0.5.1 - Fixed issue with indexing nullable values where moving off of null would throw an exception
+0.5.2 - More fixing for nullable indexed values
         </PackageReleaseNotes>
         <PackageRequireLicenseAcceptance>true</PackageRequireLicenseAcceptance>
         <NeutralLanguage>en-GB</NeutralLanguage>