From 676b74b1c773573d4e6b893614957a8ce5f7a0e0 Mon Sep 17 00:00:00 2001 From: JLdgu Date: Thu, 12 Mar 2026 14:01:47 +0000 Subject: [PATCH] Change enum Result to UpdateStatus Result is ambiguous --- .../Repositories/PhonesRepositoryTests.cs | 8 ++--- .../Entities/{Result.cs => UpdateStatus.cs} | 2 +- .../Repositories/IPhonesRepository.cs | 2 +- .../Repositories/PhonesRepository.cs | 34 +++++++++---------- 4 files changed, 23 insertions(+), 23 deletions(-) rename PhoneAssistant.Model/Entities/{Result.cs => UpdateStatus.cs} (80%) diff --git a/PhoneAssistant.Model.Tests/Repositories/PhonesRepositoryTests.cs b/PhoneAssistant.Model.Tests/Repositories/PhonesRepositoryTests.cs index 83b08da..469dad6 100644 --- a/PhoneAssistant.Model.Tests/Repositories/PhonesRepositoryTests.cs +++ b/PhoneAssistant.Model.Tests/Repositories/PhonesRepositoryTests.cs @@ -208,9 +208,9 @@ public async Task UpdateAsync_with_found_Phone_and_changed_property_should_retur await _helper.DbContext.Phones.AddAsync(_phone); await _helper.DbContext.SaveChangesAsync(); - Result result = await _repository.UpdateAsync(updated); + UpdateStatus result = await _repository.UpdateAsync(updated); - await Assert.That(result).IsEqualTo(Result.Updated); + await Assert.That(result).IsEqualTo(UpdateStatus.Updated); Phone? actual = await _helper.DbContext.Phones.FindAsync([_phone.Imei]); await Assert.That(actual).IsNotNull(); @@ -223,10 +223,10 @@ public async Task UpdateAsync_with_unchanged_properties_does_not_update_database await _helper.DbContext.SaveChangesAsync(); Phone? original = await _helper.DbContext.Phones.FindAsync([_phone.Imei]); - Result result = await _repository.UpdateAsync(_phone); + UpdateStatus result = await _repository.UpdateAsync(_phone); await Assert.That(original).IsNotNull(); - await Assert.That(result).IsEqualTo(Result.Unchanged); + await Assert.That(result).IsEqualTo(UpdateStatus.Unchanged); Phone? actual = await _helper.DbContext.Phones.FindAsync([_phone.Imei]); await Assert.That(actual).IsNotNull(); await Assert.That(actual.LastUpdate).IsEqualTo(original.LastUpdate); diff --git a/PhoneAssistant.Model/Entities/Result.cs b/PhoneAssistant.Model/Entities/UpdateStatus.cs similarity index 80% rename from PhoneAssistant.Model/Entities/Result.cs rename to PhoneAssistant.Model/Entities/UpdateStatus.cs index 97bf884..04e8ed0 100644 --- a/PhoneAssistant.Model/Entities/Result.cs +++ b/PhoneAssistant.Model/Entities/UpdateStatus.cs @@ -1,6 +1,6 @@ namespace PhoneAssistant.Model; -public enum Result +public enum UpdateStatus { Added, Deleted, diff --git a/PhoneAssistant.Model/Repositories/IPhonesRepository.cs b/PhoneAssistant.Model/Repositories/IPhonesRepository.cs index 51e414b..ef4a93b 100644 --- a/PhoneAssistant.Model/Repositories/IPhonesRepository.cs +++ b/PhoneAssistant.Model/Repositories/IPhonesRepository.cs @@ -11,6 +11,6 @@ public interface IPhonesRepository Task GetPhoneAsync(string imei); Task UserHasProductionPhone(string user); Task PhoneNumberExistsAsync(string phoneNumber); - Task UpdateAsync(Phone phone); + Task UpdateAsync(Phone phone); Task UpdateStatusAsync(string imei, string status); } \ No newline at end of file diff --git a/PhoneAssistant.Model/Repositories/PhonesRepository.cs b/PhoneAssistant.Model/Repositories/PhonesRepository.cs index 0e8327c..cbbfe42 100644 --- a/PhoneAssistant.Model/Repositories/PhonesRepository.cs +++ b/PhoneAssistant.Model/Repositories/PhonesRepository.cs @@ -70,85 +70,85 @@ public async Task PhoneNumberExistsAsync(string phoneNumber) return phone is not null; } - public async Task UpdateAsync(Phone phone) + public async Task UpdateAsync(Phone phone) { Phone? dbPhone = await dbContext.Phones.FindAsync(phone.Imei) ?? throw new ArgumentException($"IMEI {phone.Imei} not found."); - Result result = Result.Unchanged; + UpdateStatus result = UpdateStatus.Unchanged; if (dbPhone.AssetTag != phone.AssetTag) { dbPhone.AssetTag = phone.AssetTag; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.Condition != phone.Condition) { dbPhone.Condition = phone.Condition; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.DespatchDetails != phone.DespatchDetails) { dbPhone.DespatchDetails = phone.DespatchDetails; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.Esim != phone.Esim) { dbPhone.Esim = phone.Esim; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.FormerUser != phone.FormerUser) { dbPhone.FormerUser = phone.FormerUser; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.IncludeOnTrackingSheet != phone.IncludeOnTrackingSheet) { dbPhone.IncludeOnTrackingSheet = phone.IncludeOnTrackingSheet; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.Model != phone.Model) { dbPhone.Model = phone.Model; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.NewUser != phone.NewUser) { dbPhone.NewUser = phone.NewUser; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.Notes != phone.Notes) { dbPhone.Notes = phone.Notes; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.OEM != phone.OEM) { dbPhone.OEM = phone.OEM; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.PhoneNumber != phone.PhoneNumber) { dbPhone.PhoneNumber = phone.PhoneNumber; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.SerialNumber != phone.SerialNumber) { dbPhone.SerialNumber = phone.SerialNumber; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.SimNumber != phone.SimNumber) { dbPhone.SimNumber = phone.SimNumber; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.Status != phone.Status) { dbPhone.Status = phone.Status; - result = Result.Updated; + result = UpdateStatus.Updated; } if (dbPhone.Ticket != phone.Ticket) { dbPhone.Ticket = phone.Ticket; - result = Result.Updated; + result = UpdateStatus.Updated; } dbContext.Phones.Update(dbPhone);