@websolutespa/bom-mixer-models 0.4.0 → 0.4.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @websolutespa/bom-mixer-models
 
+## 0.4.2
+
+### Patch Changes
+
+- Fixing: avoid categories circular reference.
+
+## 0.4.1
+
+### Patch Changes
+
+- Added: source files.
+
 ## 0.4.0
 
 ### Minor Changes

package/dist/index.js

@@ -79,6 +79,7 @@ async function getSegments(item, params = {}) {
   return getRouteSegments(item, categories);
 }
 function getRouteSegments(item, categories) {
+  const routeCategories = [];
   const segments = [];
   let parentId = item.category || null;
   while (parentId != null) {
@@ -88,7 +89,15 @@ function getRouteSegments(item, categories) {
         const segment = { ...parentCategory };
         segments.unshift(segment);
       }
-      parentId = parentCategory.category || null;
+      parentId = parentCategory.category ? String(parentCategory.category) : null;
+      if (parentId) {
+        if (routeCategories.includes(parentId)) {
+          console.log("CategoryService.getRouteSegments", "circular reference found", parentId);
+          parentId = null;
+        } else {
+          routeCategories.push(parentId);
+        }
+      }
     } else {
       parentId = null;
     }

package/dist/index.mjs

@@ -10,6 +10,7 @@ async function getSegments(item, params = {}) {
   return getRouteSegments(item, categories);
 }
 function getRouteSegments(item, categories) {
+  const routeCategories = [];
   const segments = [];
   let parentId = item.category || null;
   while (parentId != null) {
@@ -19,7 +20,15 @@ function getRouteSegments(item, categories) {
         const segment = { ...parentCategory };
         segments.unshift(segment);
       }
-      parentId = parentCategory.category || null;
+      parentId = parentCategory.category ? String(parentCategory.category) : null;
+      if (parentId) {
+        if (routeCategories.includes(parentId)) {
+          console.log("CategoryService.getRouteSegments", "circular reference found", parentId);
+          parentId = null;
+        } else {
+          routeCategories.push(parentId);
+        }
+      }
     } else {
       parentId = null;
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@websolutespa/bom-mixer-models",
-  "version": "0.4.0",
+  "version": "0.4.2",
   "description": "Mixer Models module of the BOM Repository",
   "keywords": [
     "bom",
@@ -44,14 +44,16 @@
   "sideEffects": false,
   "prepack": {
     "types": "./dist/index.d.ts",
-    "main": "./dist/index.js",
-    "module": "./dist/index.mjs"
+    "main": "./dist/index.mjs",
+    "module": "./dist/index.mjs",
+    "source": "./src/index.ts"
   },
   "postpack": {
     "types": "./src/index.ts",
     "main": "./src/index.ts"
   },
   "types": "./dist/index.d.ts",
-  "main": "./dist/index.js",
-  "module": "./dist/index.mjs"
+  "main": "./dist/index.mjs",
+  "module": "./dist/index.mjs",
+  "source": "./src/index.ts"
 }

package/src/cart/cart.ts

@@ -0,0 +1,30 @@
+import { IEquatable, IMedia, ISchema } from '@websolutespa/bom-core';
+
+export type ICartItem = ISchema & {
+  id: IEquatable;
+  schema: string;
+  media: IMedia;
+  title: string;
+  abstract?: string;
+  href: string;
+  price: number;
+  qty: number;
+};
+
+export type ICartAddItem = Omit<ICartItem, 'qty'>;
+
+/*
+export type ICartAddItem = ISchema & {
+  id: IEquatable;
+  schema: string;
+  media: IMedia;
+  title: string;
+  abstract?: string;
+  href: string;
+  price: number;
+}
+
+export type ICartItem = ICartAddItem & {
+  qty: number;
+}
+*/

package/src/category/category.service.ts

@@ -0,0 +1,50 @@
+import { ICategorized, ICategory, QueryParams } from '@websolutespa/bom-core';
+import { getStore } from '@websolutespa/bom-mixer-store';
+import { IModelStore } from '../store/store';
+
+export async function getCategories(params: QueryParams = {}): Promise<ICategory[]> {
+  const store = await getStore<IModelStore>();
+  const categories = await store.category.findMany(params);
+  return categories;
+}
+
+export async function getSegments(item: ICategorized, params: QueryParams = {}): Promise<ICategory[]> {
+  const categories: ICategory[] = await getCategories(params);
+  return getRouteSegments(item, categories);
+}
+
+export function getRouteSegments(item: ICategorized, categories: ICategory[]): ICategory[] {
+  const routeCategories: string[] = [];
+  const segments: ICategory[] = [];
+  let parentId = item.category || null;
+  while (parentId != null) { // !!! loose
+    const parentCategory = categories.find(c => c.id === parentId);
+    if (parentCategory) {
+      if (parentCategory.slug) {
+        const segment = { ...parentCategory };
+        segments.unshift(segment);
+      }
+      parentId = parentCategory.category ? String(parentCategory.category) : null;
+      if (parentId) {
+        if (routeCategories.includes(parentId)) {
+          console.log('CategoryService.getRouteSegments', 'circular reference found', parentId);
+          parentId = null;
+        } else {
+          routeCategories.push(parentId);
+        }
+      }
+    } else {
+      parentId = null;
+    }
+  }
+  if (item.isDefault !== true) {
+    const segment: ICategory = {
+      id: item.id,
+      title: item.title,
+      slug: item.slug,
+      media: item.media,
+    };
+    segments.push(segment);
+  }
+  return segments;
+}

package/src/checkout/checkout.service.ts

@@ -0,0 +1,350 @@
+import { IOption } from '@websolutespa/bom-core';
+import { ICartItem } from '../cart/cart';
+import { getCountries } from '../country/country.service';
+import { getProvinces } from '../province/province.service';
+import { getRegions } from '../region/region.service';
+import { getRoutesForSchemas } from '../route/route.service';
+import { IAddressOptions, IUser } from '../user/user';
+import { ICheckoutDelivery, ICheckoutItem, ICheckoutPartial, ICheckoutPayment, ICheckoutStore } from './checkout';
+
+// step 1.
+export async function getItems(items: ICartItem[], market: string, locale: string, user?: IUser): Promise<ICheckoutItem[]> {
+  // !!! todo calculate user discount price
+  return items.map(x => ({ ...x, fullPrice: x.price, price: x.price * 0.9 }));
+}
+
+// step 2.
+export async function getInfo(checkout: ICheckoutPartial, market: string, locale: string): Promise<IAddressOptions> {
+  const countries = await getCountries(locale) as IOption[];
+  const provinces = await getProvinces(locale) as IOption[];
+  const regions = await getRegions(locale) as IOption[];
+  const data = { countries, regions, provinces };
+  return data;
+}
+
+// step 3.
+export async function getDeliveries(checkout: ICheckoutPartial, market: string, locale: string): Promise<ICheckoutDelivery[]> {
+  return [
+    {
+      'id': 1,
+      'name': 'In-store pick up',
+      'abstract': 'Conveniently collect from your nearest shop at no extra charge',
+      'price': 0,
+      'fullPrice': 0
+    },
+    {
+      'id': 2,
+      'name': 'Courier delivery',
+      'abstract': 'Packaged goods are delivered by our trusted forwarder.',
+      'price': 81,
+      'fullPrice': 81
+    },
+    {
+      'id': 3,
+      'name': 'In-home courier delivery',
+      'abstract': 'Packaged goods are delivered inside at front door. <br>White glove delivery, unpacking, assembly, or removal of debris is optional on request.',
+      'price': 156,
+      'fullPrice': 156
+    }
+  ];
+}
+
+// step 4.
+export async function getStores(checkout: ICheckoutPartial, market: string, locale: string): Promise<ICheckoutStore[]> {
+  return [
+    {
+      'id': 10366,
+      'category': { 'id': 'store_category_distributor', 'name': 'Mixer Distributor' },
+      'name': 'Di Paolo Arredamenti',
+      'address': 'Viale Cesare Battisti',
+      'streetNumber': '80',
+      'zipCode': '64020',
+      'city': 'Bellante',
+      'country': { 'id': 'it', 'name': 'Italy' },
+      'phoneNumber': '+39 0861 616436',
+      'timetable': [],
+      'position': {
+        'latitude': 0.0,
+        'longitude': 0.0
+      },
+      'distance': 151.84174300013095,
+      'rank': 1
+    }, {
+      'id': 7430,
+      'category': { 'id': 'store_category_distributor', 'name': 'Mixer Distributor' },
+      'name': 'Mancini Italian Design & Art S.r.l.',
+      'address': 'Via Ascari',
+      'streetNumber': '2',
+      'zipCode': '41053',
+      'city': 'Maranello',
+      'country': { 'id': 'it', 'name': 'Italy' },
+      'email': 'info@mancinimida.com',
+      'timetable': [],
+      'position': {
+        'latitude': 0.0,
+        'longitude': 0.0
+      },
+      'distance': 170.6551472799284,
+      'rank': 2
+    }, {
+      'id': 325,
+      'category': { 'id': 'store_category_distributor', 'name': 'Mixer Distributor' },
+      'name': 'AD dal Pozzo',
+      'address': 'Via Mazzini',
+      'streetNumber': '24',
+      'zipCode': '36040',
+      'city': 'Grisignano Di Zocco',
+      'country': { 'id': 'it', 'name': 'Italy' },
+      'phoneNumber': '+39 0444 614521',
+      'email': 'mfort@websolute.it',
+      'timetable': [],
+      'position': {
+        'latitude': 0.0,
+        'longitude': 0.0
+      },
+      'distance': 196.0600048738732,
+      'rank': 3
+    }];
+}
+
+// step 5.
+export async function getPayments(checkout: ICheckoutPartial, market: string, locale: string): Promise<ICheckoutPayment[]> {
+  return [
+    {
+      'id': 'alipay',
+      'name': 'Alipay',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/alipay.svg'
+      }
+    },
+    {
+      'id': 'amex',
+      'name': 'American Express',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/american-express.svg'
+      }
+    },
+    {
+      'id': 'apple-pay',
+      'name': 'Apple Pay',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/apple-pay.svg'
+      }
+    },
+    {
+      'id': 'bank-transfer',
+      'name': 'Bank Transfer',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/bank-transfer.svg'
+      }
+    },
+    {
+      'id': 'cbc',
+      'name': 'CBC',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/cbc.svg'
+      }
+    },
+    {
+      'id': 'direct-debit',
+      'name': 'Direct Debit',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/direct-debit.svg'
+      }
+    },
+    {
+      'id': 'googlepay',
+      'name': 'Google Pay',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/googlepay.svg'
+      }
+    },
+    {
+      'id': 'ideal',
+      'name': 'iDEAL',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/ideal.svg'
+      }
+    },
+    {
+      'id': 'maestro',
+      'name': 'Maestro',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/maestro.svg'
+      }
+    },
+    {
+      'id': 'mastercard',
+      'name': 'MasterCard',
+      'abstract': '<p>You can use your Mastercard credit card. The 3DS authentication procedure will be used when the order is concluded, and you will be redirected to the bank\'s web page. To complete the order, follow the required steps.</p>',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/mastercard.svg'
+      }
+    },
+    {
+      'id': 'mybank',
+      'name': 'MyBank',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/mybank.svg'
+      }
+    },
+    {
+      'id': 'paypal',
+      'name': 'PayPal',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/paypal.svg'
+      }
+    },
+    {
+      'id': 'trustly',
+      'name': 'Trustly',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/trustly.svg'
+      }
+    },
+    {
+      'id': 'visa',
+      'name': 'Visa',
+      'abstract': '<p>You can use your Visa credit card. The 3DS authentication procedure will be used when the order is concluded, and you will be redirected to the bank\'s web page. To complete the order, follow the required steps.</p>',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/visa.svg'
+      }
+    },
+    {
+      'id': 'wechatpay',
+      'name': 'WeChat Pay',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/wechatpay.svg'
+      }
+    },
+    {
+      'id': 'wire-transfer',
+      'name': 'Wire Transfer',
+      'abstract': '<p>The order confirmation will contain a summary of the total amount to be paid and the details of the bank to which the payment is to be made..</p><p> Once the payment has been made, the order will be activated and the delivery terms indicated for the various items ordered will apply. The successful completion of the payment will be communicated by email to the email address indicated during registration.</p>',
+      'media': {
+        'type': 'image',
+        'src': '/assets/payment/wire-transfer.svg'
+      }
+    }
+  ];
+}
+
+// update
+export async function updateCheckout(checkout: ICheckoutPartial, action: string, market: string, locale: string): Promise<ICheckoutPartial> {
+  // generic checkout update
+  /*
+  switch (action) {
+    case 'basket':
+      break;
+    case 'info':
+      break;
+    case 'delivery':
+      break;
+    case 'store':
+      break;
+    case 'discount':
+      break;
+    case 'payment':
+      break;
+  }
+  */
+  // recalculate price
+  const subTotal = checkout.items ? checkout.items.reduce((p, c) => {
+    return p + c.price * c.qty;
+  }, 0) : 0;
+  const subTotalFull = checkout.items ? checkout.items.reduce((p, c) => {
+    return p + c.fullPrice * c.qty;
+  }, 0) : 0;
+  const subTotalDiscountPrice = checkout.discounts ? checkout.discounts.reduce((p, c) => {
+    let value = 0;
+    switch (c.id) {
+      case 'coupon10':
+        value = subTotal * 0.1 * -1;
+        c.price = value;
+        break;
+      case 'coupon50':
+        value = subTotal * 0.5 * -1;
+        c.price = value;
+        break;
+    }
+    return p + value;
+  }, 0) : 0;
+  const deliveryPrice = checkout.delivery?.price || 0;
+  const afterTaxesDiscountPrice = checkout.discounts ? checkout.discounts.reduce((p, c) => {
+    let value = 0;
+    switch (c.id) {
+      case 'shipping':
+        value = deliveryPrice * -1;
+        c.price = value;
+        break;
+    }
+    return p + value;
+  }, 0) : 0;
+  // const totalDiscountPrice = subTotalDiscountPrice + afterTaxesDiscountPrice;
+  const taxes = (subTotal + subTotalDiscountPrice) * 0.2;
+  const total = subTotal + subTotalDiscountPrice + taxes + deliveryPrice + afterTaxesDiscountPrice;
+  checkout.subTotal = subTotal;
+  checkout.subTotalFull = subTotalFull;
+  checkout.taxes = taxes;
+  checkout.total = total;
+  return checkout;
+}
+
+// discounts
+export async function setDiscountCode(discountCode: string, checkout: ICheckoutPartial, market: string, locale: string): Promise<ICheckoutPartial> {
+  const discounts = []; // checkout.discounts || [];
+  if (discountCode === 'shipping') {
+    discounts.push({
+      'id': 'shipping',
+      'name': 'shipping',
+      'abstract': 'Free shipping',
+      'price': (checkout.delivery?.price || 0) * -1,
+      'validFrom': new Date(),
+      'validTo': new Date(),
+    });
+  }
+  if (discountCode === 'coupon10') {
+    discounts.push({
+      'id': 'coupon10',
+      'name': 'coupon10',
+      'abstract': '10%',
+      'price': (checkout.items?.reduce((p, c) => p + c.price * c.qty * 0.1, 0) || 0) * -1,
+      'validFrom': new Date(),
+      'validTo': new Date(),
+    });
+  }
+  if (discountCode === 'coupon50') {
+    discounts.push({
+      'id': 'coupon50',
+      'name': 'coupon50',
+      'abstract': '50%',
+      'price': (checkout.items?.reduce((p, c) => p + c.price * c.qty * 0.5, 0) || 0) * -1,
+      'validFrom': new Date(),
+      'validTo': new Date(),
+    });
+  }
+  return await updateCheckout({ ...checkout, discounts }, 'discount', market, locale);
+}
+
+// payment
+export async function getPayment(checkout: ICheckoutPartial, market: string, locale: string): Promise<{ redirectUrl: string }> {
+  const knownRoutes = await getRoutesForSchemas(['checkout_result'], market, locale);
+  // !!! todo return payment redirectUrl
+  const redirectUrl = `${knownRoutes.checkout_result}?orderId=1&status=OK`;
+  return { redirectUrl };
+}

package/src/checkout/checkout.ts

@@ -0,0 +1,64 @@
+import { IMedia, IOption } from '@websolutespa/bom-core';
+import { ICartItem } from '../cart/cart';
+import { ICompanyAddress, IUser, IUserAddress } from '../user/user';
+
+export type ICheckout = {
+  items: ICheckoutItem[];
+  user?: Partial<IUser>;
+  shippingAddress: IUserAddress;
+  hasInvoice?: boolean;
+  hasBilling?: boolean;
+  billingAddress?: IUserAddress;
+  delivery: ICheckoutDelivery;
+  store: ICheckoutStore;
+  discounts: ICheckoutDiscount[];
+  payment: ICheckoutPayment;
+  subTotal: number;
+  subTotalFull: number;
+  taxes: number;
+  total: number;
+};
+
+export type ICheckoutPartial = Partial<ICheckout>;
+
+export type ICheckoutItem = ICartItem & {
+  fullPrice: number;
+};
+
+export type ICheckoutInfo = {
+  user?: Partial<IUser>;
+  shippingAddress: IUserAddress;
+  hasInvoice?: boolean;
+  hasBilling?: boolean;
+  billingAddress?: IUserAddress;
+};
+
+export type ICheckoutDelivery = IOption & {
+  abstract: string;
+  price: number;
+  fullPrice: number;
+};
+
+export type ICheckoutStore = Partial<ICompanyAddress> & IOption & {
+  category?: IOption;
+  timetable?: string[];
+  position?: {
+    latitude: number;
+    longitude: number;
+  };
+  distance?: number;
+  rank?: number;
+};
+
+export type ICheckoutDiscount = IOption & {
+  abstract?: string;
+  price: number;
+  validFrom: Date | string;
+  validTo: Date | string;
+};
+
+export type ICheckoutPayment = IOption & {
+  abstract?: string;
+  media?: IMedia;
+};
+

package/src/country/country.service.ts

@@ -0,0 +1,9 @@
+import { INamedEntity } from '@websolutespa/bom-core';
+import { getStore } from '@websolutespa/bom-mixer-store';
+import { IModelStore } from '../store/store';
+
+export async function getCountries(locale?: string): Promise<INamedEntity[]> {
+  const store = await getStore<IModelStore>();
+  const items = await store.i18n_country.findMany({ locale });
+  return items;
+}

package/src/feature_type/feature_type.service.ts

@@ -0,0 +1,10 @@
+import { QueryParams } from '@websolutespa/bom-core';
+import { getStore } from '@websolutespa/bom-mixer-store';
+import { IModelStore } from '../store/store';
+import { IFeatureType } from './feature_type';
+
+export async function getFeatureTypes(params: QueryParams = {}): Promise<IFeatureType[]> {
+  const store = await getStore<IModelStore>();
+  const items = await store.feature_type.findMany(params);
+  return items;
+}

package/src/feature_type/feature_type.ts

@@ -0,0 +1,13 @@
+import { IEquatable } from '@websolutespa/bom-core';
+
+export type IFeatureType = {
+  id: string;
+  schema?: string;
+  title: string;
+  mode: string;
+  features?: {
+    id: IEquatable;
+    title: string;
+    [key: string]: unknown;
+  }[];
+};

package/src/index.ts

@@ -0,0 +1,27 @@
+export * from './cart/cart';
+export * from './category/category.service';
+export * from './checkout/checkout';
+export * from './checkout/checkout.service';
+export * from './country/country.service';
+export * from './feature_type/feature_type';
+export * from './feature_type/feature_type.service';
+export * from './label/label.service';
+export * from './layout/layout.service';
+export * from './lazy/lazy';
+export * from './link/link';
+export * from './list/list';
+export * from './list/list.service';
+export * from './locale/locale.service';
+export * from './market/market.service';
+export * from './menu/menu.service';
+export * from './order/order';
+export * from './order/order.service';
+export * from './page/page.service';
+export * from './province/province.service';
+export * from './region/region.service';
+export * from './route/route-revalidate.handler';
+export * from './route/route.interceptor';
+export * from './route/route.service';
+export * from './store/store';
+export * from './user/user';
+

package/src/label/label.service.ts

@@ -0,0 +1,23 @@
+import { ILabel, QueryParams } from '@websolutespa/bom-core';
+import { getStore } from '@websolutespa/bom-mixer-store';
+import { IModelStore } from '../store/store';
+
+export async function getLabels(params: QueryParams = {}): Promise<ILabel[]> {
+  const store = await getStore<IModelStore>();
+  const items = await store.label.findMany(params);
+  return items;
+}
+
+export function resolveLabel(labels: ILabel[], id: string): string {
+  const label = labels.find(x => x.id === id);
+  return label && label.text ? label.text.toString() : id;
+}
+
+/*
+export function localizedLabel(labels: Label[], id: string, locale: string = 'en', defaultLocale: string = 'en'): Promise<Label> {
+  const label = labels.find(x => x.id === id);
+  if (label) {
+    return store.localizeValue(label, locale, defaultLocale);
+  }
+}
+*/