Skip to content

Commit cebeda8

Browse files
committed
Change enum Result to UpdateStatus
Result is ambiguous
1 parent 796047a commit cebeda8

4 files changed

Lines changed: 23 additions & 23 deletions

File tree

PhoneAssistant.Model.Tests/Repositories/PhonesRepositoryTests.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -208,9 +208,9 @@ public async Task UpdateAsync_with_found_Phone_and_changed_property_should_retur
208208
await _helper.DbContext.Phones.AddAsync(_phone);
209209
await _helper.DbContext.SaveChangesAsync();
210210

211-
Result result = await _repository.UpdateAsync(updated);
211+
UpdateStatus result = await _repository.UpdateAsync(updated);
212212

213-
await Assert.That(result).IsEqualTo(Result.Updated);
213+
await Assert.That(result).IsEqualTo(UpdateStatus.Updated);
214214
Phone? actual = await _helper.DbContext.Phones.FindAsync([_phone.Imei]);
215215
await Assert.That(actual).IsNotNull();
216216

@@ -223,10 +223,10 @@ public async Task UpdateAsync_with_unchanged_properties_does_not_update_database
223223
await _helper.DbContext.SaveChangesAsync();
224224
Phone? original = await _helper.DbContext.Phones.FindAsync([_phone.Imei]);
225225

226-
Result result = await _repository.UpdateAsync(_phone);
226+
UpdateStatus result = await _repository.UpdateAsync(_phone);
227227

228228
await Assert.That(original).IsNotNull();
229-
await Assert.That(result).IsEqualTo(Result.Unchanged);
229+
await Assert.That(result).IsEqualTo(UpdateStatus.Unchanged);
230230
Phone? actual = await _helper.DbContext.Phones.FindAsync([_phone.Imei]);
231231
await Assert.That(actual).IsNotNull();
232232
await Assert.That(actual.LastUpdate).IsEqualTo(original.LastUpdate);

PhoneAssistant.Model/Entities/Result.cs renamed to PhoneAssistant.Model/Entities/UpdateStatus.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
namespace PhoneAssistant.Model;
22

3-
public enum Result
3+
public enum UpdateStatus
44
{
55
Added,
66
Deleted,

PhoneAssistant.Model/Repositories/IPhonesRepository.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,6 @@ public interface IPhonesRepository
1111
Task<Phone?> GetPhoneAsync(string imei);
1212
Task<bool> UserHasProductionPhone(string user);
1313
Task<bool> PhoneNumberExistsAsync(string phoneNumber);
14-
Task<Result> UpdateAsync(Phone phone);
14+
Task<UpdateStatus> UpdateAsync(Phone phone);
1515
Task UpdateStatusAsync(string imei, string status);
1616
}

PhoneAssistant.Model/Repositories/PhonesRepository.cs

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -70,85 +70,85 @@ public async Task<bool> PhoneNumberExistsAsync(string phoneNumber)
7070
return phone is not null;
7171
}
7272

73-
public async Task<Result> UpdateAsync(Phone phone)
73+
public async Task<UpdateStatus> UpdateAsync(Phone phone)
7474
{
7575
Phone? dbPhone = await dbContext.Phones.FindAsync(phone.Imei) ?? throw new ArgumentException($"IMEI {phone.Imei} not found.");
76-
Result result = Result.Unchanged;
76+
UpdateStatus result = UpdateStatus.Unchanged;
7777

7878
if (dbPhone.AssetTag != phone.AssetTag)
7979
{
8080
dbPhone.AssetTag = phone.AssetTag;
81-
result = Result.Updated;
81+
result = UpdateStatus.Updated;
8282
}
8383
if (dbPhone.Condition != phone.Condition)
8484
{
8585
dbPhone.Condition = phone.Condition;
86-
result = Result.Updated;
86+
result = UpdateStatus.Updated;
8787
}
8888
if (dbPhone.DespatchDetails != phone.DespatchDetails)
8989
{
9090
dbPhone.DespatchDetails = phone.DespatchDetails;
91-
result = Result.Updated;
91+
result = UpdateStatus.Updated;
9292
}
9393
if (dbPhone.Esim != phone.Esim)
9494
{
9595
dbPhone.Esim = phone.Esim;
96-
result = Result.Updated;
96+
result = UpdateStatus.Updated;
9797
}
9898
if (dbPhone.FormerUser != phone.FormerUser)
9999
{
100100
dbPhone.FormerUser = phone.FormerUser;
101-
result = Result.Updated;
101+
result = UpdateStatus.Updated;
102102
}
103103
if (dbPhone.IncludeOnTrackingSheet != phone.IncludeOnTrackingSheet)
104104
{
105105
dbPhone.IncludeOnTrackingSheet = phone.IncludeOnTrackingSheet;
106-
result = Result.Updated;
106+
result = UpdateStatus.Updated;
107107
}
108108
if (dbPhone.Model != phone.Model)
109109
{
110110
dbPhone.Model = phone.Model;
111-
result = Result.Updated;
111+
result = UpdateStatus.Updated;
112112
}
113113
if (dbPhone.NewUser != phone.NewUser)
114114
{
115115
dbPhone.NewUser = phone.NewUser;
116-
result = Result.Updated;
116+
result = UpdateStatus.Updated;
117117
}
118118
if (dbPhone.Notes != phone.Notes)
119119
{
120120
dbPhone.Notes = phone.Notes;
121-
result = Result.Updated;
121+
result = UpdateStatus.Updated;
122122
}
123123
if (dbPhone.OEM != phone.OEM)
124124
{
125125
dbPhone.OEM = phone.OEM;
126-
result = Result.Updated;
126+
result = UpdateStatus.Updated;
127127
}
128128
if (dbPhone.PhoneNumber != phone.PhoneNumber)
129129
{
130130
dbPhone.PhoneNumber = phone.PhoneNumber;
131-
result = Result.Updated;
131+
result = UpdateStatus.Updated;
132132
}
133133
if (dbPhone.SerialNumber != phone.SerialNumber)
134134
{
135135
dbPhone.SerialNumber = phone.SerialNumber;
136-
result = Result.Updated;
136+
result = UpdateStatus.Updated;
137137
}
138138
if (dbPhone.SimNumber != phone.SimNumber)
139139
{
140140
dbPhone.SimNumber = phone.SimNumber;
141-
result = Result.Updated;
141+
result = UpdateStatus.Updated;
142142
}
143143
if (dbPhone.Status != phone.Status)
144144
{
145145
dbPhone.Status = phone.Status;
146-
result = Result.Updated;
146+
result = UpdateStatus.Updated;
147147
}
148148
if (dbPhone.Ticket != phone.Ticket)
149149
{
150150
dbPhone.Ticket = phone.Ticket;
151-
result = Result.Updated;
151+
result = UpdateStatus.Updated;
152152
}
153153

154154
dbContext.Phones.Update(dbPhone);

0 commit comments

Comments
 (0)