Merge branch 'kub-stage' into production

src/CMSMicroservice.Infrastructure/Services/GenerateJwtTokenService.cs

@@ -1,5 +1,6 @@
-using CMSMicroservice.Application.Common.Interfaces;
+using CMSMicroservice.Application.Common.Interfaces;
 using CMSMicroservice.Domain.Entities;
+using Microsoft.EntityFrameworkCore;
 using Microsoft.Extensions.Configuration;
 using Microsoft.IdentityModel.Tokens;
 using System.Collections.Generic;
@@ -13,10 +14,12 @@ namespace CMSMicroservice.Infrastructure.Services;
 public class GenerateJwtTokenService : IGenerateJwtToken
 {
     private readonly IConfiguration _configuration;
+    private readonly IApplicationDbContext _context;
 
-    public GenerateJwtTokenService(IConfiguration configuration)
+    public GenerateJwtTokenService(IConfiguration configuration, IApplicationDbContext context)
     {
         _configuration = configuration;
+        _context = context;
     }
 
     public async Task<string> GenerateJwtToken(User user, int? expiryDays = null)
@@ -58,6 +61,10 @@ public class GenerateJwtTokenService : IGenerateJwtToken
         claims.Add(new Claim("HasPurchasedPackage", 
             (user.PackagePurchaseMethod != PackagePurchaseMethod.None).ToString()));
 
+        var hasAddress = await _context.UserAddresses
+            .AnyAsync(a => a.UserId == user.Id && !a.IsDeleted);
+        claims.Add(new Claim("HasAddress", hasAddress.ToString()));
+
         if (user.UserRoles != null && user.UserRoles.Any())
         {
             foreach (var userRole in user.UserRoles)