Refactor

Author: ferdingler

lambda/index.ts

@@ -15,6 +15,6 @@ export const multiTableHandler = async (event: any) => {
 };
 
 export const datagenHandler = async () => {
-  const numberCustomers = 10;
+  const numberCustomers = 60;
   return RandomDataGenerator.loadFakeData(numberCustomers);
 };

lambda/single-table/customer-factory.ts

@@ -0,0 +1,30 @@
+import { Customer } from "../models";
+import { CustomerDynamoDBItem } from "./dynamo-models";
+
+function convertCustomerItem(item: CustomerDynamoDBItem): Customer {
+  return {
+    customerId: item.pk.substring("Customer#".length),
+    name: item.name,
+    lastName: item.lastName,
+    isPrime: item.isPrime,
+    address: item.address,
+    orders: [],
+  };
+}
+
+function toCustomerItem(customer: Customer): CustomerDynamoDBItem {
+  return {
+    pk: `Customer#${customer.customerId}`,
+    sk: `Customer#${customer.customerId}`,
+    type: "Customer",
+    name: customer.name,
+    lastName: customer.lastName,
+    address: customer.address,
+    isPrime: customer.isPrime,
+  };
+}
+
+export default {
+  convertCustomerItem,
+  toCustomerItem,
+};

lambda/single-table/dynamo-models.ts

@@ -0,0 +1,22 @@
+interface DynamoDBItem {
+  pk: string;
+  sk: string;
+  type: string;
+}
+
+export interface CustomerDynamoDBItem extends DynamoDBItem {
+  name: string;
+  lastName: string;
+  isPrime: boolean;
+  address: {
+    street: string;
+    city: string;
+    state: string;
+    country: string;
+  };
+}
+
+export interface OrderDynamoDBItem extends DynamoDBItem {
+  date: string;
+  total: number;
+}

lambda/single-table/index.ts

@@ -1,5 +1,8 @@
 import { DocumentClient } from "aws-sdk/clients/dynamodb";
 import { Customer, Order } from "../models";
+import { CustomerDynamoDBItem, OrderDynamoDBItem } from "./dynamo-models";
+import CustomerFactory from "./customer-factory";
+import OrderFactory from "./order-factory";
 
 const dynamodb = new DocumentClient();
 const SINGLE_TABLE = process.env.SINGLE_TABLE || "";
@@ -25,17 +28,20 @@ async function fetchCustomerWithOrders(customerId: string): Promise<Customer> {
   const customerItem = result.Items.find((item) => item.type === "Customer");
   const orderItems = result.Items.filter((item) => item.type === "Order");
 
-  const customer = convertCustomerItem(customerItem as CustomerDynamoDBItem);
+  const customer = CustomerFactory.convertCustomerItem(
+    customerItem as CustomerDynamoDBItem
+  );
+
   const orders = orderItems.map((i) =>
-    convertOrderItem(i as OrderDynamoDBItem)
+    OrderFactory.convertOrderItem(i as OrderDynamoDBItem)
   );
 
   customer.orders = orders;
   return customer;
 }
 
 async function saveCustomer(customer: Customer) {
-  const item = toCustomerItem(customer);
+  const item = CustomerFactory.toCustomerItem(customer);
   return dynamodb
     .put({
       TableName: SINGLE_TABLE,
@@ -45,7 +51,7 @@ async function saveCustomer(customer: Customer) {
 }
 
 async function saveOrder(order: Order) {
-  const item = toOrderItem(order);
+  const item = OrderFactory.toOrderItem(order);
   return dynamodb
     .put({
       TableName: SINGLE_TABLE,
@@ -54,71 +60,6 @@ async function saveOrder(order: Order) {
     .promise();
 }
 
-interface DynamoDBItem {
-  pk: string;
-  sk: string;
-  type: string;
-}
-
-interface CustomerDynamoDBItem extends DynamoDBItem {
-  name: string;
-  lastName: string;
-  isPrime: boolean;
-  address: {
-    street: string;
-    city: string;
-    state: string;
-    country: string;
-  };
-}
-
-interface OrderDynamoDBItem extends DynamoDBItem {
-  date: string;
-  total: number;
-}
-
-function convertCustomerItem(item: CustomerDynamoDBItem): Customer {
-  return {
-    customerId: item.pk.substring("Customer#".length),
-    name: item.name,
-    lastName: item.lastName,
-    isPrime: item.isPrime,
-    address: item.address,
-    orders: [],
-  };
-}
-
-function convertOrderItem(item: OrderDynamoDBItem): Order {
-  return {
-    orderId: item.sk.substring("Order#".length),
-    customerId: item.pk.substring("Customer#".length),
-    date: new Date(item.date),
-    total: item.total,
-  };
-}
-
-function toCustomerItem(customer: Customer): CustomerDynamoDBItem {
-  return {
-    pk: `Customer#${customer.customerId}`,
-    sk: `Customer#${customer.customerId}`,
-    type: "Customer",
-    name: customer.name,
-    lastName: customer.lastName,
-    address: customer.address,
-    isPrime: customer.isPrime,
-  };
-}
-
-function toOrderItem(order: Order): OrderDynamoDBItem {
-  return {
-    pk: `Customer#${order.customerId}`,
-    sk: `Order#${order.orderId}`,
-    type: "Order",
-    total: order.total,
-    date: order.date.toISOString(),
-  };
-}
-
 export default {
   fetchCustomerWithOrders,
   saveCustomer,

lambda/single-table/order-factory.ts

@@ -0,0 +1,26 @@
+import { Order } from "../models";
+import { OrderDynamoDBItem } from "./dynamo-models";
+
+function convertOrderItem(item: OrderDynamoDBItem): Order {
+  return {
+    orderId: item.sk.substring("Order#".length),
+    customerId: item.pk.substring("Customer#".length),
+    date: new Date(item.date),
+    total: item.total,
+  };
+}
+
+function toOrderItem(order: Order): OrderDynamoDBItem {
+  return {
+    pk: `Customer#${order.customerId}`,
+    sk: `Order#${order.orderId}`,
+    type: "Order",
+    total: order.total,
+    date: order.date.toISOString(),
+  };
+}
+
+export default {
+  convertOrderItem,
+  toOrderItem,
+};