✨ Putting the stellar perks back

DysonNetwork.Pass/Account/Account.cs

@@ -1,6 +1,7 @@
 using System.ComponentModel.DataAnnotations;
 using System.ComponentModel.DataAnnotations.Schema;
 using System.Text.Json.Serialization;
+using DysonNetwork.Pass.Wallet;
 using DysonNetwork.Shared.Data;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
@@ -31,6 +32,8 @@ public class Account : ModelBase
 
     [JsonIgnore] public ICollection<Relationship> OutgoingRelationships { get; set; } = new List<Relationship>();
     [JsonIgnore] public ICollection<Relationship> IncomingRelationships { get; set; } = new List<Relationship>();
+    
+    [NotMapped] public SubscriptionReferenceObject? PerkSubscription { get; set; }
 
     public Shared.Proto.Account ToProtoValue()
     {

DysonNetwork.Pass/Account/AccountController.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using DysonNetwork.Pass.Auth;
+using DysonNetwork.Pass.Wallet;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
@@ -12,6 +13,7 @@ public class AccountController(
     AppDatabase db,
     AuthService auth,
     AccountService accounts,
+    SubscriptionService subscriptions,
     AccountEventService events
 ) : ControllerBase
 {
@@ -25,7 +27,12 @@ public class AccountController(
             .Include(e => e.Profile)
             .Where(a => a.Name == name)
             .FirstOrDefaultAsync();
-        return account is null ? new NotFoundResult() : account;
+        if (account is null) return new NotFoundResult();
+        
+        var perk = await subscriptions.GetPerkSubscriptionAsync(account.Id);
+        account.PerkSubscription = perk?.ToReference();
+        
+        return account;
     }
 
     [HttpGet("{name}/badges")]

DysonNetwork.Pass/Account/AccountCurrentController.cs

@@ -1,5 +1,6 @@
 using System.ComponentModel.DataAnnotations;
 using DysonNetwork.Pass.Permission;
+using DysonNetwork.Pass.Wallet;
 using DysonNetwork.Shared.Data;
 using DysonNetwork.Shared.Proto;
 using Microsoft.AspNetCore.Authorization;
@@ -18,6 +19,7 @@ namespace DysonNetwork.Pass.Account;
 public class AccountCurrentController(
     AppDatabase db,
     AccountService accounts,
+    SubscriptionService subscriptions,
     AccountEventService events,
     AuthService auth,
     FileService.FileServiceClient files,
@@ -36,6 +38,9 @@ public class AccountCurrentController(
             .Include(e => e.Profile)
             .Where(e => e.Id == userId)
             .FirstOrDefaultAsync();
+        
+        var perk = await subscriptions.GetPerkSubscriptionAsync(account.Id);
+        account.PerkSubscription = perk?.ToReference();
 
         return Ok(account);
     }

DysonNetwork.Pass/Account/AccountServiceGrpc.cs

@@ -1,15 +1,16 @@
+using DysonNetwork.Pass.Wallet;
 using DysonNetwork.Shared.Proto;
 using Google.Protobuf.WellKnownTypes;
 using Grpc.Core;
 using Microsoft.EntityFrameworkCore;
 using NodaTime;
-using NodaTime.Serialization.Protobuf;
 
 namespace DysonNetwork.Pass.Account;
 
 public class AccountServiceGrpc(
     AppDatabase db,
     RelationshipService relationships,
+    SubscriptionService subscriptions,
     IClock clock,
     ILogger<AccountServiceGrpc> logger
 )
@@ -34,6 +35,9 @@ public class AccountServiceGrpc(
         if (account == null)
             throw new RpcException(new Grpc.Core.Status(StatusCode.NotFound, $"Account {request.Id} not found"));
 
+        var perk = await subscriptions.GetPerkSubscriptionAsync(account.Id);
+        account.PerkSubscription = perk?.ToReference();
+
         return account.ToProtoValue();
     }
 
@@ -51,13 +55,21 @@ public class AccountServiceGrpc(
             .Where(a => accountIds.Contains(a.Id))
             .Include(a => a.Profile)
             .ToListAsync();
+        
+        var perks = await subscriptions.GetPerkSubscriptionsAsync(
+            accounts.Select(x => x.Id).ToList()
+        );
+        foreach (var account in accounts)
+            if (perks.TryGetValue(account.Id, out var perk))
+                account.PerkSubscription = perk?.ToReference();
 
         var response = new GetAccountBatchResponse();
         response.Accounts.AddRange(accounts.Select(a => a.ToProtoValue()));
         return response;
     }
 
-    public override async Task<GetAccountBatchResponse> LookupAccountBatch(LookupAccountBatchRequest request, ServerCallContext context)
+    public override async Task<GetAccountBatchResponse> LookupAccountBatch(LookupAccountBatchRequest request,
+        ServerCallContext context)
     {
         var accountNames = request.Names.ToList();
         var accounts = await _db.Accounts
@@ -65,6 +77,14 @@ public class AccountServiceGrpc(
             .Where(a => accountNames.Contains(a.Name))
             .Include(a => a.Profile)
             .ToListAsync();
+        
+        var perks = await subscriptions.GetPerkSubscriptionsAsync(
+            accounts.Select(x => x.Id).ToList()
+        );
+        foreach (var account in accounts)
+            if (perks.TryGetValue(account.Id, out var perk))
+                account.PerkSubscription = perk?.ToReference();
+        
         var response = new GetAccountBatchResponse();
         response.Accounts.AddRange(accounts.Select(a => a.ToProtoValue()));
         return response;
@@ -101,6 +121,13 @@ public class AccountServiceGrpc(
             .Include(a => a.Profile)
             .ToListAsync();
 
+        var perks = await subscriptions.GetPerkSubscriptionsAsync(
+            accounts.Select(x => x.Id).ToList()
+        );
+        foreach (var account in accounts)
+            if (perks.TryGetValue(account.Id, out var perk))
+                account.PerkSubscription = perk?.ToReference();
+
         var response = new ListAccountsResponse
         {
             TotalSize = totalCount,