From 48d74810eb2a1869dea8442c72269640ff298928 Mon Sep 17 00:00:00 2001
From: Pote <81638931+willpote@users.noreply.github.com>
Date: Mon, 31 Jul 2023 19:39:33 -0400
Subject: [PATCH] Add timeouts to ddb client, add logs

---
 lib/handlers/get-orders/injector.ts |  2 +-
 lib/handlers/post-order/handler.ts  | 10 ++++++++--
 lib/handlers/post-order/injector.ts |  2 +-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/lib/handlers/get-orders/injector.ts b/lib/handlers/get-orders/injector.ts
index 5fb4e319..ccf4e8f1 100644
--- a/lib/handlers/get-orders/injector.ts
+++ b/lib/handlers/get-orders/injector.ts
@@ -22,7 +22,7 @@ export interface ContainerInjected {
 export class GetOrdersInjector extends ApiInjector<ContainerInjected, RequestInjected, void, RawGetOrdersQueryParams> {
   public async buildContainerInjected(): Promise<ContainerInjected> {
     return {
-      dbInterface: DynamoOrdersRepository.create(new DynamoDB.DocumentClient()),
+      dbInterface: DynamoOrdersRepository.create(new DynamoDB.DocumentClient({ maxRetries: 3, httpOptions: { timeout: 1000 } })),
     }
   }
 
diff --git a/lib/handlers/post-order/handler.ts b/lib/handlers/post-order/handler.ts
index 888bcda8..2195c822 100644
--- a/lib/handlers/post-order/handler.ts
+++ b/lib/handlers/post-order/handler.ts
@@ -36,7 +36,7 @@ export class PostOrderHandler extends APIGLambdaHandler<
       containerInjected: { dbInterface, orderValidator, onchainValidatorByChainId },
     } = params
 
-    log.info('Handling POST order request', params)
+    log.info({ params }, 'Handling POST order request')
     log.info(
       {
         onchainValidatorByChainId: Object.keys(onchainValidatorByChainId).map(
@@ -57,6 +57,7 @@ export class PostOrderHandler extends APIGLambdaHandler<
         ...(e instanceof Error && { detail: e.message }),
       }
     }
+    log.info({ decodedOrder: decodedOrder.toJSON() }, 'Parsed order')
 
     const validationResponse = orderValidator.validate(decodedOrder)
     if (!validationResponse.valid) {
@@ -83,12 +84,15 @@ export class PostOrderHandler extends APIGLambdaHandler<
         detail: `Onchain validation failed: ${OrderValidation[validation]}`,
       }
     }
+    log.info({ validation }, 'Onchain validation succeeded')
 
     const order: OrderEntity = formatOrderEntity(decodedOrder, signature, OrderType.Dutch, ORDER_STATUS.OPEN, quoteId)
     const id = order.orderHash
 
     try {
       const orderCount = await dbInterface.countOrdersByOffererAndStatus(order.offerer, ORDER_STATUS.OPEN)
+      log.info({ offerer: order.offerer, orderCount }, `Counted open orders for ${order.offerer}: ${orderCount}`)
+
       if (orderCount > getMaxOpenOrders(order.offerer)) {
         log.info(orderCount, `${order.offerer} has too many open orders`)
         return {
@@ -109,7 +113,7 @@ export class PostOrderHandler extends APIGLambdaHandler<
 
     try {
       await dbInterface.putOrderAndUpdateNonceTransaction(order)
-      log.info(`Successfully inserted Order ${id} into DB`)
+      log.info({ order }, `Successfully inserted Order ${id} into DB`)
     } catch (e: unknown) {
       log.error(e, `Failed to insert order ${id} into DB`)
       return {
@@ -146,6 +150,8 @@ export class PostOrderHandler extends APIGLambdaHandler<
       stateMachineArn,
       log
     )
+    log.info(`Successfully kicked off SFN order with name: ${id}`)
+
     return {
       statusCode: 201,
       body: { hash: id },
diff --git a/lib/handlers/post-order/injector.ts b/lib/handlers/post-order/injector.ts
index 17d1ed32..5742f94d 100644
--- a/lib/handlers/post-order/injector.ts
+++ b/lib/handlers/post-order/injector.ts
@@ -31,7 +31,7 @@ export class PostOrderInjector extends ApiInjector<ContainerInjected, ApiRInj, P
       }
     })
     return {
-      dbInterface: DynamoOrdersRepository.create(new DynamoDB.DocumentClient()),
+      dbInterface: DynamoOrdersRepository.create(new DynamoDB.DocumentClient({ maxRetries: 3, httpOptions: { timeout: 1000 } })),
       orderValidator: new OrderValidator(() => new Date().getTime() / 1000),
       onchainValidatorByChainId,
     }