Skip to content

Commit 80cf48d

Browse files
hhvrchhvrc
committed
Foreign keys, ids, and navigations naming cleanup
1 parent 988aabc commit 80cf48d

44 files changed

Lines changed: 2123 additions & 308 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎API/Controller/Admin/GetOnlineDevices.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,9 +33,9 @@ public async Task<IActionResult> GetOnlineDevices()
3333
x.Name,
3434
Owner = new GenericIni
3535
{
36-
Id = x.OwnerNavigation.Id,
37-
Image = x.OwnerNavigation.GetImageUrl(),
38-
Name = x.OwnerNavigation.Name
36+
Id = x.Owner.Id,
37+
Image = x.Owner.GetImageUrl(),
38+
Name = x.Owner.Name
3939
}
4040
}).ToArrayAsync();
4141

‎API/Controller/Device/GetSelf.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ public sealed partial class DeviceController
1414
[HttpGet("self")]
1515
public async Task<LegacyDataResponse<DeviceSelfResponse>> GetSelf()
1616
{
17-
var shockers = await _db.Shockers.Where(x => x.Device == CurrentDevice.Id).Select(x => new MinimalShocker
17+
var shockers = await _db.Shockers.Where(x => x.DeviceId == CurrentDevice.Id).Select(x => new MinimalShocker
1818
{
1919
Id = x.Id,
2020
RfId = x.RfId,

‎API/Controller/Devices/DeviceOtaController.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@ public async Task<IActionResult> GetOtaUpdateHistory([FromRoute] Guid deviceId,
4545
{
4646
// Check if user owns device or has a share
4747
var deviceExistsAndYouHaveAccess = await _db.Devices.AnyAsync(x =>
48-
x.Id == deviceId && x.Owner == CurrentUser.Id);
48+
x.Id == deviceId && x.OwnerId == CurrentUser.Id);
4949
if (!deviceExistsAndYouHaveAccess) return Problem(DeviceError.DeviceNotFound);
5050

5151
return LegacyDataOk(await otaService.GetUpdates(deviceId));

‎API/Controller/Devices/DevicesController.cs‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public sealed partial class DevicesController
2525
public LegacyDataResponse<IAsyncEnumerable<Models.Response.ResponseDevice>> ListDevices()
2626
{
2727
var devices = _db.Devices
28-
.Where(x => x.Owner == CurrentUser.Id)
28+
.Where(x => x.OwnerId == CurrentUser.Id)
2929
.Select(x => new Models.Response.ResponseDevice
3030
{
3131
Id = x.Id,
@@ -51,7 +51,7 @@ public async Task<IActionResult> GetDeviceById([FromRoute] Guid deviceId)
5151
var hasAuthPerms = IsAllowed(PermissionType.Devices_Auth);
5252

5353

54-
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.Id && x.Id == deviceId)
54+
var device = await _db.Devices.Where(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId)
5555
.Select(x => new Models.Response.ResponseDeviceWithToken
5656
{
5757
Id = x.Id,
@@ -79,7 +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.Owner == CurrentUser.Id && x.Id == deviceId)
82+
var device = await _db.Devices.Where(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId)
8383
.FirstOrDefaultAsync();
8484
if (device == null) return Problem(DeviceError.DeviceNotFound);
8585

@@ -105,7 +105,7 @@ public async Task<IActionResult> EditDevice([FromRoute] Guid deviceId, [FromBody
105105
[MapToApiVersion("1")]
106106
public async Task<IActionResult> RegenerateDeviceToken([FromRoute] Guid deviceId)
107107
{
108-
var device = await _db.Devices.Where(x => x.Owner == CurrentUser.Id && x.Id == deviceId)
108+
var device = await _db.Devices.Where(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId)
109109
.FirstOrDefaultAsync();
110110
if (device == null) return Problem(DeviceError.DeviceNotFound);
111111

@@ -131,7 +131,7 @@ public async Task<IActionResult> RegenerateDeviceToken([FromRoute] Guid deviceId
131131
[MapToApiVersion("1")]
132132
public async Task<IActionResult> RemoveDevice([FromRoute] Guid deviceId, [FromServices] IDeviceUpdateService updateService)
133133
{
134-
var affected = await _db.Devices.Where(x => x.Id == deviceId).WhereIsUserOrPrivileged(x => x.OwnerNavigation, CurrentUser).ExecuteDeleteAsync();
134+
var affected = await _db.Devices.Where(x => x.Id == deviceId).WhereIsUserOrPrivileged(x => x.Owner, CurrentUser).ExecuteDeleteAsync();
135135
if (affected <= 0) return Problem(DeviceError.DeviceNotFound);
136136

137137
await updateService.UpdateDeviceForAllShared(CurrentUser.Id, deviceId, DeviceUpdateType.Deleted);
@@ -167,7 +167,7 @@ public async Task<IActionResult> CreateDeviceV2([FromBody] HubCreateRequest data
167167
var device = new Common.OpenShockDb.Device
168168
{
169169
Id = Guid.CreateVersion7(),
170-
Owner = CurrentUser.Id,
170+
OwnerId = CurrentUser.Id,
171171
Name = data.Name,
172172
Token = CryptoUtils.RandomString(256)
173173
};
@@ -194,7 +194,7 @@ public async Task<IActionResult> GetPairCode([FromRoute] Guid deviceId)
194194
{
195195
var devicePairs = _redis.RedisCollection<DevicePair>();
196196

197-
var deviceExists = await _db.Devices.AnyAsync(x => x.Id == deviceId && x.Owner == CurrentUser.Id);
197+
var deviceExists = await _db.Devices.AnyAsync(x => x.Id == deviceId && x.OwnerId == CurrentUser.Id);
198198
if (!deviceExists) Problem(DeviceError.DeviceNotFound);
199199
// replace with unlink?
200200
var existing = await devicePairs.FindByIdAsync(deviceId.ToString());
@@ -230,8 +230,8 @@ public async Task<IActionResult> GetLiveControlGatewayInfo([FromRoute] Guid devi
230230
{
231231
// Check if user owns device or has a share
232232
var deviceExistsAndYouHaveAccess = await _db.Devices.AnyAsync(x =>
233-
x.Id == deviceId && (x.Owner == CurrentUser.Id || x.Shockers.Any(y => y.ShockerShares.Any(
234-
z => z.SharedWith == CurrentUser.Id))));
233+
x.Id == deviceId && (x.OwnerId == CurrentUser.Id || x.Shockers.Any(y => y.ShockerShares.Any(
234+
z => z.SharedWithUserId == CurrentUser.Id))));
235235
if (!deviceExistsAndYouHaveAccess) return Problem(DeviceError.DeviceNotFound);
236236

237237
// Check if device is online

‎API/Controller/Devices/GetShockers.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ public sealed partial class DevicesController
2323
[MapToApiVersion("1")]
2424
public async Task<IActionResult> GetShockers([FromRoute] Guid deviceId)
2525
{
26-
var deviceExists = await _db.Devices.AnyAsync(x => x.Owner == CurrentUser.Id && x.Id == deviceId);
26+
var deviceExists = await _db.Devices.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == deviceId);
2727
if (!deviceExists) return Problem(DeviceError.DeviceNotFound);
2828

2929
var shockers = _db.Shockers
30-
.Where(x => x.Device == deviceId)
30+
.Where(x => x.DeviceId == deviceId)
3131
.Select(x => new ShockerResponse
3232
{
3333
Id = x.Id,

‎API/Controller/Public/PublicShareController.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ public async Task<IActionResult> GetShareLink([FromRoute] Guid shareLinkId)
3636
x.Name,
3737
x.ExpiresAt,
3838
x.CreatedAt,
39-
Shockers = x.ShockerSharesLinksShockers.Select(y => new
39+
Shockers = x.ShockerMappings.Select(y => new
4040
{
41-
DeviceId = y.Shocker.DeviceNavigation.Id,
42-
DeviceName = y.Shocker.DeviceNavigation.Name,
41+
DeviceId = y.Shocker.Device.Id,
42+
DeviceName = y.Shocker.Device.Name,
4343
Shocker = new ShareLinkShocker
4444
{
4545
Id = y.Shocker.Id,

‎API/Controller/Shares/DeleteShareCode.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ public async Task<IActionResult> DeleteShareCode([FromRoute] Guid shareCodeId)
2525
{
2626
var affected = await _db.ShockerShareCodes
2727
.Where(x => x.Id == shareCodeId)
28-
.WhereIsUserOrPrivileged(x => x.Shocker.DeviceNavigation.OwnerNavigation, CurrentUser)
28+
.WhereIsUserOrPrivileged(x => x.Shocker.Device.Owner, CurrentUser)
2929
.ExecuteDeleteAsync();
3030
if (affected <= 0)
3131
{

‎API/Controller/Shares/LinkShareCode.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -33,16 +33,16 @@ [FromServices] IDeviceUpdateService deviceUpdateService
3333
{
3434
var shareCode = await _db.ShockerShareCodes.Where(x => x.Id == shareCodeId).Select(x => new
3535
{
36-
Share = x, x.Shocker.DeviceNavigation.Owner, x.Shocker.Device
36+
Share = x, x.Shocker.Device.OwnerId, x.Shocker.DeviceId
3737
}).FirstOrDefaultAsync();
3838
if (shareCode == null) return Problem(ShareCodeError.ShareCodeNotFound);
39-
if (shareCode.Owner == CurrentUser.Id) return Problem(ShareCodeError.CantLinkOwnShareCode);
40-
if (await _db.ShockerShares.AnyAsync(x => x.ShockerId == shareCode.Share.ShockerId && x.SharedWith == CurrentUser.Id))
39+
if (shareCode.OwnerId == CurrentUser.Id) return Problem(ShareCodeError.CantLinkOwnShareCode);
40+
if (await _db.ShockerShares.AnyAsync(x => x.ShockerId == shareCode.Share.ShockerId && x.SharedWithUserId == CurrentUser.Id))
4141
return Problem(ShareCodeError.ShockerAlreadyLinked);
4242

4343
_db.ShockerShares.Add(new ShockerShare
4444
{
45-
SharedWith = CurrentUser.Id,
45+
SharedWithUserId = CurrentUser.Id,
4646
ShockerId = shareCode.Share.ShockerId,
4747
AllowShock = shareCode.Share.AllowShock,
4848
AllowVibrate = shareCode.Share.AllowVibrate,
@@ -56,7 +56,7 @@ [FromServices] IDeviceUpdateService deviceUpdateService
5656

5757
if (await _db.SaveChangesAsync() <= 1) throw new Exception("Error while linking share code to your account");
5858

59-
await deviceUpdateService.UpdateDevice(shareCode.Owner, shareCode.Device, DeviceUpdateType.ShockerUpdated, CurrentUser.Id);
59+
await deviceUpdateService.UpdateDevice(shareCode.OwnerId, shareCode.DeviceId, DeviceUpdateType.ShockerUpdated, CurrentUser.Id);
6060

6161
return LegacyEmptyOk("Successfully linked share code");
6262
}

‎API/Controller/Shares/Links/AddShocker.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task<IActionResult> AddShocker([FromRoute] Guid shareLinkId, [FromR
2828
if (!exists) return Problem(ShareLinkError.ShareLinkNotFound);
2929

3030
var ownShocker =
31-
await _db.Shockers.AnyAsync(x => x.Id == shockerId && x.DeviceNavigation.Owner == CurrentUser.Id);
31+
await _db.Shockers.AnyAsync(x => x.Id == shockerId && x.Device.OwnerId == CurrentUser.Id);
3232
if (!ownShocker) return Problem(ShockerError.ShockerNotFound);
3333

3434
if (await _db.ShockerSharesLinksShockers.AnyAsync(x => x.ShareLinkId == shareLinkId && x.ShockerId == shockerId))

‎API/Controller/Shares/V2CreateShareRequest.cs‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ public async Task<IActionResult> CreateShare([FromBody] CreateShareRequest data)
2626

2727
var providedShockerIds = data.Shockers.Select(x => x.Id).ToArray();
2828
var belongsToUsFuture = _db.Shockers.AsNoTracking().Where(x =>
29-
x.DeviceNavigation.Owner == CurrentUser.Id && providedShockerIds.Contains(x.Id)).Select(x => x.Id).Future();
29+
x.Device.OwnerId == CurrentUser.Id && providedShockerIds.Contains(x.Id)).Select(x => x.Id).Future();
3030

3131
if (data.User != null)
3232
{
@@ -50,17 +50,17 @@ public async Task<IActionResult> CreateShare([FromBody] CreateShareRequest data)
5050
var shareRequest = new ShareRequest
5151
{
5252
Id = Guid.CreateVersion7(),
53-
Owner = CurrentUser.Id,
54-
User = data.User
53+
OwnerId = CurrentUser.Id,
54+
UserId = data.User
5555
};
5656
_db.ShareRequests.Add(shareRequest);
5757

5858
foreach (var createShockerShare in data.Shockers)
5959
{
6060
_db.ShareRequestsShockers.Add(new ShareRequestsShocker
6161
{
62-
ShareRequest = shareRequest.Id,
63-
Shocker = createShockerShare.Id,
62+
ShareRequestId = shareRequest.Id,
63+
ShockerId = createShockerShare.Id,
6464
AllowShock = createShockerShare.Permissions.Shock,
6565
AllowVibrate = createShockerShare.Permissions.Vibrate,
6666
AllowSound = createShockerShare.Permissions.Sound,

0 commit comments

Comments
 (0)