@unchainedshop/api 2.0.0-beta6 → 2.0.0-beta7

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/queries/products/products.ts

@@ -12,7 +12,7 @@ export default async function products(
   { modules, userId }: Context,
 ) {
   log(
-    `query products: ${params.limit} ${params.offset} ${
+    `query products: ${params.limit || 0} ${params.offset || 0} ${
       params.includeDrafts ? 'includeDrafts' : ''
     } ${params.slugs?.join(',')}`,
     { userId },

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

@@ -10,13 +10,18 @@ export 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 @@ export 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 @@ export 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-tokenized-types.ts

@@ -14,6 +14,7 @@ export const TokenizedProduct: TokenizedProductHelperTypes = {
     return {
       supply: product.tokenization.supply,
       tokenId: product.tokenization.tokenId,
+      ercMetadataProperties: product.tokenization.ercMetadataProperties,
     };
   },
 

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

@@ -24,10 +24,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),
 

package/src/schema/types/product/tokenized-product.js

@@ -5,6 +5,7 @@ export default [
       contractStandard: SmartContractStandard!
       tokenId: String
       supply: Int
+      ercMetadataProperties: JSON
     }
 
     enum SmartContractStandard {
@@ -15,6 +16,7 @@ export default [
     type ContractConfiguration {
       tokenId: String
       supply: Int
+      ercMetadataProperties: JSON
     }
 
     """

package/tsconfig.json

@@ -4,6 +4,7 @@
     "allowSyntheticDefaultImports": true,
     "declaration": true,
     "esModuleInterop": true,
+    "resolveJsonModule": true,
     "experimentalDecorators": true,
     "forceConsistentCasingInFileNames": true,
     "lib": [