add: Queued membership

Backend/Features/Loyalty/LoyaltyController.cs

@@ -103,13 +103,13 @@ namespace Backend.Features.Loyalty
             bool membershipGranted = false;
             if (int.TryParse(redemption.ExternalUserId?.Trim(), out int userId))
             {
-                System.Diagnostics.Debug.WriteLine($"Fulfilling redemption {id} for user {userId}. RewardId: '{redemption.RewardId}'");
-                membershipGranted = await _subscriptionService.HandleLoyaltyRedemptionAsync(userId, redemption.RewardId, redemption.Id);
+                System.Diagnostics.Debug.WriteLine($"Fulfilling redemption {id} for user {userId}. RewardId: '{redemption.RewardId}', RewardName: '{redemption.RewardName}'");
+                membershipGranted = await _subscriptionService.HandleLoyaltyRedemptionAsync(userId, redemption.RewardId, redemption.RewardName, redemption.Id);
             }
 
             if (!membershipGranted)
             {
-                var errorMsg = $"Redemption fulfilled in loyalty system, but failed to grant library membership. The Reward ID '{redemption.RewardId}' (Redemption ID: {id}) may not be correctly mapped in the library system, or the user already has researchers this membership.";
+                var errorMsg = $"Redemption fulfilled in loyalty system, but failed to grant library membership. RewardName='{redemption.RewardName}', RewardId='{redemption.RewardId}' (Redemption ID: {id}).";
                 System.Diagnostics.Debug.WriteLine(errorMsg);
                 return BadRequest(new { message = errorMsg });
             }

Backend/Features/Loyalty/LoyaltyModels.cs

@@ -8,39 +8,26 @@ namespace Backend.Features.Loyalty
         [JsonPropertyName("id")]
         public string Id { get; set; } = string.Empty;
 
+        [JsonPropertyName("systemId")]
+        public string SystemId { get; set; } = string.Empty;
+
+        [JsonPropertyName("externalUserId")]
+        public string ExternalUserId { get; set; } = string.Empty;
+
         [JsonPropertyName("rewardId")]
         public string RewardId { get; set; } = string.Empty;
 
-        // Fallback for snake_case from external API
-        [JsonPropertyName("reward_id")]
-        public string? RewardIdSnakeCase { get => RewardId; set => RewardId = string.IsNullOrEmpty(value) ? RewardId : value; }
-
         [JsonPropertyName("rewardName")]
         public string RewardName { get; set; } = string.Empty;
-        
-        [JsonPropertyName("reward_name")]
-        public string? RewardNameSnakeCase { get => RewardName; set => RewardName = string.IsNullOrEmpty(value) ? RewardName : value; }
-
-        [JsonPropertyName("pointsSpent")]
-        public double PointsSpent { get; set; }
 
-        [JsonPropertyName("points_spent")]
-        public double? PointsSpentSnakeCase { set => PointsSpent = value ?? PointsSpent; }
+        [JsonPropertyName("pointCost")]
+        public double PointCost { get; set; }
 
         [JsonPropertyName("status")]
         public string Status { get; set; } = string.Empty;
 
-        [JsonPropertyName("externalUserId")]
-        public string ExternalUserId { get; set; } = string.Empty;
-
-        [JsonPropertyName("external_user_id")]
-        public string? ExternalUserIdSnakeCase { get => ExternalUserId; set => ExternalUserId = string.IsNullOrEmpty(value) ? ExternalUserId : value; }
-
-        [JsonPropertyName("createdAt")]
-        public DateTime CreatedAt { get; set; }
-
-        [JsonPropertyName("created_at")]
-        public DateTime? CreatedAtSnakeCase { set => CreatedAt = value ?? CreatedAt; }
+        [JsonPropertyName("redeemedAt")]
+        public DateTime RedeemedAt { get; set; }
     }
 
     public class ClaimRewardRequestDto

Backend/Features/Loyalty/LoyaltyService.cs

@@ -17,6 +17,7 @@ namespace Backend.Features.Loyalty
         Task<AccountLookupResponse?> GetUserAccountAsync(string externalUserId);
         Task<(bool Success, string Message)> ClaimRewardAsync(string externalUserId, string rewardId, string notes);
         Task<IEnumerable<LoyaltyRedemptionDto>> GetPendingRedemptionsAsync();
+        Task<IEnumerable<LoyaltyRedemptionDto>> GetUserRedemptionsAsync(string externalUserId);
         Task<IEnumerable<LoyaltyRedemptionDto>> GetRedemptionsHistoryAsync();
         Task<bool> UpdateRedemptionStatusAsync(string redemptionId, string status);
     }

Backend/Features/Subscriptions/SubscriptionController.cs

@@ -37,6 +37,18 @@ namespace Backend.Features.Subscriptions
             return Ok(subscription);
         }
 
+        [HttpGet("subscriptions/me/all")]
+        [Authorize]
+        public async Task<ActionResult<IEnumerable<SubscriptionDto>>> GetMyAllSubscriptions()
+        {
+            var userIdStr = User.FindFirstValue(ClaimTypes.NameIdentifier);
+            if (string.IsNullOrEmpty(userIdStr)) return Unauthorized();
+
+            var userId = int.Parse(userIdStr);
+            var subscriptions = await _subscriptionService.GetUserAllSubscriptionsAsync(userId);
+            return Ok(subscriptions);
+        }
+
         [HttpPost("subscriptions/subscribe")]
         [Authorize]
         public async Task<ActionResult<SubscriptionDto>> Subscribe([FromBody] SubscribeRequest request)

Backend/Features/Subscriptions/SubscriptionService.cs

@@ -8,7 +8,8 @@ namespace Backend.Features.Subscriptions
     {
         Task<IEnumerable<MembershipDto>> GetMembershipsAsync();
         Task<SubscriptionDto?> GetUserSubscriptionAsync(int userId);
-        Task<bool> HandleLoyaltyRedemptionAsync(int userId, string rewardId, string id);
+        Task<IEnumerable<SubscriptionDto>> GetUserAllSubscriptionsAsync(int userId);
+        Task<bool> HandleLoyaltyRedemptionAsync(int userId, string rewardId, string rewardName, string redemptionId);
         Task<SubscriptionDto> SubscribeUserAsync(int userId, int membershipId);
         Task<IEnumerable<SubscriptionDto>> GetAllSubscriptionsAsync();
     }
@@ -52,27 +53,61 @@ namespace Backend.Features.Subscriptions
             return MapToDto(subscription);
         }
 
-        public async Task<bool> HandleLoyaltyRedemptionAsync(int userId, string rewardId, string id)
+        public async Task<IEnumerable<SubscriptionDto>> GetUserAllSubscriptionsAsync(int userId)
+        {
+            var subscriptions = await _context.UserSubscriptions
+                .Include(s => s.Membership)
+                .Include(s => s.User)
+                .Where(s => s.UserId == userId && s.IsActive)
+                .OrderBy(s => s.StartDate)
+                .ToListAsync();
+
+            return subscriptions.Select(MapToDto);
+        }
+
+        public async Task<bool> HandleLoyaltyRedemptionAsync(int userId, string rewardId, string rewardName, string redemptionId)
         {
             try
             {
-                // 1. Find the local membership that corresponds to this loyalty reward
-                var membership = await _context.Memberships
-                    .FirstOrDefaultAsync(m => m.RewardId == rewardId);
+                // Load all memberships into memory (small collection)
+                var allMemberships = await _context.Memberships.ToListAsync();
+                
+                Membership? membership = null;
+
+                // 1. First try exact match by RewardId (most precise)
+                if (!string.IsNullOrEmpty(rewardId))
+                {
+                    membership = allMemberships.FirstOrDefault(m => m.RewardId == rewardId);
+                }
+
+                // 2. Fallback: in-memory string matching on rewardName vs membership Type
+                //    e.g. "Free Monthly Basic Membership" contains words "Basic" and "Monthly"
+                if (membership == null && !string.IsNullOrEmpty(rewardName))
+                {
+                    var normalizedRewardName = rewardName.ToLowerInvariant();
+                    membership = allMemberships.FirstOrDefault(m =>
+                    {
+                        var typeWords = m.Type.ToLowerInvariant().Split(' ', StringSplitOptions.RemoveEmptyEntries);
+                        return typeWords.All(w => normalizedRewardName.Contains(w));
+                    });
+                }
 
                 if (membership == null)
                 {
-                    // If no membership matches this rewardId, we can't fulfill it automatically
+                    System.Diagnostics.Debug.WriteLine($"No membership matched for rewardId='{rewardId}', rewardName='{rewardName}'");
                     return false;
                 }
 
-                // 2. Grant the membership to the user (will be queued if they already have one)
+                System.Diagnostics.Debug.WriteLine($"Matched membership '{membership.Type}' (Id={membership.Id}) for rewardName='{rewardName}'");
+                
+                // 3. Grant the membership (will be queued if they already have one)
                 await SubscribeUserAsync(userId, membership.Id);
 
                 return true;
             }
-            catch
+            catch (Exception ex)
             {
+                System.Diagnostics.Debug.WriteLine($"HandleLoyaltyRedemptionAsync error: {ex.Message}");
                 return false;
             }
         }

Frontend/Controllers/MembershipController.cs

@@ -21,26 +21,28 @@ namespace Frontend.Controllers
 
         public async Task<IActionResult> Index()
         {
-            var subscription = await _apiClient.GetMySubscriptionAsync();
+            var allSubscriptions = await _apiClient.GetMyAllSubscriptionsAsync();
             var memberships = await _apiClient.GetMembershipsAsync();
-            var redemptions = await _apiClient.GetMyRedemptionsAsync();
             var loyaltyAccount = await _apiClient.GetMyLoyaltyAccountAsync();
             var activeRewards = await _apiClient.GetActiveRewardsAsync();
 
-            // Filter redemptions to only show memberships that are Pending (Queued)
-            // We use LoyaltyRewardId to identify which redemptions are memberships
-            var membershipRewardIds = memberships
-                .Where(m => !string.IsNullOrEmpty(m.RewardId))
-                .Select(m => m.RewardId)
-                .ToList();
-            
-            var queuedMemberships = redemptions
-                .Where(r => (r.Status == "Pending" || r.Status == "PENDING" || r.Status == "Fulfilled" || r.Status == "FULFILLED") && membershipRewardIds.Contains(r.RewardId))
+            var now = DateTime.UtcNow;
+
+            // The currently active subscription is the one whose time range includes now
+            var currentSubscription = allSubscriptions
+                .Where(s => s.StartDate <= now && s.ExpiryDate > now)
+                .OrderByDescending(s => s.StartDate)
+                .FirstOrDefault();
+
+            // Queued = subscriptions that haven't started yet (StartDate in the future)
+            var queuedMemberships = allSubscriptions
+                .Where(s => s.StartDate > now)
+                .OrderBy(s => s.StartDate)
                 .ToList();
 
             var viewModel = new MembershipViewModel
             {
-                CurrentSubscription = subscription,
+                CurrentSubscription = currentSubscription,
                 AvailableMemberships = memberships.ToList(),
                 QueuedMemberships = queuedMemberships,
                 LoyaltyAccount = loyaltyAccount,

Frontend/Models/Dtos/LoyaltyRedemptionDto.cs

@@ -8,22 +8,25 @@ namespace Frontend.Models.Dtos
         [JsonPropertyName("id")]
         public string Id { get; set; } = string.Empty;
 
+        [JsonPropertyName("systemId")]
+        public string SystemId { get; set; } = string.Empty;
+
         [JsonPropertyName("externalUserId")]
         public string ExternalUserId { get; set; } = string.Empty;
 
-        [JsonPropertyName("rewardName")]
-        public string RewardName { get; set; } = string.Empty;
-
         [JsonPropertyName("rewardId")]
         public string? RewardId { get; set; }
 
-        [JsonPropertyName("pointsSpent")]
-        public double PointsSpent { get; set; }
+        [JsonPropertyName("rewardName")]
+        public string RewardName { get; set; } = string.Empty;
+
+        [JsonPropertyName("pointCost")]
+        public double PointCost { get; set; }
 
         [JsonPropertyName("status")]
         public string Status { get; set; } = string.Empty;
 
-        [JsonPropertyName("createdAt")]
-        public DateTime CreatedAt { get; set; }
+        [JsonPropertyName("redeemedAt")]
+        public DateTime RedeemedAt { get; set; }
     }
 }

Frontend/Models/MembershipViewModel.cs

@@ -7,7 +7,7 @@ namespace Frontend.Models
     {
         public SubscriptionDto? CurrentSubscription { get; set; }
         public List<MembershipDto> AvailableMemberships { get; set; } = new List<MembershipDto>();
-        public List<LoyaltyRedemptionDto> QueuedMemberships { get; set; } = new List<LoyaltyRedemptionDto>();
+        public List<SubscriptionDto> QueuedMemberships { get; set; } = new List<SubscriptionDto>();
         public LoyaltyAccountDto? LoyaltyAccount { get; set; }
         public Dictionary<string, double> RewardPointCosts { get; set; } = new Dictionary<string, double>();
     }

Frontend/Services/LibraryApiClient.cs

@@ -139,6 +139,13 @@ namespace Frontend.Services
             } catch { return null; }
         }
 
+        public async Task<IEnumerable<SubscriptionDto>> GetMyAllSubscriptionsAsync()
+        {
+            try {
+                return await _httpClient.GetFromJsonAsync<IEnumerable<SubscriptionDto>>("api/subscriptions/me/all") ?? Enumerable.Empty<SubscriptionDto>();
+            } catch { return Enumerable.Empty<SubscriptionDto>(); }
+        }
+
         public async Task<SubscriptionDto?> SubscribeAsync(SubscribeRequest request)
         {
             var response = await _httpClient.PostAsJsonAsync("api/subscriptions/subscribe", request);

Frontend/Views/Membership/Index.cshtml

@@ -90,7 +90,7 @@
                 <section>
                     <h2 class="text-xl font-bold text-slate-900 mb-4 flex items-center gap-2">
                         <svg xmlns="http://www.w3.org/2000/svg" width="20" height="20" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="text-amber-500"><path d="M10 10 2.5 2.5"/><path d="M21.5 2.5 14 10"/><path d="m21.5 21.5-7.5-7.5"/><path d="M10 14 2.5 21.5"/><circle cx="12" cy="12" r="3"/></svg>
-                        Queued Membership
+                        Queued Memberships (@Model.QueuedMemberships.Count)
                     </h2>
                     <div class="space-y-3">
                         @foreach (var queued in Model.QueuedMemberships)
@@ -98,16 +98,18 @@
                             <div class="flex items-center justify-between bg-amber-50 border border-amber-100 p-5 rounded-2xl shadow-sm">
                                 <div class="flex items-center gap-4">
                                     <div class="h-12 w-12 bg-white rounded-xl flex items-center justify-center text-amber-600 shadow-sm border border-amber-100">
-                                        <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><path d="M13 2H6a2 2 0 0 0-2 2v16a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V9z"/><polyline points="13 2 13 9 20 9"/></svg>
+                                        <svg xmlns="http://www.w3.org/2000/svg" width="22" height="22" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round"><rect width="20" height="14" x="2" y="5" rx="2"/><line x1="2" x2="22" y1="10" y2="10"/></svg>
                                     </div>
                                     <div>
-                                        <div class="font-bold text-slate-900">@queued.RewardName</div>
-                                        <div class="text-sm text-slate-500">Redeemed on @queued.CreatedAt.ToString("MMM dd, yyyy")</div>
+                                        <div class="font-bold text-slate-900">@queued.MembershipType Membership</div>
+                                        <div class="text-sm text-slate-500">
+                                            Activates on @queued.StartDate.ToString("MMM dd, yyyy") &bull; Expires @queued.ExpiryDate.ToString("MMM dd, yyyy")
+                                        </div>
                                     </div>
                                 </div>
                                 <div class="text-right">
-                                    <span class="inline-flex items-center px-3 py-1 rounded-full text-xs font-bold bg-amber-100 text-amber-700 border border-amber-200 uppercase tracking-wider">Pending Approval</span>
-                                    <div class="text-xs text-slate-400 mt-1">Librarian will review soon</div>
+                                    <span class="inline-flex items-center px-3 py-1 rounded-full text-xs font-bold bg-amber-100 text-amber-700 border border-amber-200 uppercase tracking-wider">Queued</span>
+                                    <div class="text-xs text-slate-400 mt-1">Will activate automatically</div>
                                 </div>
                             </div>
                         }

Frontend/Views/Subscriptions/LoyaltyClaims.cshtml

@@ -37,8 +37,8 @@
                 <tr class="bg-slate-50 border-b border-slate-200">
                     <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider">Member ID</th>
                     <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider">Reward</th>
-                    <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider">Points Spent</th>
-                    <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider">Date</th>
+                    <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider">Point Cost</th>
+                    <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider">Redeemed At</th>
                     <th class="px-6 py-4 text-xs font-bold text-slate-500 uppercase tracking-wider text-right">Actions</th>
                 </tr>
             </thead>
@@ -68,8 +68,8 @@
                         <td class="px-6 py-4">
                             <span class="font-semibold text-slate-900">@claim.RewardName</span>
                         </td>
-                        <td class="px-6 py-4 text-slate-600">@claim.PointsSpent.ToString("N0") pts</td>
-                        <td class="px-6 py-4 text-slate-500 text-sm">@claim.CreatedAt.ToString("MMM dd, yyyy")</td>
+                        <td class="px-6 py-4 text-slate-600">@claim.PointCost.ToString("N0") pts</td>
+                        <td class="px-6 py-4 text-slate-500 text-sm">@claim.RedeemedAt.ToString("MMM dd, yyyy")</td>
                         <td class="px-6 py-4 text-right">
                             <form asp-action="FulfillRedemption" method="post" class="inline">
                                 <input type="hidden" name="id" value="@claim.Id" />