feat: introduce loading context management across services
- Refactor AuthService, CartService, CatalogService, CheckoutService, TenantService, and TicketService to extend BaseApiService for consistent loading context handling.
- Implement loading modes ('global', 'custom', 'none') using HttpContext for API requests.
- Update existing service methods to accept loading mode parameters and propagate them to HTTP requests.
- Enhance global loading interceptor to respect loading modes and prevent global loading for specific requests.
- Add unit tests to verify loading mode propagation in services and interceptors.
- Update component interactions to utilize the new loading mode functionality.
This commit is contained in:
@@ -22,6 +22,7 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
generatePaymentIntent: ReturnType<typeof vi.fn>;
|
||||
getPurchase: ReturnType<typeof vi.fn>;
|
||||
submitPurchaseForReview: ReturnType<typeof vi.fn>;
|
||||
withCustomLoading: ReturnType<typeof vi.fn>;
|
||||
};
|
||||
let cartServiceStub: {
|
||||
cart: ReturnType<typeof signal>;
|
||||
@@ -60,7 +61,9 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
}),
|
||||
getPurchase: vi.fn().mockResolvedValue({ status: 'pending_payment' }),
|
||||
submitPurchaseForReview: vi.fn().mockResolvedValue({ status: 'in_review' }),
|
||||
withCustomLoading: vi.fn(),
|
||||
};
|
||||
checkoutServiceStub.withCustomLoading.mockReturnValue(checkoutServiceStub);
|
||||
cartServiceStub = {
|
||||
cart: signal({
|
||||
id: 10,
|
||||
@@ -363,7 +366,11 @@ describe('CheckoutPageComponent payment validation', () => {
|
||||
|
||||
expect(component.checkoutStepIndex()).toBe(1);
|
||||
expect(component.selectedPaymentMethod()).toBe('qr');
|
||||
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith('tenant-test', 25, 'qr');
|
||||
expect(checkoutServiceStub.generatePaymentIntent).toHaveBeenCalledWith(
|
||||
'tenant-test',
|
||||
25,
|
||||
'qr',
|
||||
);
|
||||
expect(component.qrData()).toBe('qr-value');
|
||||
expect(component.qrPaymentStatus()).toBe('waiting');
|
||||
});
|
||||
|
||||
@@ -343,11 +343,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.isGeneratingIntent.set(true);
|
||||
|
||||
try {
|
||||
const response = await this.checkoutService.generatePaymentIntent(
|
||||
tenant.codigo,
|
||||
purchaseId,
|
||||
method,
|
||||
);
|
||||
const response = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.generatePaymentIntent(tenant.codigo, purchaseId, method);
|
||||
|
||||
if (method === 'qr' && response.qr_data?.qr_code) {
|
||||
if (requestId !== this.paymentMethodRequestId || this.selectedPaymentMethod() !== 'qr') {
|
||||
@@ -381,12 +379,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.transferValidationStatus.set('idle');
|
||||
this.isGeneratingIntent.set(true);
|
||||
try {
|
||||
const response = await this.checkoutService.generatePaymentIntent(
|
||||
tenant.codigo,
|
||||
purchaseId,
|
||||
'transfer',
|
||||
dni,
|
||||
);
|
||||
const response = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.generatePaymentIntent(tenant.codigo, purchaseId, 'transfer', dni);
|
||||
|
||||
if (response.transfer_data) {
|
||||
this.markPurchasePendingPayment();
|
||||
@@ -438,10 +433,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.transferValidationStatus.set('checking');
|
||||
|
||||
try {
|
||||
const purchase = await this.checkoutService.submitPurchaseForReview(
|
||||
tenant.codigo,
|
||||
purchaseId,
|
||||
);
|
||||
const purchase = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.submitPurchaseForReview(tenant.codigo, purchaseId);
|
||||
|
||||
if (purchase.status === 'paid') {
|
||||
this.navigateToPurchaseStatus(purchaseId);
|
||||
@@ -494,7 +488,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
this.isCheckingQrPayment.set(true);
|
||||
|
||||
try {
|
||||
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||
const purchase = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.getPurchase(tenant.codigo, purchaseId);
|
||||
|
||||
if (runId !== this.qrPollingRunId) {
|
||||
return;
|
||||
@@ -575,7 +571,9 @@ export class CheckoutPageComponent implements OnInit, OnDestroy {
|
||||
}
|
||||
|
||||
try {
|
||||
const purchase = await this.checkoutService.getPurchase(tenant.codigo, purchaseId);
|
||||
const purchase = await this.checkoutService
|
||||
.withCustomLoading()
|
||||
.getPurchase(tenant.codigo, purchaseId);
|
||||
|
||||
if (
|
||||
purchase.status === 'in_review' ||
|
||||
|
||||
Reference in New Issue
Block a user