Add image to shared response

OpenShock · Sep 25, 2024 · 09a4465 · 09a4465
1 parent 33de84a
commit 09a4465
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 8 deletions.
diff --git a/API/API.csproj b/API/API.csproj
@@ -6,7 +6,7 @@
         <ImplicitUsings>enable</ImplicitUsings>
         <AssemblyName>OpenShock.API</AssemblyName>
         <RootNamespace>OpenShock.API</RootNamespace>
-        <AssemblyVersion>3.3.0</AssemblyVersion>
+        <AssemblyVersion>3.3.1</AssemblyVersion>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <Company>OpenShock</Company>
         <Product>API</Product>

diff --git a/API/Controller/Shockers/SharedShockersController.cs b/API/Controller/Shockers/SharedShockersController.cs
@@ -4,6 +4,7 @@
 using OpenShock.API.Models.Response;
 using OpenShock.Common.Models;
 using OpenShock.ServicesCommon.Problems;
+using OpenShock.ServicesCommon.Utils;
 
 namespace OpenShock.API.Controller.Shockers;
 
@@ -23,6 +24,7 @@ public async Task<BaseResponse<IEnumerable<OwnerShockerResponse>>> ListSharedSho
             {
                 OwnerId = x.Shocker.DeviceNavigation.OwnerNavigation.Id,
                 OwnerName = x.Shocker.DeviceNavigation.OwnerNavigation.Name,
+                OwnerEmail = x.Shocker.DeviceNavigation.OwnerNavigation.Email,
                 DeviceId = x.Shocker.DeviceNavigation.Id,
                 DeviceName = x.Shocker.DeviceNavigation.Name,
                 Shocker = new OwnerShockerResponse.SharedDevice.SharedShocker
@@ -54,7 +56,8 @@ public async Task<BaseResponse<IEnumerable<OwnerShockerResponse>>> ListSharedSho
                 shared[shocker.OwnerId] = new OwnerShockerResponse
                 {
                     Id = shocker.OwnerId,
-                    Name = shocker.OwnerName
+                    Name = shocker.OwnerName,
+                    Image = GravatarUtils.GetImageUrl(shocker.OwnerEmail)
                 };
 
             var sharedUser = shared[shocker.OwnerId];

diff --git a/API/Models/Response/OwnerShockerResponse.cs b/API/Models/Response/OwnerShockerResponse.cs
@@ -1,9 +1,9 @@
-namespace OpenShock.API.Models.Response;
+using OpenShock.Common.Models;
 
-public class OwnerShockerResponse
+namespace OpenShock.API.Models.Response;
+
+public class OwnerShockerResponse : GenericIni
 {
-    public required Guid Id { get; set; }
-    public required string Name { get; set; }
     public IList<SharedDevice> Devices { get; set; } = new List<SharedDevice>();
 
     public class SharedDevice

diff --git a/Cron/Cron.csproj b/Cron/Cron.csproj
@@ -7,7 +7,7 @@
         <AssemblyName>OpenShock.Cron</AssemblyName>
         <RootNamespace>OpenShock.Cron</RootNamespace>
         <Company>OpenShock</Company>
-        <AssemblyVersion>3.3.0</AssemblyVersion>
+        <AssemblyVersion>3.3.1</AssemblyVersion>
       <UserSecretsId>a2109c1e-fb11-44d7-8127-346ef60cb9a5</UserSecretsId>
   </PropertyGroup>
 

diff --git a/LiveControlGateway/LiveControlGateway.csproj b/LiveControlGateway/LiveControlGateway.csproj
@@ -7,7 +7,7 @@
         <AssemblyName>OpenShock.LiveControlGateway</AssemblyName>
         <RootNamespace>OpenShock.LiveControlGateway</RootNamespace>
         <Company>OpenShock</Company>
-        <AssemblyVersion>3.3.0</AssemblyVersion>
+        <AssemblyVersion>3.3.1</AssemblyVersion>
         <Product>LiveControlGateway</Product>
         <GenerateDocumentationFile>true</GenerateDocumentationFile>
         <LangVersion>12</LangVersion>