From 3f2397750a3f5bbdf5ef78049c237ebeaff78319 Mon Sep 17 00:00:00 2001 From: Roy Ben Shabat Date: Thu, 3 Dec 2020 03:48:25 +0200 Subject: DataStore fixes. --- .../DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'Software/Visual_Studio/DataStore/Tango.DataStore.EF') diff --git a/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs b/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs index c1b45e37f..6ccc6d78a 100644 --- a/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs +++ b/Software/Visual_Studio/DataStore/Tango.DataStore.EF/EFDataStoreCollection.cs @@ -57,6 +57,7 @@ namespace Tango.DataStore.EF item.Value = EFDataStoreHelper.CreateBytes(type, value); item.IsSynchronized = false; item.LastUpdated = DateTime.UtcNow; + item.IsDeleted = false; db.SaveChanges(); } @@ -91,7 +92,7 @@ namespace Tango.DataStore.EF { using (var db = ObservablesContext.CreateDefault()) { - var item = db.DataStoreItems.SingleOrDefault(x => x.CollectionName == Name && x.Key == key); + var item = db.DataStoreItems.SingleOrDefault(x => x.CollectionName == Name && x.Key == key && !x.IsDeleted); if (item == null) { @@ -123,7 +124,7 @@ namespace Tango.DataStore.EF { using (var db = ObservablesContext.CreateDefault()) { - var localItems = db.DataStoreItems.Where(x => x.CollectionName == Name).ToList(); + var localItems = db.DataStoreItems.Where(x => x.CollectionName == Name && !x.IsDeleted).ToList(); var globalItems = db.GlobalDataStoreItems.Where(x => x.CollectionName == Name).ToList(); foreach (var globalItem in globalItems.ToList()) -- cgit v1.3.1