export fdc products

package.json

@@ -22,6 +22,7 @@
     "body-parser": "^1.20.2",
     "connect-ensure-login": "^0.1.1",
     "connect-sqlite3": "^0.9.13",
+    "cors": "^2.8.5",
     "dotenv": "^16.0.3",
     "express-session": "^1.17.3",
     "nock": "^13.3.1",

web/app.js

@@ -4,7 +4,7 @@ import { join } from 'path';
 import { readFileSync } from 'fs';
 import express from 'express';
 import serveStatic from 'serve-static';
-
+import cors from 'cors';
 import apiRouters from './api-routers.js';
 import fdcRouters from './fdc-routers.js';
 import shopify from './shopify.js';
@@ -41,12 +41,17 @@ app.get(
   shopify.redirectToShopifyOrAppRoot()
 );
 
-app.use('/fdc', express.json(), fdcRouters, errorMiddleware);
+app.use('/fdc', cors(), express.json(), fdcRouters, errorMiddleware);
 app.use('/api/*', shopify.validateAuthenticatedSession());
 
 app.use('/*', addSessionShopToReqParams);
 
-app.use('/api', express.json(), apiRouters);
+app.use(
+  '/api',
+  express.json(),
+  express.urlencoded({ extended: true }),
+  apiRouters
+);
 
 app.use(serveStatic(STATIC_PATH, { index: false }));
 
@@ -66,6 +71,4 @@ app.post(
   })
 );
 
-// add error handler
-
 export default app;

web/fdc-modules/products/controllers/get-products.js

@@ -1,11 +1,14 @@
 import ProductUseCases from '../use-cases/index.js';
 
-const getProducts = async (req, res, next) => {
+const getProducts = async (req, res) => {
   try {
-    const {shopifySession} = req;
+    const { shopifySession } = req;
+    const { nextPageCursor, previousPageCursor } = req.query;
 
     const products = await ProductUseCases.getProducts({
-      session: shopifySession
+      session: shopifySession,
+      nextPageCursor,
+      previousPageCursor
     });
 
     return res.status(200).json({

web/fdc-modules/products/controllers/index.js

@@ -1,4 +1,4 @@
-import {Router} from 'express';
+import { Router } from 'express';
 import getProducts from './get-products.js';
 
 import checkOfflineSession from '../../../middleware/checkOfflineSession.js';

web/fdc-modules/products/use-cases/get-products.js

@@ -1,7 +1,11 @@
 import Shopify from '../../../fdc-repositories/shopify/index.js';
 
-const getProducts = async ({ session }) => {
-  const products = await Shopify.getProducts({ session });
+const getProducts = async ({ session, nextPageCursor, previousPageCursor }) => {
+  const products = await Shopify.getProducts({
+    session,
+    nextPageCursor,
+    previousPageCursor
+  });
   return products;
 };
 

web/fdc-modules/products/use-cases/index.js

@@ -1,3 +1,3 @@
 import getProducts from './get-products.js';
 
-export default {getProducts};
+export default { getProducts };

web/fdc-repositories/shopify/get-products.js

@@ -1,25 +1,40 @@
-import shopify from '../../shopify.js';
-import { GET_FDC_PRODUCTS_QUERY } from './queries/GET_FDC_PRODUCTS_QUERY.js';
+/* eslint-disable no-shadow */
+/* eslint-disable arrow-body-style */
+/* eslint-disable import/prefer-default-export */
+/* eslint-disable max-len */
+import { getFDCProductGraphQlQuery } from './queries/GET_FDC_PRODUCTS_QUERY.js';
 import getClient from './get-client.js';
 
 // get only products that have fdc inside tags
 // this query works only for the first 10 products, we should loop through all products and get the ones that have fdc inside tags
-export const getProducts = async ({ session }) => {
+export const getProducts = async ({
+  session,
+  nextPageCursor,
+  previousPageCursor
+}) => {
   const client = getClient(session);
 
   try {
     const products = await client.query({
-      data: GET_FDC_PRODUCTS_QUERY
+      data: getFDCProductGraphQlQuery({
+        nextPageCursor,
+        previousPageCursor
+      })
     });
 
-    return products.body.data.products.edges.map(({ node }) => {
-      return {
-        ...node,
-        variants: node.variants.edges.map(({ node }) => node)
-      };
-    });
+    return {
+      pageInfo: products.body.data.products.pageInfo,
+      list: products.body.data.products.edges.map(({ node }) => {
+        return {
+          ...node,
+          variants: {
+            hasNextPage: node.variants.pageInfo.hasNextPage,
+            list: node.variants.edges.map(({ node }) => node)
+          }
+        };
+      })
+    };
   } catch (e) {
-    console.error('eee', JSON.stringify(e, null, 2));
-    throw e;
+    throw new Error(e);
   }
 };

web/fdc-repositories/shopify/index.js

@@ -1,4 +1,4 @@
-import {getProducts} from './get-products.js';
+import { getProducts } from './get-products.js';
 import createDraftOrder from './create-draft-order.js';
 import checkInventory from './check-inventory.js';
 import updateInventoryLevel from './update-inventory-level.js';

web/fdc-repositories/shopify/queries/GET_FDC_PRODUCTS_QUERY.js

@@ -1,38 +1,50 @@
-// The max first value is 250
-export const GET_FDC_PRODUCTS_QUERY = `{
-  products(first: 10, after: null, before: null) {
-    pageInfo {
-      hasNextPage
-      hasPreviousPage
-      endCursor
-      startCursor
-    }
-    edges {
-      cursor
-      node {
-        id
-        title
-        description
-        variants(first: 5) {
-          pageInfo {
-            hasNextPage
-            hasPreviousPage
-            endCursor
-            startCursor
-          }
-          edges {
-            node {
-              id
-              title
-              inventoryItem {
+/* eslint-disable import/prefer-default-export */
+
+export const getFDCProductGraphQlQuery = ({
+  nextPageCursor = 'null',
+  previousPageCursor = 'null'
+}) => {
+  const after = nextPageCursor === 'null' ? '' : `after: "${nextPageCursor}"`;
+  const before =
+    previousPageCursor === 'null' ? '' : `before: "${previousPageCursor}"`;
+
+  return `{
+    products(first: 5, ${after}, ${before} ,query:"tag:fdc") {
+      pageInfo {
+        hasNextPage
+        hasPreviousPage
+        endCursor
+        startCursor
+      }
+      edges {
+        cursor
+        node {
+          id
+          handle
+          title
+          description
+          variants(first: 10) {
+            pageInfo {
+              hasNextPage
+              hasPreviousPage
+              endCursor
+              startCursor
+            }
+            edges {
+              node {
                 id
+                title
+                price
+                inventoryItem {
+                  id
+                }
+                inventoryPolicy
+                availableForSale
               }
-              inventoryPolicy
-              availableForSale
             }
           }
         }
       }
     }
-  }
-}`;
+  }`;
+};

web/fdc-routers.js

@@ -1,4 +1,4 @@
-import {Router} from 'express';
+import { Router } from 'express';
 
 import OrdersModules from './fdc-modules/orders/index.js';
 import ProductsModules from './fdc-modules/products/index.js';