Table naming cleanup

Author: hhvrc

API/Controller/Public/PublicShareController.cs

@@ -24,7 +24,7 @@ public sealed partial class PublicController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareLinkNotFound
     public async Task<IActionResult> GetShareLink([FromRoute] Guid shareLinkId)
     {
-        var shareLink = await _db.ShockerSharesLinks.Where(x => x.Id == shareLinkId).Select(x => new
+        var shareLink = await _db.ShockerShareLinks.Where(x => x.Id == shareLinkId).Select(x => new
         {
             Author = new GenericIni
             {

API/Controller/Shares/Links/AddShocker.cs

@@ -24,17 +24,17 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status409Conflict, MediaTypeNames.Application.ProblemJson)] // ShockerAlreadyInShareLink
     public async Task<IActionResult> AddShocker([FromRoute] Guid shareLinkId, [FromRoute] Guid shockerId)
     {
-        var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
+        var exists = await _db.ShockerShareLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
         if (!exists) return Problem(ShareLinkError.ShareLinkNotFound);
 
         var ownShocker =
             await _db.Shockers.AnyAsync(x => x.Id == shockerId && x.Device.OwnerId == CurrentUser.Id);
         if (!ownShocker) return Problem(ShockerError.ShockerNotFound);
 
-        if (await _db.ShockerSharesLinksShockers.AnyAsync(x => x.ShareLinkId == shareLinkId && x.ShockerId == shockerId))
+        if (await _db.ShockerShareLinkShockers.AnyAsync(x => x.ShareLinkId == shareLinkId && x.ShockerId == shockerId))
             return Problem(ShareLinkError.ShockerAlreadyInShareLink);
 
-        _db.ShockerSharesLinksShockers.Add(new ShockerSharesLinksShocker
+        _db.ShockerShareLinkShockers.Add(new ShockerShareLinkShocker
         {
             ShockerId = shockerId,
             ShareLinkId = shareLinkId,

API/Controller/Shares/Links/CreateShareLink.cs

@@ -14,14 +14,14 @@ public sealed partial class ShareLinksController
     [HttpPost(Name = "CreateShareLink")]
     public async Task<LegacyDataResponse<Guid>> CreateShareLink([FromBody] ShareLinkCreate body)
     {
-        var entity = new ShockerSharesLink
+        var entity = new ShockerShareLink
         {
             Id = Guid.CreateVersion7(),
             Owner = CurrentUser,
             ExpiresAt = body.ExpiresOn == null ? null : DateTime.SpecifyKind(body.ExpiresOn.Value, DateTimeKind.Utc),
             Name = body.Name
         };
-        _db.ShockerSharesLinks.Add(entity);
+        _db.ShockerShareLinks.Add(entity);
         await _db.SaveChangesAsync();
 
         return new(entity.Id);

API/Controller/Shares/Links/DeleteShareLink.cs

@@ -21,7 +21,7 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareLinkNotFound
     public async Task<IActionResult> DeleteShareLink([FromRoute] Guid shareLinkId)
     {
-        var result = await _db.ShockerSharesLinks
+        var result = await _db.ShockerShareLinks
             .Where(x => x.Id == shareLinkId)
             .WhereIsUserOrPrivileged(x => x.Owner, CurrentUser)
             .ExecuteDeleteAsync();

API/Controller/Shares/Links/DeleteShockerShareLink.cs

@@ -23,7 +23,7 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareLinkNotFound, ShockerNotInShareLink
     public async Task<IActionResult> RemoveShocker([FromRoute] Guid shareLinkId, [FromRoute] Guid shockerId)
     {
-        var exists = await _db.ShockerSharesLinks
+        var exists = await _db.ShockerShareLinks
             .Where(x => x.Id == shareLinkId)
             .WhereIsUserOrPrivileged(x => x.Owner, CurrentUser)
             .AnyAsync();
@@ -32,7 +32,7 @@ public async Task<IActionResult> RemoveShocker([FromRoute] Guid shareLinkId, [Fr
             return Problem(ShareLinkError.ShareLinkNotFound);
         }
 
-        var affected = await _db.ShockerSharesLinksShockers
+        var affected = await _db.ShockerShareLinkShockers
             .Where(x => x.ShareLinkId == shareLinkId && x.ShockerId == shockerId)
             .ExecuteDeleteAsync();
         if (affected <= 0)

API/Controller/Shares/Links/EditShockerShareLink.cs

@@ -25,11 +25,11 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareLinkNotFound, ShockerNotInShareLink
     public async Task<IActionResult> EditShocker([FromRoute] Guid shareLinkId, [FromRoute] Guid shockerId, [FromBody] ShareLinkEditShocker body)
     {
-        var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
+        var exists = await _db.ShockerShareLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
         if (!exists) return Problem(ShareLinkError.ShareLinkNotFound);
 
         var shocker =
-            await _db.ShockerSharesLinksShockers.FirstOrDefaultAsync(x =>
+            await _db.ShockerShareLinkShockers.FirstOrDefaultAsync(x =>
                 x.ShareLinkId == shareLinkId && x.ShockerId == shockerId);
         if (shocker == null) return Problem(ShareLinkError.ShockerNotInShareLink);
 

API/Controller/Shares/Links/ListShareLinks.cs

@@ -14,7 +14,7 @@ public sealed partial class ShareLinksController
     [HttpGet]
     public LegacyDataResponse<IAsyncEnumerable<ShareLinkResponse>> List()
     {
-        var ownShareLinks = _db.ShockerSharesLinks
+        var ownShareLinks = _db.ShockerShareLinks
             .Where(x => x.OwnerId == CurrentUser.Id)
             .Select(x => ShareLinkResponse.GetFromEf(x))
             .AsAsyncEnumerable();

API/Controller/Shares/Links/PauseShockerShareLink.cs

@@ -25,11 +25,11 @@ public sealed partial class ShareLinksController
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareLinkNotFound, ShockerNotInShareLink
     public async Task<IActionResult> PauseShocker([FromRoute] Guid shareLinkId, [FromRoute] Guid shockerId, [FromBody] PauseRequest body)
     {
-        var exists = await _db.ShockerSharesLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
+        var exists = await _db.ShockerShareLinks.AnyAsync(x => x.OwnerId == CurrentUser.Id && x.Id == shareLinkId);
         if (!exists) return Problem(ShareLinkError.ShareLinkNotFound);
 
         var shocker =
-            await _db.ShockerSharesLinksShockers.Where(x =>
+            await _db.ShockerShareLinkShockers.Where(x =>
                 x.ShareLinkId == shareLinkId && x.ShockerId == shockerId).Include(x => x.Shocker).FirstOrDefaultAsync();
         if (shocker == null) return Problem(ShareLinkError.ShockerNotInShareLink);
 

API/Controller/Shares/V2CreateShareRequest.cs

@@ -57,7 +57,7 @@ public async Task<IActionResult> CreateShare([FromBody] CreateShareRequest data)
 
         foreach (var createShockerShare in data.Shockers)
         {
-            _db.ShareRequestsShockers.Add(new ShareRequestsShocker
+            _db.ShareRequestShockers.Add(new ShareRequestShocker
             {
                 ShareRequestId = shareRequest.Id,
                 ShockerId = createShockerShare.Id,

API/Models/Response/ShareLinkResponse.cs

@@ -9,7 +9,7 @@ public sealed class ShareLinkResponse
     public required DateTime CreatedOn { get; set; }
     public DateTime? ExpiresOn { get; set; }
 
-    public static ShareLinkResponse GetFromEf(ShockerSharesLink x) => new()
+    public static ShareLinkResponse GetFromEf(ShockerShareLink x) => new()
     {
         Id = x.Id,
         Name = x.Name,