Skip to content

Commit 579db63

Browse files
hhvrchhvrc
committed
Clean up some efcore code
1 parent 30c38ed commit 579db63

File tree

11 files changed

+20
-27
lines changed

11 files changed

+20
-27
lines changed

‎API/Controller/Admin/DeleteUser.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public sealed partial class AdminController
1717
[ProducesResponseType(StatusCodes.Status200OK)]
1818
public async Task<IActionResult> DeleteUser([FromRoute] Guid userId)
1919
{
20-
var user = await _db.Users.Where(x => x.Id == userId).FirstOrDefaultAsync();
20+
var user = await _db.Users.FirstOrDefaultAsync(x => x.Id == userId);
2121
if (user == null)
2222
{
2323
return Problem(AdminError.UserNotFound);

‎API/Controller/Device/Pair.cs‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,13 @@ public async Task<IActionResult> Pair([FromRoute] string pairCode)
2727
{
2828
var devicePairs = _redis.RedisCollection<DevicePair>();
2929

30-
var pair = await devicePairs.Where(x => x.PairCode == pairCode).FirstOrDefaultAsync();
30+
var pair = await devicePairs.FirstOrDefaultAsync(x => x.PairCode == pairCode);
3131
if (pair == null) return Problem(PairError.PairCodeNotFound);
3232
await devicePairs.DeleteAsync(pair);
3333

34-
var device = await _db.Devices.FirstOrDefaultAsync(x => x.Id == pair.Id);
35-
if (device == null) throw new Exception("Device not found for pair code");
34+
var deviceToken = await _db.Devices.Where(x => x.Id == pair.Id).Select(x => x.Token).FirstOrDefaultAsync();
35+
if (deviceToken == null) throw new Exception("Device not found for pair code");
3636

37-
return LegacyDataOk(device.Token);
37+
return LegacyDataOk(deviceToken);
3838
}
3939
}

‎API/Controller/Devices/DevicesController.cs‎

Lines changed: 2 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -79,8 +79,7 @@ public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
7979
[MapToApiVersion("1")]
8080
public async Task<IActionResult> EditDevice([FromRoute] Guid deviceId, [FromBody] HubEditRequest body, [FromServices] IDeviceUpdateService updateService)
8181
{
82-
var device = await _db.Devices.Where(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId)
83-
.FirstOrDefaultAsync();
82+
var device = await _db.Devices.FirstOrDefaultAsync(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId);
8483
if (device == null) return Problem(DeviceError.DeviceNotFound);
8584

8685
device.Name = body.Name;
@@ -105,8 +104,7 @@ public async Task<IActionResult> EditDevice([FromRoute] Guid deviceId, [FromBody
105104
[MapToApiVersion("1")]
106105
public async Task<IActionResult> RegenerateDeviceToken([FromRoute] Guid deviceId)
107106
{
108-
var device = await _db.Devices.Where(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId)
109-
.FirstOrDefaultAsync();
107+
var device = await _db.Devices.FirstOrDefaultAsync(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId);
110108
if (device == null) return Problem(DeviceError.DeviceNotFound);
111109

112110
device.Token = CryptoUtils.RandomString(256);

‎API/Controller/Shares/V2Requests.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -140,7 +140,8 @@ public async Task<IActionResult> DenyRequest(Guid id)
140140
public async Task<IActionResult> RedeemRequest(Guid id, [FromServices] IDeviceUpdateService deviceUpdateService)
141141
{
142142
var shareRequest = await _db.ShareRequests
143-
.Where(x => x.Id == id && (x.UserId == null || x.UserId == CurrentUser.Id)).Include(x => x.ShockerMappings).FirstOrDefaultAsync();
143+
.Include(x => x.ShockerMappings)
144+
.FirstOrDefaultAsync(x => x.Id == id && (x.UserId == null || x.UserId == CurrentUser.Id));
144145

145146
if (shareRequest == null) return Problem(ShareError.ShareRequestNotFound);
146147

‎API/Controller/Shockers/EditShocker.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -34,8 +34,7 @@ public async Task<IActionResult> EditShocker(
3434
var device = await _db.Devices.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == body.Device);
3535
if (!device) return Problem(DeviceError.DeviceNotFound);
3636

37-
var shocker = await _db.Shockers.Where(x => x.Device.OwnerId == CurrentUser.Id && x.Id == shockerId)
38-
.FirstOrDefaultAsync();
37+
var shocker = await _db.Shockers.FirstOrDefaultAsync(x => x.Device.OwnerId == CurrentUser.Id && x.Id == shockerId);
3938
if (shocker == null) return Problem(ShockerError.ShockerNotFound);
4039
var oldDevice = shocker.DeviceId;
4140

‎API/Controller/Shockers/ListSharedShockers.cs‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,6 @@ public async Task<LegacyDataResponse<IEnumerable<OwnerShockerResponse>>> ListSha
2929
{
3030
var sharedShockersData = await _db.ShockerShares
3131
.AsNoTracking()
32-
.Include(x => x.Shocker.Device.Owner)
3332
.Where(x => x.SharedWithUserId == CurrentUser.Id)
3433
.Select(x => new
3534
{

‎API/Controller/Shockers/PauseShocker.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,7 @@ public sealed partial class ShockerController
2929
public async Task<IActionResult> PauseShocker([FromRoute] Guid shockerId, [FromBody] PauseRequest body,
3030
[FromServices] IDeviceUpdateService deviceUpdateService)
3131
{
32-
var shocker = await _db.Shockers.Where(x => x.Id == shockerId && x.Device.OwnerId == CurrentUser.Id)
33-
.FirstOrDefaultAsync();
32+
var shocker = await _db.Shockers.FirstOrDefaultAsync(x => x.Id == shockerId && x.Device.OwnerId == CurrentUser.Id);
3433
if (shocker == null) return Problem(ShockerError.ShockerNotFound);
3534
shocker.IsPaused = body.Pause;
3635
await _db.SaveChangesAsync();

‎API/Controller/Shockers/ShockerShares.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -194,7 +194,7 @@ public async Task<IActionResult> ShockerShareCodeUpdate(
194194
var affected = await _db.ShockerShares.Where(x =>
195195
x.ShockerId == shockerId && x.SharedWithUserId == sharedWithUserId &&
196196
x.Shocker.Device.OwnerId == CurrentUser.Id).Select(x =>
197-
new { Share = x, DeviceId = x.Shocker.DeviceId, Owner = x.Shocker.Device.OwnerId })
197+
new { Share = x, x.Shocker.DeviceId, Owner = x.Shocker.Device.OwnerId })
198198
.FirstOrDefaultAsync();
199199
if (affected == null) return Problem(ShockerError.ShockerNotFound);
200200

@@ -237,7 +237,8 @@ public async Task<IActionResult> ShockerShareCodePause(
237237
var affected = await _db.ShockerShares.Where(x =>
238238
x.ShockerId == shockerId && x.SharedWithUserId == sharedWithUserId &&
239239
x.Shocker.Device.OwnerId == CurrentUser.Id).Select(x =>
240-
new { Share = x, DeviceId = x.Shocker.DeviceId, Owner = x.Shocker.Device.OwnerId }).FirstOrDefaultAsync();
240+
new { Share = x, x.Shocker.DeviceId, Owner = x.Shocker.Device.OwnerId })
241+
.FirstOrDefaultAsync();
241242
if (affected == null) return Problem(ShockerError.ShockerNotFound);
242243

243244
affected.Share.IsPaused = body.Pause;

‎Common/Services/LCGNodeProvisioner/LCGNodeProvisioner.cs‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,9 +22,8 @@ public LCGNodeProvisioner(IRedisConnectionProvider redisConnectionProvider, ILog
2222
public async Task<LcgNode?> GetOptimalNode(string environment)
2323
{
2424
var node = await _lcgNodes
25-
.Where(x => x.Environment == environment)
2625
.OrderBy(x => x.Load)
27-
.FirstOrDefaultAsync();
26+
.FirstOrDefaultAsync(x => x.Environment == environment);
2827

2928
if (node == null) _logger.LogWarning("No LCG nodes available!");
3029
if (_logger.IsEnabled(LogLevel.Debug)) _logger.LogDebug("LCG node provisioned: {@LcgNode}", node);

‎Common/Services/Ota/OtaService.cs‎

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -37,8 +37,7 @@ public Task Started(Guid deviceId, int updateId, SemVersion version)
3737
public async Task Progress(Guid deviceId, int updateId)
3838
{
3939
var updateTask = await _db.DeviceOtaUpdates
40-
.Where(x => x.DeviceId == deviceId && x.UpdateId == updateId)
41-
.FirstOrDefaultAsync();
40+
.FirstOrDefaultAsync(x => x.DeviceId == deviceId && x.UpdateId == updateId);
4241
if (updateTask == null) return;
4342
updateTask.Status = OtaUpdateStatus.Running;
4443

@@ -49,8 +48,7 @@ public async Task Progress(Guid deviceId, int updateId)
4948
public async Task Error(Guid deviceId, int updateId, bool fatal, string message)
5049
{
5150
var updateTask = await _db.DeviceOtaUpdates
52-
.Where(x => x.DeviceId == deviceId && x.UpdateId == updateId)
53-
.FirstOrDefaultAsync();
51+
.FirstOrDefaultAsync(x => x.DeviceId == deviceId && x.UpdateId == updateId);
5452
if (updateTask == null) return;
5553
updateTask.Status = OtaUpdateStatus.Error;
5654
updateTask.Message = message;
@@ -62,8 +60,7 @@ public async Task Error(Guid deviceId, int updateId, bool fatal, string message)
6260
public async Task<bool> Success(Guid deviceId, int updateId)
6361
{
6462
var updateTask = await _db.DeviceOtaUpdates
65-
.Where(x => x.DeviceId == deviceId && x.UpdateId == updateId)
66-
.FirstOrDefaultAsync();
63+
.FirstOrDefaultAsync(x => x.DeviceId == deviceId && x.UpdateId == updateId);
6764
if (updateTask == null) return false;
6865
updateTask.Status = OtaUpdateStatus.Finished;
6966

0 commit comments

Comments
 (0)