Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -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();

Expand All @@ -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);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
namespace PhoneAssistant.Model;

public enum Result
public enum UpdateStatus
{
Added,
Deleted,
Expand Down
2 changes: 1 addition & 1 deletion PhoneAssistant.Model/Repositories/IPhonesRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,6 @@ public interface IPhonesRepository
Task<Phone?> GetPhoneAsync(string imei);
Task<bool> UserHasProductionPhone(string user);
Task<bool> PhoneNumberExistsAsync(string phoneNumber);
Task<Result> UpdateAsync(Phone phone);
Task<UpdateStatus> UpdateAsync(Phone phone);
Task UpdateStatusAsync(string imei, string status);
}
34 changes: 17 additions & 17 deletions PhoneAssistant.Model/Repositories/PhonesRepository.cs
Original file line number Diff line number Diff line change
Expand Up @@ -70,85 +70,85 @@ public async Task<bool> PhoneNumberExistsAsync(string phoneNumber)
return phone is not null;
}

public async Task<Result> UpdateAsync(Phone phone)
public async Task<UpdateStatus> 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);
Expand Down
Loading