refactor: update user address models and methods to use CustomerAddressModel across multiple components
Build and Deploy to Kubernetes / build-and-deploy (push) Failing after 3m8s
Build and Deploy to Kubernetes / build-and-deploy (push) Failing after 3m8s
This commit is contained in:
@@ -5,15 +5,19 @@ namespace FrontOffice.Main.Utilities;
|
||||
|
||||
/// <summary>
|
||||
/// Service for Club Membership operations
|
||||
/// Connected to FrontOffice.BFF gRPC ClubMembershipCQ
|
||||
/// Connected to CMS gRPC ClubMembershipCQ
|
||||
/// </summary>
|
||||
public class ClubMembershipService
|
||||
{
|
||||
private readonly ClubMembershipContract.ClubMembershipContractClient _client;
|
||||
private readonly UserAuthInfo _authInfo;
|
||||
|
||||
public ClubMembershipService(ClubMembershipContract.ClubMembershipContractClient client)
|
||||
public ClubMembershipService(
|
||||
ClubMembershipContract.ClubMembershipContractClient client,
|
||||
UserAuthInfo authInfo)
|
||||
{
|
||||
_client = client;
|
||||
_authInfo = authInfo;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
@@ -24,8 +28,8 @@ public class ClubMembershipService
|
||||
{
|
||||
try
|
||||
{
|
||||
var userId = await GetCurrentUserIdAsync();
|
||||
var response = await _client.GetClubMembershipAsync(new GetClubMembershipRequest { UserId = userId });
|
||||
// UserId = 0 میفرستیم تا CMS از JWT بخونه
|
||||
var response = await _client.GetClubMembershipAsync(new GetClubMembershipRequest { UserId = 0 });
|
||||
return new ClubMembershipDto
|
||||
{
|
||||
UserId = response.UserId,
|
||||
@@ -34,8 +38,11 @@ public class ClubMembershipService
|
||||
DaysRemaining = response.DaysRemaining > 0 ? response.DaysRemaining : null
|
||||
};
|
||||
}
|
||||
catch
|
||||
catch (Exception ex)
|
||||
{
|
||||
// Log the error for debugging
|
||||
Console.WriteLine($"GetMyMembershipAsync error: {ex.Message}");
|
||||
|
||||
// Return empty membership if backend is unavailable
|
||||
return new ClubMembershipDto
|
||||
{
|
||||
@@ -59,6 +66,19 @@ public class ClubMembershipService
|
||||
try
|
||||
{
|
||||
var userId = await GetCurrentUserIdAsync();
|
||||
|
||||
// Check if user is authenticated
|
||||
if (userId <= 0)
|
||||
{
|
||||
return new ClubActivationResponseDto
|
||||
{
|
||||
Success = false,
|
||||
Message = "کاربر احراز هویت نشده است. لطفاً ابتدا وارد شوید.",
|
||||
ActivationDate = null,
|
||||
AmountPaid = 0
|
||||
};
|
||||
}
|
||||
|
||||
var request = new ActivateClubMembershipRequest
|
||||
{
|
||||
UserId = userId,
|
||||
@@ -93,10 +113,8 @@ public class ClubMembershipService
|
||||
}
|
||||
}
|
||||
|
||||
private async Task<long> GetCurrentUserIdAsync()
|
||||
private Task<long> GetCurrentUserIdAsync()
|
||||
{
|
||||
// Get current user ID from auth service or JWT token
|
||||
// This is a placeholder - should be implemented based on your auth system
|
||||
return 1; // TODO: Implement proper user ID retrieval
|
||||
return Task.FromResult(_authInfo.UserId);
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user