return type with relevant shares on invite accept

Author: LucHeart

API/Controller/Devices/DevicesController.cs

@@ -12,6 +12,7 @@
 using OpenShock.Common.Redis;
 using OpenShock.Common.Utils;
 using System.Net.Mime;
+using Redis.OM;
 
 namespace OpenShock.API.Controller.Devices;
 
@@ -201,9 +202,7 @@ public async Task<IActionResult> GetPairCode([FromRoute] Guid deviceId)
 
         var deviceExists = await _db.Devices.AnyAsync(x => x.Id == deviceId && x.OwnerId == CurrentUser.Id);
         if (!deviceExists) return Problem(HubError.HubNotFound);
-        // replace with unlink?
-        var existing = await devicePairs.FindByIdAsync(deviceId.ToString());
-        if (existing is not null) await devicePairs.DeleteAsync(existing);
+        await _redis.Connection.UnlinkAsync($"{typeof(DevicePair).FullName}:{deviceId}");
 
         string pairCode = CryptoUtils.RandomNumericString(6);
 

API/Controller/Shares/V2GetShares.cs

@@ -8,7 +8,7 @@
 
 namespace OpenShock.API.Controller.Shares;
 
-file sealed class V2UserSharesListItemDto
+internal sealed class V2UserSharesListItemDto
 {
 
     public required Guid Id { get; set; }

API/Controller/Shares/V2Invites.cs

@@ -110,13 +110,13 @@ public async Task<IActionResult> DenyIncomingInvite(Guid id)
     /// <param name="deviceUpdateService"></param>
     /// <returns></returns>
     [HttpPost("invites/incoming/{id:guid}")]
-    [ProducesResponseType(StatusCodes.Status200OK)]
+    [ProducesResponseType<V2UserSharesListItem>(StatusCodes.Status200OK)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShareRequestNotFound
     [ApiVersion("2")]
     public async Task<IActionResult> RedeemInvite(Guid id, [FromServices] IDeviceUpdateService deviceUpdateService)
     {
         var shareRequest = await _db.UserShareInvites
-            .Include(x => x.ShockerMappings)
+            .Include(x => x.ShockerMappings).Include(x => x.Owner)
             .FirstOrDefaultAsync(x => x.Id == id && (x.RecipientUserId == null || x.RecipientUserId == CurrentUser.Id));
 
         if (shareRequest is null) return Problem(ShareError.ShareRequestNotFound);
@@ -164,8 +164,37 @@ public async Task<IActionResult> RedeemInvite(Guid id, [FromServices] IDeviceUpd
         {
             await deviceUpdateService.UpdateDevice(shareRequest.OwnerId, affectedHub, DeviceUpdateType.ShockerUpdated, CurrentUser.Id);    
         }
+
+
+        var returnObject = new V2UserSharesListItemDto()
+        {
+            Id = shareRequest.OwnerId,
+            Email = shareRequest.Owner.Email,
+            Name = shareRequest.Owner.Name,
+            Shares = shareRequest.ShockerMappings.Select(y => new UserShareInfo
+            {
+                Id = y.Shocker.Id,
+                Name = y.Shocker.Name,
+                CreatedOn = DateTime.UtcNow,
+                Permissions = new ShockerPermissions
+                {
+                    Sound = y.AllowSound,
+                    Vibrate = y.AllowVibrate,
+                    Shock = y.AllowShock,
+                    Live = y.AllowLiveControl
+                },
+                Limits = new ShockerLimits
+                {
+                    Duration = y.MaxDuration,
+                    Intensity = y.MaxIntensity
+                },
+                Paused = y.IsPaused
+            })
+        };
+
 
-        return Ok();
+        
+        return Ok(returnObject.ToV2UserSharesListItem());
     }
 }
 

API/Controller/Shockers/ShockerShares.cs

@@ -140,7 +140,7 @@ [FromServices] IDeviceUpdateService deviceUpdateService
     }
 
     /// <summary>
-    /// Remove a share code for a shocker
+    /// Remove a share for a shocker
     /// </summary>
     /// <param name="shockerId"></param>
     /// <param name="sharedWithUserId"></param>
@@ -152,7 +152,7 @@ [FromServices] IDeviceUpdateService deviceUpdateService
     [ProducesResponseType(StatusCodes.Status200OK)]
     [ProducesResponseType<OpenShockProblem>(StatusCodes.Status404NotFound, MediaTypeNames.Application.ProblemJson)] // ShockerNotFound    
     [MapToApiVersion("1")]
-    public async Task<IActionResult> ShockerShareCodeRemove(
+    public async Task<IActionResult> ShockerShareRemove(
         [FromRoute] Guid shockerId,
         [FromRoute] Guid sharedWithUserId,
         [FromServices] IDeviceUpdateService deviceUpdateService)