From f66df43cc23f51ea45a0dab537398f4e99be9215 Mon Sep 17 00:00:00 2001 From: Robert Date: Tue, 12 Mar 2024 08:43:20 +0100 Subject: [PATCH] Materialize before returning data from GetAll calls, tested this time --- src/Artemis.Storage/Repositories/DeviceRepository.cs | 4 ++-- src/Artemis.Storage/Repositories/EntryRepository.cs | 4 ++-- .../Repositories/Interfaces/IDeviceRepository.cs | 2 +- .../Repositories/Interfaces/IEntryRepository.cs | 2 +- .../Repositories/Interfaces/IProfileCategoryRepository.cs | 2 +- src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/Artemis.Storage/Repositories/DeviceRepository.cs b/src/Artemis.Storage/Repositories/DeviceRepository.cs index af3935161..9e7353a3c 100644 --- a/src/Artemis.Storage/Repositories/DeviceRepository.cs +++ b/src/Artemis.Storage/Repositories/DeviceRepository.cs @@ -28,10 +28,10 @@ internal class DeviceRepository(Func getContext) : IDeviceRepo return dbContext.Devices.FirstOrDefault(d => d.Id == id); } - public IEnumerable GetAll() + public List GetAll() { using ArtemisDbContext dbContext = getContext(); - return dbContext.Devices.AsEnumerable(); + return dbContext.Devices.ToList(); } public void Save(DeviceEntity deviceEntity) diff --git a/src/Artemis.Storage/Repositories/EntryRepository.cs b/src/Artemis.Storage/Repositories/EntryRepository.cs index 52bb8df7b..43a155e66 100644 --- a/src/Artemis.Storage/Repositories/EntryRepository.cs +++ b/src/Artemis.Storage/Repositories/EntryRepository.cs @@ -34,10 +34,10 @@ internal class EntryRepository(Func getContext) : IEntryReposi return dbContext.Entries.FirstOrDefault(s => s.EntryId == entryId); } - public IEnumerable GetAll() + public List GetAll() { using ArtemisDbContext dbContext = getContext(); - return dbContext.Entries.AsEnumerable(); + return dbContext.Entries.ToList(); } public void Save(EntryEntity entryEntity) diff --git a/src/Artemis.Storage/Repositories/Interfaces/IDeviceRepository.cs b/src/Artemis.Storage/Repositories/Interfaces/IDeviceRepository.cs index f2a77e3d2..52e5eec15 100644 --- a/src/Artemis.Storage/Repositories/Interfaces/IDeviceRepository.cs +++ b/src/Artemis.Storage/Repositories/Interfaces/IDeviceRepository.cs @@ -8,7 +8,7 @@ public interface IDeviceRepository : IRepository void Add(DeviceEntity deviceEntity); void Remove(DeviceEntity deviceEntity); DeviceEntity? Get(string id); - IEnumerable GetAll(); + List GetAll(); void Save(DeviceEntity deviceEntity); void SaveRange(IEnumerable deviceEntities); } \ No newline at end of file diff --git a/src/Artemis.Storage/Repositories/Interfaces/IEntryRepository.cs b/src/Artemis.Storage/Repositories/Interfaces/IEntryRepository.cs index 46722068e..586542692 100644 --- a/src/Artemis.Storage/Repositories/Interfaces/IEntryRepository.cs +++ b/src/Artemis.Storage/Repositories/Interfaces/IEntryRepository.cs @@ -10,6 +10,6 @@ public interface IEntryRepository : IRepository void Remove(EntryEntity entryEntity); EntryEntity? Get(Guid id); EntryEntity? GetByEntryId(long entryId); - IEnumerable GetAll(); + List GetAll(); void Save(EntryEntity entryEntity); } \ No newline at end of file diff --git a/src/Artemis.Storage/Repositories/Interfaces/IProfileCategoryRepository.cs b/src/Artemis.Storage/Repositories/Interfaces/IProfileCategoryRepository.cs index f2cb69f17..96ca0d7d2 100644 --- a/src/Artemis.Storage/Repositories/Interfaces/IProfileCategoryRepository.cs +++ b/src/Artemis.Storage/Repositories/Interfaces/IProfileCategoryRepository.cs @@ -8,7 +8,7 @@ public interface IProfileCategoryRepository : IRepository { void Add(ProfileCategoryEntity profileCategoryEntity); void Remove(ProfileCategoryEntity profileCategoryEntity); - IEnumerable GetAll(); + List GetAll(); ProfileCategoryEntity? Get(Guid id); bool IsUnique(string name, Guid? id); void Save(ProfileCategoryEntity profileCategoryEntity); diff --git a/src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs b/src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs index e1e58559e..90e53c731 100644 --- a/src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs +++ b/src/Artemis.Storage/Repositories/ProfileCategoryRepository.cs @@ -25,7 +25,7 @@ internal class ProfileCategoryRepository(Func getContext, IPro dbContext.SaveChanges(); } - public IEnumerable GetAll() + public List GetAll() { if (!_migratedProfiles) { @@ -34,7 +34,7 @@ internal class ProfileCategoryRepository(Func getContext, IPro } using ArtemisDbContext dbContext = getContext(); - return dbContext.ProfileCategories.Include(c => c.ProfileConfigurations).AsEnumerable(); + return dbContext.ProfileCategories.Include(c => c.ProfileConfigurations).ToList(); } public ProfileCategoryEntity? Get(Guid id)