@unchainedshop/api 1.2.43 → 1.2.44

package/lib/loaders/index.js

@@ -1,9 +1,28 @@
 import DataLoader from 'dataloader';
 import { systemLocale } from '@unchainedshop/utils';
 import localePkg from 'locale';
+import { ProductStatus } from '@unchainedshop/core-products';
 const { Locale } = localePkg;
 export default async (req, unchainedAPI) => {
     return {
+        assortmentLoader: new DataLoader(async (queries) => {
+            const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+            const assortments = await unchainedAPI.modules.assortments.findAssortments({
+                assortmentIds,
+                includeInactive: true,
+                includeLeaves: true,
+            });
+            return queries.map(({ assortmentId, includeInactive }) => {
+                return assortments.find((assortment) => {
+                    if (assortment._id !== assortmentId)
+                        return false;
+                    if (!includeInactive) {
+                        return assortment.isActive === true;
+                    }
+                    return true;
+                });
+            });
+        }),
         assortmentTextLoader: new DataLoader(async (queries) => {
             const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
             const texts = await unchainedAPI.modules.assortments.texts.findTexts({ assortmentId: { $in: assortmentIds } }, {
@@ -26,6 +45,19 @@ export default async (req, unchainedAPI) => {
                 return assortmentText || assortmentTexts[0];
             });
         }),
+        filterLoader: new DataLoader(async (queries) => {
+            const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
+            const filters = await unchainedAPI.modules.filters.findFilters({
+                filterIds,
+            });
+            return queries.map(({ filterId }) => {
+                return filters.find((product) => {
+                    if (product._id !== filterId)
+                        return false;
+                    return true;
+                });
+            });
+        }),
         filterTextLoader: new DataLoader(async (queries) => {
             const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
             const texts = await unchainedAPI.modules.filters.texts.findTexts({ filterId: { $in: filterIds } }, {
@@ -48,6 +80,23 @@ export default async (req, unchainedAPI) => {
                 return filterText || filterTexts[0];
             });
         }),
+        productLoader: new DataLoader(async (queries) => {
+            const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+            const products = await unchainedAPI.modules.products.findProducts({
+                productIds,
+                includeDrafts: true,
+            });
+            return queries.map(({ productId, includeDrafts }) => {
+                return products.find((product) => {
+                    if (product._id !== productId)
+                        return false;
+                    if (!includeDrafts) {
+                        return product.status === ProductStatus.ACTIVE;
+                    }
+                    return true;
+                });
+            });
+        }),
         productTextLoader: new DataLoader(async (queries) => {
             const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
             const texts = await unchainedAPI.modules.products.texts.findTexts({ productId: { $in: productIds } }, {

package/lib/loaders/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../src/loaders/index.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/queries/products/productCatalogPrices.d.ts

@@ -1,4 +1,4 @@
 import { Context, Root } from '@unchainedshop/types/api';
 export default function productCatalogPrices(root: Root, { productId }: {
     productId: string;
-}, { modules, userId }: Context): Promise<import("@unchainedshop/types/products").ProductPrice[]>;
+}, { modules, loaders, userId }: Context): Promise<import("@unchainedshop/types/products").ProductPrice[]>;

package/lib/resolvers/queries/products/productCatalogPrices.js

@@ -1,10 +1,13 @@
 import { log } from '@unchainedshop/logger';
 import { InvalidIdError } from '../../../errors';
-export default async function productCatalogPrices(root, { productId }, { modules, userId }) {
+export default async function productCatalogPrices(root, { productId }, { modules, loaders, userId }) {
     log(`query productCatalogPrices ${productId}`, { userId });
     if (!productId)
         throw new InvalidIdError({ productId });
-    const product = await modules.products.findProduct({ productId });
+    const product = await loaders.productLoader.load({
+        productId,
+        includeDrafts: true,
+    });
     if (!product)
         return null;
     return modules.products.prices.catalogPrices(product);

package/lib/resolvers/queries/products/productCatalogPrices.js.map

@@ -1 +1 @@
-{"version":3,"file":"productCatalogPrices.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/products/productCatalogPrices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,IAAU,EACV,EAAE,SAAS,EAAyB,EACpC,EAAE,OAAO,EAAE,MAAM,EAAW;IAE5B,GAAG,CAAC,8BAA8B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAClE,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}
+{"version":3,"file":"productCatalogPrices.js","sourceRoot":"","sources":["../../../../src/resolvers/queries/products/productCatalogPrices.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,GAAG,EAAE,MAAM,uBAAuB,CAAC;AAE5C,OAAO,EAAE,cAAc,EAAE,MAAM,iBAAiB,CAAC;AAEjD,MAAM,CAAC,OAAO,CAAC,KAAK,UAAU,oBAAoB,CAChD,IAAU,EACV,EAAE,SAAS,EAAyB,EACpC,EAAE,OAAO,EAAE,OAAO,EAAE,MAAM,EAAW;IAErC,GAAG,CAAC,8BAA8B,SAAS,EAAE,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAE3D,IAAI,CAAC,SAAS;QAAE,MAAM,IAAI,cAAc,CAAC,EAAE,SAAS,EAAE,CAAC,CAAC;IAExD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;QAC/C,SAAS;QACT,aAAa,EAAE,IAAI;KACpB,CAAC,CAAC;IACH,IAAI,CAAC,OAAO;QAAE,OAAO,IAAI,CAAC;IAE1B,OAAO,OAAO,CAAC,QAAQ,CAAC,MAAM,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACxD,CAAC"}

package/lib/resolvers/type/assortment/assortment-filter-types.js

@@ -1,9 +1,16 @@
 export const AssortmentFilter = {
-    assortment: (obj, _, { modules }) => modules.assortments.findAssortment({
-        assortmentId: obj.assortmentId,
-    }),
-    filter: (obj, _, { modules }) => modules.filters.findFilter({
-        filterId: obj.filterId,
-    }),
+    assortment: async (obj, _, { loaders }) => {
+        const assortment = await loaders.assortmentLoader.load({
+            assortmentId: obj.assortmentId,
+            includeInactive: true,
+        });
+        return assortment;
+    },
+    filter: async (obj, _, { loaders }) => {
+        const filter = await loaders.filterLoader.load({
+            filterId: obj.filterId,
+        });
+        return filter;
+    },
 };
 //# sourceMappingURL=assortment-filter-types.js.map

package/lib/resolvers/type/assortment/assortment-filter-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"assortment-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-filter-types.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAClC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;QACjC,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC;IAEJ,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC9B,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC;QACzB,QAAQ,EAAE,GAAG,CAAC,QAAQ;KACvB,CAAC;CACL,CAAC"}
+{"version":3,"file":"assortment-filter-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-filter-types.ts"],"names":[],"mappings":"AAWA,MAAM,CAAC,MAAM,gBAAgB,GAAgC;IAC3D,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACrD,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,MAAM,GAAG,MAAM,OAAO,CAAC,YAAY,CAAC,IAAI,CAAC;YAC7C,QAAQ,EAAE,GAAG,CAAC,QAAQ;SACvB,CAAC,CAAC;QACH,OAAO,MAAM,CAAC;IAChB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/assortment/assortment-link-types.js

@@ -1,9 +1,17 @@
 export const AssortmentLink = {
-    child: (obj, _, { modules }) => modules.assortments.findAssortment({
-        assortmentId: obj.childAssortmentId,
-    }),
-    parent: (obj, _, { modules }) => modules.assortments.findAssortment({
-        assortmentId: obj.parentAssortmentId,
-    }),
+    child: async (obj, _, { loaders }) => {
+        const assortment = await loaders.assortmentLoader.load({
+            assortmentId: obj.childAssortmentId,
+            includeInactive: true,
+        });
+        return assortment;
+    },
+    parent: async (obj, _, { loaders }) => {
+        const assortment = await loaders.assortmentLoader.load({
+            assortmentId: obj.parentAssortmentId,
+            includeInactive: true,
+        });
+        return assortment;
+    },
 };
 //# sourceMappingURL=assortment-link-types.js.map

package/lib/resolvers/type/assortment/assortment-link-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"assortment-link-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-link-types.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,cAAc,GAA8B;IACvD,KAAK,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC7B,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;QACjC,YAAY,EAAE,GAAG,CAAC,iBAAiB;KACpC,CAAC;IAEJ,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC9B,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;QACjC,YAAY,EAAE,GAAG,CAAC,kBAAkB;KACrC,CAAC;CACL,CAAC"}
+{"version":3,"file":"assortment-link-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-link-types.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,cAAc,GAA8B;IACvD,KAAK,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACnC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACrD,YAAY,EAAE,GAAG,CAAC,iBAAiB;YACnC,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACrD,YAAY,EAAE,GAAG,CAAC,kBAAkB;YACpC,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/assortment/assortment-product-types.js

@@ -1,9 +1,17 @@
 export const AssortmentProduct = {
-    assortment: (obj, _, { modules }) => modules.assortments.findAssortment({
-        assortmentId: obj.assortmentId,
-    }),
-    product: (obj, _, { modules }) => modules.products.findProduct({
-        productId: obj.productId,
-    }),
+    assortment: async (obj, _, { loaders }) => {
+        const assortment = await loaders.assortmentLoader.load({
+            assortmentId: obj.assortmentId,
+            includeInactive: true,
+        });
+        return assortment;
+    },
+    product: async (obj, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
+            productId: obj.productId,
+            includeDrafts: true,
+        });
+        return product;
+    },
 };
 //# sourceMappingURL=assortment-product-types.js.map

package/lib/resolvers/type/assortment/assortment-product-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"assortment-product-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-product-types.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,UAAU,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAClC,OAAO,CAAC,WAAW,CAAC,cAAc,CAAC;QACjC,YAAY,EAAE,GAAG,CAAC,YAAY;KAC/B,CAAC;IAEJ,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QAC3B,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAC;CACL,CAAC"}
+{"version":3,"file":"assortment-product-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/assortment/assortment-product-types.ts"],"names":[],"mappings":"AAcA,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,UAAU,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxC,MAAM,UAAU,GAAG,MAAM,OAAO,CAAC,gBAAgB,CAAC,IAAI,CAAC;YACrD,YAAY,EAAE,GAAG,CAAC,YAAY;YAC9B,eAAe,EAAE,IAAI;SACtB,CAAC,CAAC;QACH,OAAO,UAAU,CAAC;IACpB,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/bookmark-types.js

@@ -1,6 +1,10 @@
 export const Bookmark = {
-    product: async (obj, _, { modules }) => {
-        return modules.products.findProduct({ productId: obj.productId });
+    product: async (obj, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
+            productId: obj.productId,
+            includeDrafts: true,
+        });
+        return product;
     },
     user: async (obj, _, { modules }) => {
         return modules.users.findUserById(obj.userId);

package/lib/resolvers/type/bookmark-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"bookmark-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/bookmark-types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,QAAQ,GAAwB;IAC3C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACrC,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IACD,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAClC,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACF,CAAC"}
+{"version":3,"file":"bookmark-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/bookmark-types.ts"],"names":[],"mappings":"AAYA,MAAM,CAAC,MAAM,QAAQ,GAAwB;IAC3C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,IAAI,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAClC,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC,CAAC;IAChD,CAAC;CACF,CAAC"}

package/lib/resolvers/type/enrollment/enrollment-plan-tyes.js

@@ -1,6 +1,10 @@
 export const EnrollmentPlan = {
-    product: async (plan, _, { modules }) => {
-        return modules.products.findProduct({ productId: plan.productId });
+    product: async (plan, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
+            productId: plan.productId,
+            includeDrafts: true,
+        });
+        return product;
     },
 };
 //# sourceMappingURL=enrollment-plan-tyes.js.map

package/lib/resolvers/type/enrollment/enrollment-plan-tyes.js.map

@@ -1 +1 @@
-{"version":3,"file":"enrollment-plan-tyes.js","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-plan-tyes.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,cAAc,GAA8B;IACvD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,SAAS,EAAE,CAAC,CAAC;IACrE,CAAC;CACF,CAAC"}
+{"version":3,"file":"enrollment-plan-tyes.js","sourceRoot":"","sources":["../../../../src/resolvers/type/enrollment/enrollment-plan-tyes.ts"],"names":[],"mappings":"AAUA,MAAM,CAAC,MAAM,cAAc,GAA8B;IACvD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACtC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,IAAI,CAAC,SAAS;YACzB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/order/order-item-types.js

@@ -19,7 +19,7 @@ export const OrderItem = {
         }
         return [];
     },
-    dispatches: async (obj, _, { modules }) => {
+    dispatches: async (obj, _, { modules, loaders }) => {
         const scheduling = obj.scheduling || [];
         const order = await modules.orders.findOrder({ orderId: obj.orderId });
         const { countryCode, userId } = order;
@@ -29,8 +29,9 @@ export const OrderItem = {
         const deliveryProvider = await modules.delivery.findProvider({
             deliveryProviderId: orderDelivery.deliveryProviderId,
         });
-        const product = await modules.products.findProduct({
+        const product = await loaders.productLoader.load({
             productId: obj.productId,
+            includeDrafts: true,
         });
         return Promise.all(scheduling.map(async (schedule) => {
             const warehousingProvider = await modules.warehousing.findProvider({
@@ -54,13 +55,19 @@ export const OrderItem = {
     order: async (obj, _, { modules }) => {
         return modules.orders.findOrder({ orderId: obj.orderId });
     },
-    originalProduct: async (obj, _, { modules }) => {
-        return modules.products.findProduct({
+    originalProduct: async (obj, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
             productId: obj.originalProductId,
+            includeDrafts: true,
         });
+        return product;
     },
-    product: async (obj, _, { modules }) => {
-        return modules.products.findProduct({ productId: obj.productId });
+    product: async (obj, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
+            productId: obj.productId,
+            includeDrafts: true,
+        });
+        return product;
     },
     quotation: async (obj, _, { modules }) => {
         if (!obj.quotationId)

package/lib/resolvers/type/order/order-item-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"order-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-item-types.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"order-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/order/order-item-types.ts"],"names":[],"mappings":"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"}

package/lib/resolvers/type/product/product-bundle-item-types.js

@@ -1,8 +1,10 @@
 export const ProductBundleItem = {
-    product: async (productItem, _, { modules }) => {
-        return modules.products.findProduct({
+    product: async (productItem, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
             productId: productItem.productId,
+            includeDrafts: true,
         });
+        return product;
     },
 };
 //# sourceMappingURL=product-bundle-item-types.js.map

package/lib/resolvers/type/product/product-bundle-item-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-bundle-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-bundle-item-types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;YAClC,SAAS,EAAE,WAAW,CAAC,SAAS;SACjC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"product-bundle-item-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-bundle-item-types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,iBAAiB,GAAiC;IAC7D,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAC7C,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,WAAW,CAAC,SAAS;YAChC,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/product/product-review-types.js

@@ -2,8 +2,12 @@ export const ProductReview = {
     author: async (obj, _, { modules }) => {
         return modules.users.findUserById(obj.authorId);
     },
-    product: async (obj, _, { modules }) => {
-        return modules.products.findProduct({ productId: obj.productId });
+    product: async (review, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
+            productId: review.productId,
+            includeDrafts: true,
+        });
+        return product;
     },
     ownVotes: async (obj, _, { modules, userId }) => {
         return modules.products.reviews.votes.ownVotes(obj, { userId });

package/lib/resolvers/type/product/product-review-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-review-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-review-types.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,aAAa,GAA6B;IACrD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACrC,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,EAAE,GAAG,CAAC,SAAS,EAAE,CAAC,CAAC;IACpE,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9C,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxC,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAC/E,CAAC;CACF,CAAC"}
+{"version":3,"file":"product-review-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-review-types.ts"],"names":[],"mappings":"AAiBA,MAAM,CAAC,MAAM,aAAa,GAA6B;IACrD,MAAM,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACpC,OAAO,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;IAClD,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,MAAM,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,MAAM,CAAC,SAAS;YAC3B,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,EAAE,EAAE;QAC9C,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,EAAE,EAAE,MAAM,EAAE,CAAC,CAAC;IAClE,CAAC;IAED,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACxC,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,CAAC,CAAC,MAAM,CAAC;IAC/E,CAAC;CACF,CAAC"}

package/lib/resolvers/type/product/product-variation-assignment-types.js

@@ -9,10 +9,12 @@ export const ProductVariationAssignment = {
             product,
         }));
     },
-    product: async ({ assignment }, _, { modules }) => {
-        return modules.products.findProduct({
+    product: async ({ assignment }, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
             productId: assignment.productId,
+            includeDrafts: true,
         });
+        return product;
     },
 };
 //# sourceMappingURL=product-variation-assignment-types.js.map

package/lib/resolvers/type/product/product-variation-assignment-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"product-variation-assignment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-variation-assignment-types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,0BAA0B,GAA0C;IAC/E,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE;QAC/B,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;QACnC,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACxD,GAAG;YACH,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,OAAO;SACR,CAAC,CAAC,CAAC;IACN,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAChD,OAAO,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;YAClC,SAAS,EAAE,UAAU,CAAC,SAAS;SAChC,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"product-variation-assignment-types.js","sourceRoot":"","sources":["../../../../src/resolvers/type/product/product-variation-assignment-types.ts"],"names":[],"mappings":"AAEA,MAAM,CAAC,MAAM,0BAA0B,GAA0C;IAC/E,GAAG,EAAE,CAAC,EAAE,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE;QAC/B,OAAO,GAAG,OAAO,CAAC,GAAG,IAAI,MAAM,CAAC,MAAM,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,EAAE,CAAC;IACxE,CAAC;IACD,OAAO,EAAE,CAAC,EAAE,UAAU,EAAE,OAAO,EAAE,EAAE,EAAE;QACnC,OAAO,MAAM,CAAC,IAAI,CAAC,UAAU,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,GAAG,EAAE,EAAE,CAAC,CAAC;YACxD,GAAG;YACH,KAAK,EAAE,UAAU,CAAC,MAAM,CAAC,GAAG,CAAC;YAC7B,OAAO;SACR,CAAC,CAAC,CAAC;IACN,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,EAAE,UAAU,EAAE,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QAChD,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,UAAU,CAAC,SAAS;YAC/B,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;CACF,CAAC"}

package/lib/resolvers/type/quotation-types.js

@@ -12,9 +12,13 @@ export const Quotation = {
         },
     }),
     isExpired: (obj, { referenceDate }, { modules }) => modules.quotations.isExpired(obj, { referenceDate }),
-    product: (obj, _, { modules }) => modules.products.findProduct({
-        productId: obj.productId,
-    }),
+    product: async (obj, _, { loaders }) => {
+        const product = await loaders.productLoader.load({
+            productId: obj.productId,
+            includeDrafts: true,
+        });
+        return product;
+    },
     status: (obj, _, { modules }) => modules.quotations.normalizedStatus(obj),
     user: (obj, _, { modules }) => modules.users.findUserById(obj.userId),
 };

package/lib/resolvers/type/quotation-types.js.map

@@ -1 +1 @@
-{"version":3,"file":"quotation-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/quotation-types.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,MAAM,SAAS,GAAyB;IAC7C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;IAEnG,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC;IAEnG,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACxC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAC/B;QACE,IAAI,EAAE;YACJ,WAAW,EAAE,GAAG,CAAC,GAAG;YACpB,IAAI;SACL;KACF,EACD;QACE,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,CAAC;SAChB;KACF,CACF;IAEH,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACjD,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,CAAC;IAEtD,OAAO,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAC/B,OAAO,CAAC,QAAQ,CAAC,WAAW,CAAC;QAC3B,SAAS,EAAE,GAAG,CAAC,SAAS;KACzB,CAAC;IAEJ,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC;IAEzE,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;CACtE,CAAC"}
+{"version":3,"file":"quotation-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/quotation-types.ts"],"names":[],"mappings":"AAoBA,MAAM,CAAC,MAAM,SAAS,GAAyB;IAC7C,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,SAAS,CAAC,WAAW,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,WAAW,EAAE,CAAC;IAEnG,QAAQ,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,YAAY,CAAC,EAAE,OAAO,EAAE,GAAG,CAAC,QAAQ,EAAE,CAAC;IAEnG,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,IAAI,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACxC,OAAO,CAAC,KAAK,CAAC,mBAAmB,CAC/B;QACE,IAAI,EAAE;YACJ,WAAW,EAAE,GAAG,CAAC,GAAG;YACpB,IAAI;SACL;KACF,EACD;QACE,IAAI,EAAE;YACJ,WAAW,EAAE,CAAC,CAAC;SAChB;KACF,CACF;IAEH,SAAS,EAAE,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CACjD,OAAO,CAAC,UAAU,CAAC,SAAS,CAAC,GAAG,EAAE,EAAE,aAAa,EAAE,CAAC;IAEtD,OAAO,EAAE,KAAK,EAAE,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE;QACrC,MAAM,OAAO,GAAG,MAAM,OAAO,CAAC,aAAa,CAAC,IAAI,CAAC;YAC/C,SAAS,EAAE,GAAG,CAAC,SAAS;YACxB,aAAa,EAAE,IAAI;SACpB,CAAC,CAAC;QACH,OAAO,OAAO,CAAC;IACjB,CAAC;IAED,MAAM,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,UAAU,CAAC,gBAAgB,CAAC,GAAG,CAAC;IAEzE,IAAI,EAAE,CAAC,GAAG,EAAE,CAAC,EAAE,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC,OAAO,CAAC,KAAK,CAAC,YAAY,CAAC,GAAG,CAAC,MAAM,CAAC;CACtE,CAAC"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "1.2.43",
+  "version": "1.2.44",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -34,24 +34,24 @@
     "graphql": "^15.x"
   },
   "dependencies": {
-    "@unchainedshop/core": "^1.2.43",
-    "@unchainedshop/events": "^1.2.43",
-    "@unchainedshop/logger": "^1.2.43",
-    "@unchainedshop/roles": "^1.2.43",
-    "@unchainedshop/utils": "^1.2.43",
+    "@unchainedshop/core": "^1.2.44",
+    "@unchainedshop/events": "^1.2.44",
+    "@unchainedshop/logger": "^1.2.44",
+    "@unchainedshop/roles": "^1.2.44",
+    "@unchainedshop/utils": "^1.2.44",
     "accounting": "0.4.1",
     "dataloader": "^2.1.0",
     "graphql-scalars": "^1.20.0",
     "graphql-upload": "^13.0.0",
     "locale": "0.1.0",
     "lodash.isnumber": "3.0.3",
-    "lru-cache": "^7.14.0"
+    "lru-cache": "^7.14.1"
   },
   "devDependencies": {
     "@types/graphql-upload": "^8.0.12",
     "@types/locale": "^0.1.1",
     "@types/node": "^16.18.3",
-    "@unchainedshop/types": "^1.2.43",
+    "@unchainedshop/types": "^1.2.44",
     "apollo-server-express": "^2.26.0",
     "graphql": "^15.8.0",
     "jest": "^29.2.2",

package/src/loaders/index.ts

@@ -3,10 +3,11 @@ import DataLoader from 'dataloader';
 import { IncomingMessage } from 'http';
 import { systemLocale } from '@unchainedshop/utils';
 import localePkg from 'locale';
-import { AssortmentText } from '@unchainedshop/types/assortments';
-import { FilterText } from '@unchainedshop/types/filters';
-import { ProductText } from '@unchainedshop/types/products';
+import { Assortment, AssortmentText } from '@unchainedshop/types/assortments';
+import { Filter, FilterText } from '@unchainedshop/types/filters';
+import { Product, ProductText } from '@unchainedshop/types/products';
 import { UnchainedCore } from '@unchainedshop/types/core';
+import { ProductStatus } from '@unchainedshop/core-products';
 
 const { Locale } = localePkg;
 
@@ -15,6 +16,28 @@ export default async (
   unchainedAPI: UnchainedCore,
 ): Promise<UnchainedLoaders['loaders']> => {
   return {
+    assortmentLoader: new DataLoader<{ assortmentId: string; includeInactive: boolean }, Assortment>(
+      async (queries) => {
+        const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+
+        const assortments = await unchainedAPI.modules.assortments.findAssortments({
+          assortmentIds,
+          includeInactive: true,
+          includeLeaves: true,
+        });
+
+        return queries.map(({ assortmentId, includeInactive }) => {
+          return assortments.find((assortment) => {
+            if (assortment._id !== assortmentId) return false;
+            if (!includeInactive) {
+              return assortment.isActive === true;
+            }
+            return true;
+          });
+        });
+      },
+    ),
+
     assortmentTextLoader: new DataLoader<{ assortmentId: string; locale: string }, AssortmentText>(
       async (queries) => {
         const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
@@ -45,6 +68,21 @@ export default async (
       },
     ),
 
+    filterLoader: new DataLoader<{ filterId: string }, Filter>(async (queries) => {
+      const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
+
+      const filters = await unchainedAPI.modules.filters.findFilters({
+        filterIds,
+      });
+
+      return queries.map(({ filterId }) => {
+        return filters.find((product) => {
+          if (product._id !== filterId) return false;
+          return true;
+        });
+      });
+    }),
+
     filterTextLoader: new DataLoader<
       { filterId: string; filterOptionValue?: string; locale: string },
       FilterText
@@ -78,6 +116,27 @@ export default async (
       });
     }),
 
+    productLoader: new DataLoader<{ productId: string; includeDrafts: boolean }, Product>(
+      async (queries) => {
+        const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+
+        const products = await unchainedAPI.modules.products.findProducts({
+          productIds,
+          includeDrafts: true,
+        });
+
+        return queries.map(({ productId, includeDrafts }) => {
+          return products.find((product) => {
+            if (product._id !== productId) return false;
+            if (!includeDrafts) {
+              return product.status === ProductStatus.ACTIVE;
+            }
+            return true;
+          });
+        });
+      },
+    ),
+
     productTextLoader: new DataLoader<{ productId: string; locale: string }, ProductText>(
       async (queries) => {
         const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];

package/src/resolvers/queries/products/productCatalogPrices.ts

@@ -5,13 +5,16 @@ import { InvalidIdError } from '../../../errors';
 export default async function productCatalogPrices(
   root: Root,
   { productId }: { productId: string },
-  { modules, userId }: Context,
+  { modules, loaders, userId }: Context,
 ) {
   log(`query productCatalogPrices ${productId}`, { userId });
 
   if (!productId) throw new InvalidIdError({ productId });
 
-  const product = await modules.products.findProduct({ productId });
+  const product = await loaders.productLoader.load({
+    productId,
+    includeDrafts: true,
+  });
   if (!product) return null;
 
   return modules.products.prices.catalogPrices(product);

package/src/resolvers/type/assortment/assortment-filter-types.ts

@@ -10,13 +10,18 @@ type AssortmentFilterHelperTypes = {
 };
 
 export const AssortmentFilter: AssortmentFilterHelperTypes = {
-  assortment: (obj, _, { modules }) =>
-    modules.assortments.findAssortment({
+  assortment: async (obj, _, { loaders }) => {
+    const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-    }),
+      includeInactive: true,
+    });
+    return assortment;
+  },
 
-  filter: (obj, _, { modules }) =>
-    modules.filters.findFilter({
+  filter: async (obj, _, { loaders }) => {
+    const filter = await loaders.filterLoader.load({
       filterId: obj.filterId,
-    }),
+    });
+    return filter;
+  },
 };

package/src/resolvers/type/assortment/assortment-link-types.ts

@@ -9,13 +9,19 @@ type AssortmentLinkHelperTypes = {
 };
 
 export const AssortmentLink: AssortmentLinkHelperTypes = {
-  child: (obj, _, { modules }) =>
-    modules.assortments.findAssortment({
+  child: async (obj, _, { loaders }) => {
+    const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.childAssortmentId,
-    }),
+      includeInactive: true,
+    });
+    return assortment;
+  },
 
-  parent: (obj, _, { modules }) =>
-    modules.assortments.findAssortment({
+  parent: async (obj, _, { loaders }) => {
+    const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.parentAssortmentId,
-    }),
+      includeInactive: true,
+    });
+    return assortment;
+  },
 };

package/src/resolvers/type/assortment/assortment-product-types.ts

@@ -13,13 +13,19 @@ type AssortmentProductHelperTypes = {
 };
 
 export const AssortmentProduct: AssortmentProductHelperTypes = {
-  assortment: (obj, _, { modules }) =>
-    modules.assortments.findAssortment({
+  assortment: async (obj, _, { loaders }) => {
+    const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-    }),
+      includeInactive: true,
+    });
+    return assortment;
+  },
 
-  product: (obj, _, { modules }) =>
-    modules.products.findProduct({
+  product: async (obj, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
       productId: obj.productId,
-    }),
+      includeDrafts: true,
+    });
+    return product;
+  },
 };

package/src/resolvers/type/bookmark-types.ts

@@ -11,9 +11,14 @@ export interface BookmarkHelperTypes {
 }
 
 export const Bookmark: BookmarkHelperTypes = {
-  product: async (obj, _, { modules }) => {
-    return modules.products.findProduct({ productId: obj.productId });
+  product: async (obj, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
+      productId: obj.productId,
+      includeDrafts: true,
+    });
+    return product;
   },
+
   user: async (obj, _, { modules }) => {
     return modules.users.findUserById(obj.userId);
   },

package/src/resolvers/type/enrollment/enrollment-plan-tyes.ts

@@ -9,7 +9,11 @@ type EnrollmentPlanHelperTypes = {
 };
 
 export const EnrollmentPlan: EnrollmentPlanHelperTypes = {
-  product: async (plan, _, { modules }) => {
-    return modules.products.findProduct({ productId: plan.productId });
+  product: async (plan, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
+      productId: plan.productId,
+      includeDrafts: true,
+    });
+    return product;
   },
 };

package/src/resolvers/type/order/order-item-types.ts

@@ -57,7 +57,7 @@ export const OrderItem: OrderItemHelperTypes = {
     return [];
   },
 
-  dispatches: async (obj, _, { modules }) => {
+  dispatches: async (obj, _, { modules, loaders }) => {
     const scheduling = obj.scheduling || [];
     const order = await modules.orders.findOrder({ orderId: obj.orderId });
     const { countryCode, userId } = order;
@@ -68,8 +68,9 @@ export const OrderItem: OrderItemHelperTypes = {
     const deliveryProvider = await modules.delivery.findProvider({
       deliveryProviderId: orderDelivery.deliveryProviderId,
     });
-    const product = await modules.products.findProduct({
+    const product = await loaders.productLoader.load({
       productId: obj.productId,
+      includeDrafts: true,
     });
 
     return Promise.all(
@@ -99,14 +100,20 @@ export const OrderItem: OrderItemHelperTypes = {
     return modules.orders.findOrder({ orderId: obj.orderId });
   },
 
-  originalProduct: async (obj, _, { modules }) => {
-    return modules.products.findProduct({
+  originalProduct: async (obj, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
       productId: obj.originalProductId,
+      includeDrafts: true,
     });
+    return product;
   },
 
-  product: async (obj, _, { modules }) => {
-    return modules.products.findProduct({ productId: obj.productId });
+  product: async (obj, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
+      productId: obj.productId,
+      includeDrafts: true,
+    });
+    return product;
   },
 
   quotation: async (obj, _, { modules }) => {

package/src/resolvers/type/product/product-bundle-item-types.ts

@@ -1,9 +1,11 @@
 import { ProductBundleItemHelperTypes } from '@unchainedshop/types/products';
 
 export const ProductBundleItem: ProductBundleItemHelperTypes = {
-  product: async (productItem, _, { modules }) => {
-    return modules.products.findProduct({
+  product: async (productItem, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
       productId: productItem.productId,
+      includeDrafts: true,
     });
+    return product;
   },
 };

package/src/resolvers/type/product/product-review-types.ts

@@ -20,8 +20,12 @@ export const ProductReview: ProductReviewHelperTypes = {
     return modules.users.findUserById(obj.authorId);
   },
 
-  product: async (obj, _, { modules }) => {
-    return modules.products.findProduct({ productId: obj.productId });
+  product: async (review, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
+      productId: review.productId,
+      includeDrafts: true,
+    });
+    return product;
   },
 
   ownVotes: async (obj, _, { modules, userId }) => {

package/src/resolvers/type/product/product-variation-assignment-types.ts

@@ -11,9 +11,11 @@ export const ProductVariationAssignment: ProductVariationAssignmentHelperTypes =
       product,
     }));
   },
-  product: async ({ assignment }, _, { modules }) => {
-    return modules.products.findProduct({
+  product: async ({ assignment }, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
       productId: assignment.productId,
+      includeDrafts: true,
     });
+    return product;
   },
 };

package/src/resolvers/type/quotation-types.ts

@@ -41,10 +41,13 @@ export const Quotation: QuotationHelperTypes = {
   isExpired: (obj, { referenceDate }, { modules }) =>
     modules.quotations.isExpired(obj, { referenceDate }),
 
-  product: (obj, _, { modules }) =>
-    modules.products.findProduct({
+  product: async (obj, _, { loaders }) => {
+    const product = await loaders.productLoader.load({
       productId: obj.productId,
-    }),
+      includeDrafts: true,
+    });
+    return product;
+  },
 
   status: (obj, _, { modules }) => modules.quotations.normalizedStatus(obj),