refactor(payments): replace MessagePattern and nack without re-queue

getlarge · Jan 7, 2024 · 4b6c43f · 4b6c43f
1 parent 9dd05ca
commit 4b6c43f
Show file tree

Hide file tree

Showing 4 changed files with 17 additions and 16 deletions.
diff --git a/apps/expiration/src/app/orders/orders.processor.ts b/apps/expiration/src/app/orders/orders.processor.ts
@@ -33,11 +33,10 @@ export class OrdersProcessor {
     const { data } = job;
     this.logger.debug(`Expire order ${data.id}`);
     await lastValueFrom(
-      this.client
-        .emit<
-          ExpirationCompletedEvent['name'],
-          ExpirationCompletedEvent['data']
-        >(Patterns.ExpirationCompleted, data)
+      this.client.emit<
+        ExpirationCompletedEvent['name'],
+        ExpirationCompletedEvent['data']
+      >(Patterns.ExpirationCompleted, data),
     );
   }
 

diff --git a/apps/orders/test/orders.service.integration.e2e-spec.ts b/apps/orders/test/orders.service.integration.e2e-spec.ts
@@ -42,7 +42,7 @@ describe('OrdersService', () => {
     ordersService = app.get(OrdersService);
     orderModel = app.get<Model<OrderDocument>>(getModelToken(OrderSchema.name));
     ticketModel = app.get<Model<TicketDocument>>(
-      getModelToken(TicketSchema.name)
+      getModelToken(TicketSchema.name),
     );
   });
 
@@ -66,7 +66,7 @@ describe('OrdersService', () => {
       expect(updatedDBOrder.status).toBe(OrderStatus.Cancelled);
       expect(ordersService['sendEvent']).toBeCalledWith(
         Patterns.OrderCancelled,
-        updatedOrder
+        updatedOrder,
       );
     });
   });

diff --git a/apps/payments/src/app/orders/orders-ms.controller.ts b/apps/payments/src/app/orders/orders-ms.controller.ts
@@ -1,7 +1,7 @@
 import { Controller, Inject, Logger } from '@nestjs/common';
 import {
   Ctx,
-  EventPattern,
+  MessagePattern,
   Payload,
   RmqContext,
   Transport,
@@ -23,7 +23,7 @@ export class OrdersMSController {
   ) {}
 
   @ApiExcludeEndpoint()
-  @EventPattern(Patterns.OrderCreated, Transport.RMQ)
+  @MessagePattern(Patterns.OrderCreated, Transport.RMQ)
   async onCreated(
     @Payload() data: Order,
     @Ctx() context: RmqContext,
@@ -34,16 +34,17 @@ export class OrdersMSController {
     this.logger.debug(`received message on ${pattern}`, {
       data,
     });
-    // TODO: conditional ack
     try {
       await this.ordersService.create(data);
-    } finally {
       channel.ack(message);
+    } catch (e) {
+      channel.nack(message, false, false);
+      throw e;
     }
   }
 
   @ApiExcludeEndpoint()
-  @EventPattern(Patterns.OrderCancelled, Transport.RMQ)
+  @MessagePattern(Patterns.OrderCancelled, Transport.RMQ)
   async onCancelled(
     @Payload() data: Order,
     @Ctx() context: RmqContext,
@@ -54,11 +55,12 @@ export class OrdersMSController {
     this.logger.debug(`received message on ${pattern}`, {
       data,
     });
-    // TODO: conditional ack
     try {
       await this.ordersService.cancel(data);
-    } finally {
       channel.ack(message);
+    } catch (e) {
+      channel.nack(message, false, false);
+      throw e;
     }
   }
 }
diff --git a/apps/payments/src/app/payments/payments.service.ts b/apps/payments/src/app/payments/payments.service.ts
@@ -120,9 +120,9 @@ export class PaymentsService {
       );
       await this.createRelationShip(relationTupleWithUser);
 
-      // 7. emit payment:create event
+      // 7. send payment:create event
       await firstValueFrom(
-        this.client.emit<
+        this.client.send<
           PaymentCreatedEvent['name'],
           PaymentCreatedEvent['data']
         >(Patterns.PaymentCreated, payment),