2.5.10 oauth webhook + ignore proposed

Adeptry · Nov 16, 2023 · 54abe80 · 54abe80
1 parent 53b1215
commit 54abe80
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 8 deletions.
diff --git a/src/moa-square/controllers/orders.controller.ts b/src/moa-square/controllers/orders.controller.ts
@@ -527,7 +527,6 @@ export class OrdersController {
     lineItems?: boolean,
     @Query('location', new DefaultValuePipe(false), ParseBoolPipe)
     location?: boolean,
-
     @Query('idempotencyKey') idempotencyKey?: string,
   ) {
     const { variations } = body;

diff --git a/src/moa-square/services/merchants.square.service.ts b/src/moa-square/services/merchants.square.service.ts
@@ -282,14 +282,12 @@ export class MerchantsSquareService {
   }
 
   @OnEvent('square.oauth.authorization.revoked')
-  handleOauthAuthorizationRevoked(
+  async handleOauthAuthorizationRevoked(
     payload: SquareOauthAuthorizationRevokedEventPayload,
   ) {
-    this.logger.debug(
-      `Handling SquareOauthAuthorizationRevokedEventPayload ${JSON.stringify(
-        payload,
-      )}}`,
-    );
+    if (payload.merchant_id) {
+      await this.deleteOauth({ merchantId: payload.merchant_id });
+    }
   }
 
   /*

diff --git a/src/moa-square/services/orders.service.ts b/src/moa-square/services/orders.service.ts
@@ -762,6 +762,7 @@ export class OrdersService extends EntityRepositoryService<OrderEntity> {
 
     updatedOrder.squareId = squareCreateOrderResult.id;
     updatedOrder.closedDate = new Date();
+    updatedOrder.squareFulfillmentStatus = FulfillmentStatusEnum.proposed;
     updatedOrder.pickupDate = new Date(pickupOrAsapDate);
     updatedOrder.customerId = customerMoaId;
     updatedOrder.totalMoneyAmount = Number(
@@ -857,7 +858,8 @@ export class OrdersService extends EntityRepositoryService<OrderEntity> {
       if (
         newFulfillmentStatus &&
         isValidFulfillmentStatus(newFulfillmentStatus) &&
-        newFulfillmentStatus != oldFulfillmentStatus
+        newFulfillmentStatus != oldFulfillmentStatus &&
+        newFulfillmentStatus != FulfillmentStatusEnum.proposed
       ) {
         order.squareFulfillmentStatus = newFulfillmentStatus;
         await this.save(order);