Merge pull request #1176 from jboolean/merch-admin

Merch admin

Author: jboolean

backend/checkMerchQueue.ts

@@ -0,0 +1,4 @@
+import checkMerchQueueImpl from './src/cron/checkMerchQueue';
+import withSetup from './withSetup';
+
+export const handler = withSetup(checkMerchQueueImpl);

backend/package-lock.json

@@ -78,6 +78,12 @@ functions:
     handler: checkStaleStories.handler
     events:
       - schedule: cron(30 11 * * ? *)
+  checkMerchQueue:
+    stages:
+      - production
+    handler: checkMerchQueue.handler
+    events:
+      - schedule: cron(30 11 * * ? *)
   syncMap:
     stages:
       - production

backend/serverless.yml

@@ -19,7 +19,6 @@ import MerchCustomizationOptions from '../../entities/MerchCustomizationOptions'
 import MerchOrder from '../../entities/MerchOrder';
 import MerchOrderItem from '../../entities/MerchOrderItem';
 import MerchItemState from '../../enum/MerchItemState';
-import MerchOrderFulfillmentState from '../../enum/MerchOrderFulfillmentState';
 import MerchOrderState from '../../enum/MerchOrderState';
 import { getUserFromRequestOrCreateAndSetCookie } from '../auth/userAuthUtils';
 import { MerchOrderApiModel } from './OrderApiModel';
@@ -144,33 +143,15 @@ export class MerchController extends Controller {
   @Security('netlify', ['moderator'])
   @Get('orders/for-review')
   public async getOrdersForReview(): Promise<MerchOrderApiModel[]> {
-    const orders = await getRepository(MerchOrder)
-      .createQueryBuilder('order')
-      .innerJoinAndSelect('order.items', 'items')
-      .innerJoinAndSelect('order.user', 'user')
-      .where({ state: MerchOrderState.PENDING_SUBMISSION })
-      .orderBy('order.createdAt', 'DESC')
-      .getMany();
+    const orders = await MerchOrderService.getOrdersForReview();
 
     return orders.map(orderToApi);
   }
 
   @Security('netlify', ['moderator'])
   @Get('orders/needs-attention')
   public async getOrdersNeedingAttention(): Promise<MerchOrderApiModel[]> {
-    const orders = await getRepository(MerchOrder)
-      .createQueryBuilder('order')
-      .innerJoinAndSelect('order.items', 'items')
-      .innerJoinAndSelect('order.user', 'user')
-      .where({ state: MerchOrderState.SUBMITTED_FOR_FULFILLMENT })
-      .andWhere('order.fulfillmentState in (:...states)', {
-        states: [
-          MerchOrderFulfillmentState.FAILED,
-          MerchOrderFulfillmentState.ON_HOLD,
-        ],
-      })
-      .orderBy('order.createdAt', 'DESC')
-      .getMany();
+    const orders = await MerchOrderService.getOrdersWithExceptions();
 
     return orders.map(orderToApi);
   }

backend/src/api/merch/MerchController.ts

@@ -0,0 +1,18 @@
+import EmailTemplate from '../EmailTemplate';
+import EmailStreamType from './EmailStreamType';
+import Senders from './Senders';
+
+type OrdersQueueTemplateData = {
+  ordersCount: number;
+};
+
+class MerchOrdersQueueTemplate extends EmailTemplate<
+  OrdersQueueTemplateData,
+  Record<string, never>
+> {
+  alias = 'merch-orders-queue';
+  from = Senders.SYSTEM;
+  streamType = EmailStreamType.TRANSACTIONAL;
+}
+
+export default new MerchOrdersQueueTemplate();

backend/src/business/email/templates/MerchOrdersQueueTemplate.ts

@@ -1,4 +1,5 @@
 export interface OrderTemplateData {
+  orderId: string;
   ordersUrl: string;
   trackingUrl?: string;
 }

backend/src/business/email/templates/OrderEmailTemplateData.ts

@@ -2,19 +2,19 @@ import EmailTemplate from '../EmailTemplate';
 import EmailStreamType from './EmailStreamType';
 import Senders from './Senders';
 
-type StoryEmailTemplateData = {
+type StoryReviewEmailTemplateData = {
   storiesCount: number;
   reviewStoriesUrl: string;
   stats: { reviewer: string; count: number }[];
 };
 
-class ReviewQueueStaleTemplate extends EmailTemplate<
-  StoryEmailTemplateData,
+class StoriesReviewQueueStaleTemplate extends EmailTemplate<
+  StoryReviewEmailTemplateData,
   Record<string, never>
 > {
   alias = 'review-queue-stale';
   from = Senders.PERSONAL;
   streamType = EmailStreamType.TRANSACTIONAL;
 }
 
-export default new ReviewQueueStaleTemplate();
+export default new StoriesReviewQueueStaleTemplate();

backend/src/business/email/templates/ReviewQueueStaleTemplate.ts renamed to backend/src/business/email/templates/StoriesReviewQueueStaleTemplate.ts

@@ -23,6 +23,7 @@ const API_BASE = isProduction()
 
 function createOrderEmailTemplateData(order: MerchOrder): OrderTemplateData {
   return {
+    orderId: order.id.toString(),
     ordersUrl: UserService.createMagicLinkUrl(
       API_BASE,
       order.userId,
@@ -223,3 +224,29 @@ export async function onShipmentSent(
     await EmailService.sendTemplateEmail(orderShippedEmail);
   }
 }
+
+export async function getOrdersForReview(): Promise<MerchOrder[]> {
+  return getRepository(MerchOrder)
+    .createQueryBuilder('order')
+    .innerJoinAndSelect('order.items', 'items')
+    .innerJoinAndSelect('order.user', 'user')
+    .where({ state: MerchOrderState.PENDING_SUBMISSION })
+    .orderBy('order.createdAt', 'DESC')
+    .getMany();
+}
+
+export async function getOrdersWithExceptions(): Promise<MerchOrder[]> {
+  return await getRepository(MerchOrder)
+    .createQueryBuilder('order')
+    .innerJoinAndSelect('order.items', 'items')
+    .innerJoinAndSelect('order.user', 'user')
+    .where({ state: MerchOrderState.SUBMITTED_FOR_FULFILLMENT })
+    .andWhere('order.fulfillmentState in (:...states)', {
+      states: [
+        MerchOrderFulfillmentState.FAILED,
+        MerchOrderFulfillmentState.ON_HOLD,
+      ],
+    })
+    .orderBy('order.createdAt', 'DESC')
+    .getMany();
+}

backend/src/business/merch/MerchOrderService.ts

@@ -0,0 +1,24 @@
+import EmailService from '../business/email/EmailService';
+import ReviewQueueStaleTemplate from '../business/email/templates/MerchOrdersQueueTemplate';
+import { getOrdersForReview } from '../business/merch/MerchOrderService';
+
+export default async function checkMerchQueue(): Promise<void> {
+  const ordersForReview = await getOrdersForReview();
+
+  if (ordersForReview.length === 0) {
+    console.log('No orders found');
+    return;
+  }
+
+  const ordersCount = ordersForReview.length;
+
+  const email = ReviewQueueStaleTemplate.createTemplatedEmail({
+    templateContext: {
+      ordersCount,
+    },
+    metadata: {},
+    to: process.env.MODERATORS_TO_EMAIL ?? '',
+  });
+
+  await EmailService.sendTemplateEmail(email);
+}

backend/src/cron/checkMerchQueue.ts

@@ -1,7 +1,7 @@
+import EmailService from '../business/email/EmailService';
+import ReviewQueueStaleTemplate from '../business/email/templates/StoriesReviewQueueStaleTemplate';
 import StoryState from '../enum/StoryState';
 import StoryRepository from '../repositories/StoryRepository';
-import EmailService from '../business/email/EmailService';
-import ReviewQueueStaleTemplate from '../business/email/templates/ReviewQueueStaleTemplate';
 
 const STALENESS_THRESHOLD_MS = 1000 * 60 * 60 * 24 * 2;