@unchainedshop/api 1.2.49 → 1.2.51

package/src/resolvers/mutations/products/removeProduct.ts

@@ -1,23 +1,21 @@
 import { log } from '@unchainedshop/logger';
 import { Context, Root } from '@unchainedshop/types/api';
-import { ProductNotFoundError, ProductWrongStatusError, InvalidIdError } from '../../../errors';
+import { ProductNotFoundError, InvalidIdError } from '../../../errors';
 
 export default async function removeProduct(
   root: Root,
   { productId }: { productId: string },
-  { modules, userId }: Context,
+  context: Context,
 ) {
+  const { modules, services, userId } = context;
   log(`mutation removeProduct ${productId}`, { userId });
 
   if (!productId) throw new InvalidIdError({ productId });
 
-  const product = await modules.products.findProduct({ productId });
-  if (!product) throw new ProductNotFoundError({ productId });
+  if (!(await modules.products.productExists({ productId })))
+    throw new ProductNotFoundError({ productId });
 
-  if (!modules.products.isDraft(product)) throw new ProductWrongStatusError({ status: product.status });
-
-  await modules.assortments.products.delete(productId as string, {}, userId);
-  await modules.products.delete(productId, userId);
+  await services.products.removeProduct({ productId, userId: context.userId }, context);
 
   return modules.products.findProduct({ productId });
 }

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

@@ -13,7 +13,6 @@ export default async function productCatalogPrices(
 
   const product = await loaders.productLoader.load({
     productId,
-    includeDrafts: true,
   });
   if (!product) return null;
 

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

@@ -13,7 +13,6 @@ export const AssortmentFilter: AssortmentFilterHelperTypes = {
   assortment: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-      includeInactive: true,
     });
     return assortment;
   },

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

@@ -12,7 +12,6 @@ export const AssortmentLink: AssortmentLinkHelperTypes = {
   child: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.childAssortmentId,
-      includeInactive: true,
     });
     return assortment;
   },
@@ -20,7 +19,6 @@ export const AssortmentLink: AssortmentLinkHelperTypes = {
   parent: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.parentAssortmentId,
-      includeInactive: true,
     });
     return assortment;
   },

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

@@ -13,11 +13,13 @@ export interface AssortmentMediaHelperTypes {
 }
 
 export const AssortmentMedia: AssortmentMediaHelperTypes = {
+  // TODO: Loader for assortment media texts!
   texts: (obj, { forceLocale }, { modules, localeContext }) =>
     modules.assortments.media.texts.findLocalizedMediaText({
       assortmentMediaId: obj._id,
       locale: forceLocale || localeContext.normalized,
     }),
 
+  // TODO: Loader for files!
   file: (obj, _, { modules }) => modules.files.findFile({ fileId: obj.mediaId }),
 };

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

@@ -17,6 +17,7 @@ export interface AssortmentPathLinkHelperTypes {
 
 export const AssortmentPathLink: AssortmentPathLinkHelperTypes = {
   link: async ({ assortmentId, childAssortmentId }, _, { modules }) => {
+    // TODO: Loader
     return modules.assortments.links.findLink({
       parentAssortmentId: assortmentId,
       childAssortmentId,

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

@@ -16,7 +16,6 @@ export const AssortmentProduct: AssortmentProductHelperTypes = {
   assortment: async (obj, _, { loaders }) => {
     const assortment = await loaders.assortmentLoader.load({
       assortmentId: obj.assortmentId,
-      includeInactive: true,
     });
     return assortment;
   },
@@ -24,7 +23,6 @@ export const AssortmentProduct: AssortmentProductHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -62,10 +62,11 @@ export const Assortment: AssortmentHelperTypes = {
   },
 
   childrenCount: async (assortment, { includeInactive = false }, { modules }) => {
-    const assortmentChildrenIds = await modules.assortments.links.findLinks({
+    // TODO: Loader
+    const assortmentChildLinks = await modules.assortments.links.findLinks({
       parentAssortmentId: assortment._id,
     });
-    const assortmentIds = assortmentChildrenIds.map(({ childAssortmentId }) => childAssortmentId);
+    const assortmentIds = assortmentChildLinks.map(({ childAssortmentId }) => childAssortmentId);
 
     const selector: Query = {
       assortmentIds,
@@ -77,6 +78,7 @@ export const Assortment: AssortmentHelperTypes = {
   },
 
   filterAssignments: async (obj, _, { modules }) => {
+    // TODO: Loader & move default sort to module
     return modules.assortments.filters.findFilters(
       {
         assortmentId: obj._id,
@@ -87,7 +89,8 @@ export const Assortment: AssortmentHelperTypes = {
     );
   },
 
-  linkedAssortments: async (obj, _, { modules }) => {
+  async linkedAssortments(obj, _, { modules }) {
+    // TODO: Loader
     return modules.assortments.links.findLinks({
       assortmentId: obj._id,
     });
@@ -100,7 +103,8 @@ export const Assortment: AssortmentHelperTypes = {
     });
   },
 
-  productAssignments: async (obj, _, { modules }) => {
+  async productAssignments(obj, _, { modules }) {
+    // TODO: Loader & move default sort to core module
     return modules.assortments.products.findProducts(
       {
         assortmentId: obj._id,
@@ -124,6 +128,7 @@ export const Assortment: AssortmentHelperTypes = {
       assortmentId: obj._id,
       ignoreChildAssortments: query.ignoreChildAssortments,
     });
+
     const filterIds = await context.modules.assortments.filters.findFilterIds({
       assortmentId: obj._id,
     });

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

@@ -14,7 +14,6 @@ export const Bookmark: BookmarkHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -12,7 +12,6 @@ export const EnrollmentPlan: EnrollmentPlanHelperTypes = {
   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

@@ -70,7 +70,6 @@ export const OrderItem: OrderItemHelperTypes = {
     });
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
 
     return Promise.all(
@@ -103,7 +102,6 @@ export const OrderItem: OrderItemHelperTypes = {
   originalProduct: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.originalProductId,
-      includeDrafts: true,
     });
     return product;
   },
@@ -111,7 +109,6 @@ export const OrderItem: OrderItemHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -2,6 +2,7 @@ import { ProductAssortmentPathHelperTypes } from '@unchainedshop/types/products'
 
 export const ProductAssortmentPath: ProductAssortmentPathHelperTypes = {
   assortmentProduct: async ({ _id }, _, { modules }) => {
+    // TODO: Loader
     return modules.assortments.products.findProduct({
       assortmentProductId: _id,
     });

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

@@ -4,7 +4,6 @@ export const ProductBundleItem: ProductBundleItemHelperTypes = {
   product: async (productItem, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: productItem.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -1,6 +1,7 @@
 import { ProductMediaHelperTypes } from '@unchainedshop/types/products.media';
 
 export const ProductMedia: ProductMediaHelperTypes = {
+  // TODO: Loader for product media texts!
   texts: async (obj, { forceLocale }, { modules, localeContext }) => {
     return modules.products.media.texts.findLocalizedMediaText({
       productMediaId: obj._id,
@@ -9,6 +10,7 @@ export const ProductMedia: ProductMediaHelperTypes = {
   },
 
   file: async (obj, _, { modules }) => {
+    // TODO: Loader
     return modules.files.findFile({ fileId: obj.mediaId });
   },
 };

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

@@ -23,7 +23,6 @@ export const ProductReview: ProductReviewHelperTypes = {
   product: async (review, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: review.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -14,7 +14,6 @@ export const ProductVariationAssignment: ProductVariationAssignmentHelperTypes =
   product: async ({ assignment }, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: assignment.productId,
-      includeDrafts: true,
     });
     return product;
   },

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

@@ -44,7 +44,6 @@ export const Quotation: QuotationHelperTypes = {
   product: async (obj, _, { loaders }) => {
     const product = await loaders.productLoader.load({
       productId: obj.productId,
-      includeDrafts: true,
     });
     return product;
   },