Change injection and introduce Order Fetcher

Plopix · Plopix · commit 63edbc1cdfd7 · 2022-04-13T00:25:48.000-07:00
diff --git a/src/core/catalogue.ts b/src/core/catalogue.ts
@@ -12,7 +12,7 @@ import {
 
 export function createCatalogueFetcher(client: ClientInterface) {
     return <T>(query: any): Promise<T> => {
-        return client.catalogueApi(jsonToGraphQLQuery({ query: { ...query } }));
+        return client.catalogueApi(jsonToGraphQLQuery({ query }));
     };
 }
 
diff --git a/src/core/hydrate.ts b/src/core/hydrate.ts
@@ -9,7 +9,7 @@ export type ProductHydrater = (
     perVariant?: (item: string, index: number) => any
 ) => Promise<any>;
 
-export function createProductHydraterByPaths(client: ClientInterface): ProductHydrater {
+function byPaths(client: ClientInterface): ProductHydrater {
     return <T>(
         paths: string[],
         language: string,
@@ -56,18 +56,16 @@ export function createProductHydraterByPaths(client: ClientInterface): ProductHy
             }, {});
 
         const query = {
-            query: {
-                ...{ ...productListQuery },
-                ...(extraQuery !== undefined ? extraQuery : {})
-            }
+            ...{ ...productListQuery },
+            ...(extraQuery !== undefined ? extraQuery : {})
         };
 
         const fetch = client.catalogueApi;
-        return fetch(jsonToGraphQLQuery(query));
+        return fetch(jsonToGraphQLQuery({ query }));
     };
 }
 
-export function createProductHydraterBySkus(client: ClientInterface): ProductHydrater {
+function bySkus(client: ClientInterface): ProductHydrater {
     async function getPathForSkus(skus: string[], language: string): Promise<string[]> {
         const search = client.searchApi;
         const pathsSet = new Set<string>();
@@ -137,6 +135,16 @@ export function createProductHydraterBySkus(client: ClientInterface): ProductHyd
 
             return empty as any;
         }
-        return createProductHydraterByPaths(client)(paths, language, extraQuery, perProduct, perVariant);
+        return byPaths(client)(paths, language, extraQuery, perProduct, perVariant);
+    };
+}
+
+export function createProductHydrater(client: ClientInterface): {
+    byPaths: ProductHydrater;
+    bySkus: ProductHydrater;
+} {
+    return {
+        byPaths: byPaths(client),
+        bySkus: bySkus(client)
     };
 }
diff --git a/src/core/navigation.ts b/src/core/navigation.ts
@@ -90,23 +90,23 @@ function fetchTree<T>(client: ClientInterface, type: NavigationType): TreeFetche
         const fetch = client.catalogueApi;
         const baseQuery = buildQueryFor(type, path);
         const query = {
-            query: {
-                ...baseQuery,
-                tree: {
-                    ...baseQuery.tree,
-                    ...nestedQuery(depth, 1, perLevel)
-                },
-                ...(extraQuery !== undefined ? extraQuery : {})
-            }
+            ...baseQuery,
+            tree: {
+                ...baseQuery.tree,
+                ...nestedQuery(depth, 1, perLevel)
+            },
+            ...(extraQuery !== undefined ? extraQuery : {})
         };
-        return fetch(jsonToGraphQLQuery(query), { language, path });
+        return fetch(jsonToGraphQLQuery({ query }), { language, path });
     };
 }
 
-export function createNavigationByFoldersFetcher(client: ClientInterface): TreeFetcher {
-    return fetchTree(client, NavigationType.Tree);
-}
-
-export function createNavigationByTopicsFetcher(client: ClientInterface): TreeFetcher {
-    return fetchTree(client, NavigationType.Topics);
+export function createNavigationFetcher(client: ClientInterface): {
+    byFolders: TreeFetcher;
+    byTopics: TreeFetcher;
+} {
+    return {
+        byFolders: fetchTree(client, NavigationType.Tree),
+        byTopics: fetchTree(client, NavigationType.Topics)
+    };
 }
diff --git a/src/core/order.ts b/src/core/order.ts
@@ -2,13 +2,73 @@ import { ClientInterface } from './client';
 import {
     CreateOrderInputRequest,
     createOrderInputRequest,
+    Order,
     OrderCreatedConfirmation,
     OrderUpdatedConfirmation,
     updateOrderInputRequest,
     UpdateOrderInputRequest
 } from '../types/order.types';
 import { jsonToGraphQLQuery } from 'json-to-graphql-query';
 
+export function createOrderFetcher(apiClient: ClientInterface) {
+    const fetchOrderById = async (
+        orderId: string,
+        onCustomer?: any,
+        onOrderItem?: any,
+        extraQuery?: any
+    ): Promise<Order> => {
+        const orderApi = apiClient.orderApi;
+        const query = {
+            orders: {
+                get: {
+                    __args: {
+                        id: orderId
+                    },
+                    id: true,
+                    createdAt: true,
+                    updatedAt: true,
+                    customer: {
+                        identifier: true,
+                        ...(onCustomer !== undefined ? onCustomer : {})
+                    },
+                    cart: {
+                        name: true,
+                        sku: true,
+                        imageUrl: true,
+                        quantity: true,
+                        ...(onOrderItem !== undefined ? onOrderItem : {}),
+                        price: {
+                            gross: true,
+                            net: true,
+                            discounts: {
+                                percent: true
+                            }
+                        }
+                    },
+                    total: {
+                        gross: true,
+                        net: true,
+                        currency: true,
+                        discounts: {
+                            percent: true
+                        },
+                        tax: {
+                            name: true,
+                            percent: true
+                        }
+                    },
+                    ...(extraQuery !== undefined ? extraQuery : {})
+                }
+            }
+        };
+        return (await orderApi(jsonToGraphQLQuery({ query })))?.orders?.get;
+    };
+
+    return {
+        byId: fetchOrderById
+    };
+}
+
 export function createOrderPusher(apiClient: ClientInterface) {
     return async function pushOrder(intentOrder: CreateOrderInputRequest): Promise<OrderCreatedConfirmation> {
         const intent = createOrderInputRequest.parse(intentOrder);
diff --git a/src/index.ts b/src/index.ts
@@ -2,15 +2,16 @@ export * from './core/client';
 export * from './core/navigation';
 export * from './core/hydrate';
 export * from './core/catalogue';
+export * from './core/order';
 export * from './types/product.types';
 export * from './types/order.types';
 export * from './types/payment.types';
 
 import { createClient } from './core/client';
-import { createNavigationByFoldersFetcher, createNavigationByTopicsFetcher } from './core/navigation';
-import { createProductHydraterByPaths, createProductHydraterBySkus } from './core/hydrate';
+import { createNavigationFetcher } from './core/navigation';
+import { createProductHydrater } from './core/hydrate';
 
-import { createOrderPusher, createOrderPaymentUpdater } from './core/order';
+import { createOrderPusher, createOrderPaymentUpdater, createOrderFetcher } from './core/order';
 import { createCatalogueFetcher } from './core/catalogue';
 
 export const CrystallizeClient = createClient({
@@ -19,10 +20,18 @@ export const CrystallizeClient = createClient({
     accessTokenSecret: typeof process === 'object' ? process?.env.CRYSTALLIZE_ACCESS_TOKEN_SECRET || '' : ''
 });
 
-export const CrystallizeNavigationFoldersFetcher = createNavigationByFoldersFetcher(CrystallizeClient);
-export const CrystallizeNavigationTopicsFetcher = createNavigationByTopicsFetcher(CrystallizeClient);
-export const CrystallizeHydraterByPaths = createProductHydraterByPaths(CrystallizeClient);
-export const CrystallizeHydraterBySkus = createProductHydraterBySkus(CrystallizeClient);
+const navigationFetcher = createNavigationFetcher(CrystallizeClient);
+export const CrystallizeNavigationFoldersFetcher = navigationFetcher.byFolders;
+export const CrystallizeNavigationTopicsFetcher = navigationFetcher.byTopics;
+
+const productHydrator = createProductHydrater(CrystallizeClient);
+export const CrystallizeHydraterByPaths = productHydrator.byPaths;
+export const CrystallizeHydraterBySkus = productHydrator.bySkus;
+
 export const CrystallizeOrderPusher = createOrderPusher(CrystallizeClient);
 export const CrystallizeCreateOrderPaymentUpdater = createOrderPaymentUpdater(CrystallizeClient);
+
 export const CrystallizeCatalogueFetcher = createCatalogueFetcher(CrystallizeClient);
+
+const orderFetcher = createOrderFetcher(CrystallizeClient);
+export const CrystallizeOrderFetcherById = orderFetcher.byId;
diff --git a/tests/hydrate.paths.test.js b/tests/hydrate.paths.test.js
@@ -1,11 +1,11 @@
-const { createClient, createProductHydraterByPaths } = require('../dist/index.js');
+const { createClient, createProductHydrater } = require('../dist/index.js');
 
 test('Hydrate Paths', async () => {
     const CrystallizeClient = createClient({
         tenantIdentifier: 'furniture'
     });
 
-    const hydrater = createProductHydraterByPaths(CrystallizeClient);
+    const hydrater = createProductHydrater(CrystallizeClient).byPaths;
     const response = await hydrater(
         [
             '/shop/bathroom-fitting/large-mounted-cabinet-in-treated-wood',
diff --git a/tests/hydrate.skus.test.js b/tests/hydrate.skus.test.js
@@ -1,11 +1,11 @@
-const { createClient, createProductHydraterBySkus } = require('../dist/index.js');
+const { createClient, createProductHydrater } = require('../dist/index.js');
 
 test('Hydrate Skus', async () => {
     const CrystallizeClient = createClient({
         tenantIdentifier: 'furniture'
     });
 
-    const hydrater = createProductHydraterBySkus(CrystallizeClient);
+    const hydrater = createProductHydrater(CrystallizeClient).bySkus;
     const response = await hydrater(['b-1628520141076', 'b-1628514494819'], 'en');
 
     expect(response.product0.path).toBe('/shop/bathroom-fitting/large-mounted-cabinet-in-treated-wood');
diff --git a/tests/navigationFolders.test.js b/tests/navigationFolders.test.js
@@ -1,11 +1,11 @@
-const { createNavigationByFoldersFetcher, createClient } = require('../dist/index.js');
+const { createNavigationFetcher, createClient } = require('../dist/index.js');
 
 test('Test Nav fetching Node: Shop', async () => {
     const CrystallizeClient = createClient({
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByFoldersFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byFolders;
     const response = await fetch('/shop', 'en', 3);
 
     expect(response.tree.path).toBe('/shop');
@@ -21,7 +21,7 @@ test('Test Nav fetching Node: /', async () => {
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByFoldersFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byFolders;
     const response = await fetch('/', 'en', 3);
     expect(response.tree.path).toBe('/');
     expect(response.tree.children[0].path).toBe('/shop');
@@ -32,7 +32,7 @@ test('Test Nav fetching Node: / + extra data', async () => {
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByFoldersFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byFolders;
     const response = await fetch('/', 'en', 2, {
         tenant: {
             __args: {
@@ -51,7 +51,7 @@ test('Test Nav fetching Node: / + extra data + specific level', async () => {
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByFoldersFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byFolders;
     const response = await fetch(
         '/',
         'en',
diff --git a/tests/navigationTopics.test.js b/tests/navigationTopics.test.js
@@ -1,11 +1,11 @@
-const { createNavigationByTopicsFetcher, createClient } = require('../dist/index.js');
+const { createNavigationFetcher, createClient } = require('../dist/index.js');
 
 test('Test Nav fetching Topic: /', async () => {
     const CrystallizeClient = createClient({
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByTopicsFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byTopics;
     const response = await fetch('/', 'en', 3);
 
     // fetch topics returns a list of topics with no parents
@@ -19,7 +19,7 @@ test('Test Nav fetching Topic: /specials', async () => {
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByTopicsFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byTopics;
     const response = await fetch('/specials', 'en', 3);
 
     expect(response.tree.name).toBe('Specials');
@@ -32,7 +32,7 @@ test('Test Nav fetching Topic: /specials + extra data + specific level', async (
         tenantIdentifier: 'furniture'
     });
 
-    const fetch = createNavigationByTopicsFetcher(CrystallizeClient);
+    const fetch = createNavigationFetcher(CrystallizeClient).byTopics;
     const response = await fetch(
         '/specials',
         'en',
diff --git a/tests/order.fetch.test.js b/tests/order.fetch.test.js
@@ -0,0 +1,18 @@
+const { CrystallizeOrderFetcherById } = require('../dist/index.js');
+
+test('Hydrate Paths', async () => {
+    const fetcher = CrystallizeOrderFetcherById;
+    const order = await fetcher('62557a65be73e0f09258ef69');
+    console.log(order);
+    // const hydrater = createProductHydraterByPaths(CrystallizeClient);
+    // const response = await hydrater(
+    //     [
+    //         '/shop/bathroom-fitting/large-mounted-cabinet-in-treated-wood',
+    //         '/shop/bathroom-fitting/mounted-bathroom-counter-with-shelf'
+    //     ],
+    //     'en'
+    // );
+
+    // expect(response.product0.path).toBe('/shop/bathroom-fitting/large-mounted-cabinet-in-treated-wood');
+    // expect(response.product1.path).toBe('/shop/bathroom-fitting/mounted-bathroom-counter-with-shelf');
+});

Original file line number	Diff line number	Diff line change
`@@ -12,7 +12,7 @@ import {`
`12`	`12`
`13`	`13`	`export function createCatalogueFetcher(client: ClientInterface) {`
`14`	`14`	`return <T>(query: any): Promise<T> => {`
`15`		`- return client.catalogueApi(jsonToGraphQLQuery({ query: { ...query } }));`
	`15`	`+ return client.catalogueApi(jsonToGraphQLQuery({ query }));`
`16`	`16`	`};`
`17`	`17`	`}`
`18`	`18`