@evershop/evershop 2.1.1 → 2.1.2

package/src/modules/catalog/api/createCategory/createCategory[finish].js

@@ -1,8 +0,0 @@
-import createCategory from '../../services/category/createCategory.js';
-
-export default async (request, response) => {
-  const result = await createCategory(request.body, {
-    routeId: request.currentRoute.id
-  });
-  return result;
-};

package/src/modules/catalog/api/createProduct/createProduct[finish].js

@@ -1,8 +0,0 @@
-import createProduct from '../../services/product/createProduct.js';
-
-export default async (request, response) => {
-  const result = await createProduct(request.body, {
-    routeId: request.currentRoute.id
-  });
-  return result;
-};

package/src/modules/catalog/api/updateCategory/updateCategory[finish].js

@@ -1,8 +0,0 @@
-import updateCategory from '../../services/category/updateCategory.js';
-
-export default async (request, response) => {
-  const category = await updateCategory(request.params.id, request.body, {
-    routeId: request.currentRoute.id
-  });
-  return category;
-};

package/src/modules/catalog/api/updateCollection/updateCollection[finish].js

@@ -1,8 +0,0 @@
-import updateCollection from '../../services/collection/updateCollection.js';
-
-export default async (request, response) => {
-  const collection = await updateCollection(request.params.id, request.body, {
-    routeId: request.currentRoute.id
-  });
-  return collection;
-};

package/src/modules/catalog/api/updateProduct/updateProduct[finish].js

@@ -1,8 +0,0 @@
-import updateProduct from '../../services/product/updateProduct.js';
-
-export default async (request, response) => {
-  const product = await updateProduct(request.params.id, request.body, {
-    routeId: request.currentRoute.id
-  });
-  return product;
-};

package/src/modules/cms/api/createCmsPage/createPage[finish].js

@@ -1,10 +0,0 @@
-import createPage from '../../services/page/createPage.js';
-
-export default async (request, response) => {
-  const data = request.body;
-  const result = await createPage(data, {
-    routeId: request.currentRoute.id
-  });
-
-  return result;
-};

package/src/modules/cms/services/page/deletePage.js

@@ -1,55 +0,0 @@
-import {
-  commit,
-  del,
-  rollback,
-  select,
-  startTransaction
-} from '@evershop/postgres-query-builder';
-import { getConnection } from '../../../../lib/postgres/connection.js';
-import { hookable } from '../../../../lib/util/hookable.js';
-
-async function deletePageData(uuid, connection) {
-  await del('cms_page').where('uuid', '=', uuid).execute(connection);
-}
-/**
- * Delete page service. This service will delete a page with all related data
- * @param {String} uuid
- * @param {Object} context
- */
-async function deletePage(uuid, context) {
-  const connection = await getConnection();
-  await startTransaction(connection);
-  try {
-    const query = select().from('cms_page');
-    query
-      .leftJoin('cms_page_description')
-      .on(
-        'cms_page_description.cms_page_description_cms_page_id',
-        '=',
-        'cms_page.cms_page_id'
-      );
-
-    const page = await query.where('uuid', '=', uuid).load(connection);
-    if (!page) {
-      throw new Error('Invalid page id');
-    }
-    await hookable(deletePageData, { ...context, page, connection })(
-      uuid,
-      connection
-    );
-    await commit(connection);
-    return page;
-  } catch (e) {
-    await rollback(connection);
-    throw e;
-  }
-}
-
-export default async (uuid, context) => {
-  // Make sure the context is either not provided or is an object
-  if (context && typeof context !== 'object') {
-    throw new Error('Context must be an object');
-  }
-  const page = await hookable(deletePage, context)(uuid, context);
-  return page;
-};

package/src/modules/cms/services/widget/createWidget.js

@@ -1,71 +0,0 @@
-import {
-  commit,
-  insert,
-  rollback,
-  startTransaction
-} from '@evershop/postgres-query-builder';
-import { getConnection } from '../../../../lib/postgres/connection.js';
-import { hookable } from '../../../../lib/util/hookable.js';
-import {
-  getValue,
-  getValueSync
-} from '../../../../lib/util/registry.js';
-import { getAjv } from '../../../base/services/getAjv.js';
-import widgetDataSchema from './widgetDataSchema.json' with { type: 'json' };
-
-function validateWidgetDataBeforeInsert(data) {
-  const ajv = getAjv();
-  widgetDataSchema.required = ['status', 'name', 'sort_order'];
-  const jsonSchema = getValueSync(
-    'createWidgetDataJsonSchema',
-    widgetDataSchema
-  );
-  const validate = ajv.compile(jsonSchema);
-  const valid = validate(data);
-  if (valid) {
-    return data;
-  } else {
-    throw new Error(validate.errors[0].message);
-  }
-}
-
-async function insertWidgetData(data, connection) {
-  const widget = await insert('widget').given(data).execute(connection);
-  return widget;
-}
-
-/**
- * Create widget service. This service will create a widget with all related data
- * @param {Object} data
- * @param {Object} context
- */
-async function createWidget(data, context) {
-  const connection = await getConnection();
-  await startTransaction(connection);
-  try {
-    const widgetData = await getValue('widgetDataBeforeCreate', data);
-    // Validate widget data
-    validateWidgetDataBeforeInsert(widgetData);
-
-    // Insert widget data
-    const widget = await hookable(insertWidgetData, { ...context, connection })(
-      widgetData,
-      connection
-    );
-
-    await commit(connection);
-    return widget;
-  } catch (e) {
-    await rollback(connection);
-    throw e;
-  }
-}
-
-export default async (data, context) => {
-  // Make sure the context is either not provided or is an object
-  if (context && typeof context !== 'object') {
-    throw new Error('Context must be an object');
-  }
-  const widget = await hookable(createWidget, context)(data, context);
-  return widget;
-};

package/src/modules/cms/services/widget/deleteWidget.js

@@ -1,47 +0,0 @@
-import {
-  commit,
-  del,
-  rollback,
-  select,
-  startTransaction
-} from '@evershop/postgres-query-builder';
-import { getConnection } from '../../../../lib/postgres/connection.js';
-import { hookable } from '../../../../lib/util/hookable.js';
-
-async function deleteWidgetData(uuid, connection) {
-  await del('widget').where('uuid', '=', uuid).execute(connection);
-}
-/**
- * Delete widget service. This service will delete a widget with all related data
- * @param {String} uuid
- * @param {Object} context
- */
-async function deleteWidget(uuid, context) {
-  const connection = await getConnection();
-  await startTransaction(connection);
-  try {
-    const query = select().from('widget');
-    const widget = await query.where('uuid', '=', uuid).load(connection);
-    if (!widget) {
-      throw new Error('Invalid widget id');
-    }
-    await hookable(deleteWidgetData, { ...context, widget, connection })(
-      uuid,
-      connection
-    );
-    await commit(connection);
-    return widget;
-  } catch (e) {
-    await rollback(connection);
-    throw e;
-  }
-}
-
-export default async (uuid, context) => {
-  // Make sure the context is either not provided or is an object
-  if (context && typeof context !== 'object') {
-    throw new Error('Context must be an object');
-  }
-  const widget = await hookable(deleteWidget, context)(uuid, context);
-  return widget;
-};

package/src/modules/promotion/services/coupon/createCoupon.js

@@ -1,75 +0,0 @@
-import {
-  commit,
-  insert,
-  rollback,
-  startTransaction
-} from '@evershop/postgres-query-builder';
-import { getConnection } from '../../../../lib/postgres/connection.js';
-import { hookable } from '../../../../lib/util/hookable.js';
-import {
-  getValue,
-  getValueSync
-} from '../../../../lib/util/registry.js';
-import { getAjv } from '../../../base/services/getAjv.js';
-import couponDataSchema from './couponDataSchema.json' with { type: 'json' };
-
-function validateCouponDataBeforeInsert(data) {
-  const ajv = getAjv();
-  couponDataSchema.required = [
-    'coupon',
-    'status',
-    'discount_amount',
-    'discount_type'
-  ];
-  const jsonSchema = getValueSync(
-    'createCouponDataJsonSchema',
-    couponDataSchema
-  );
-  const validate = ajv.compile(jsonSchema);
-  const valid = validate(data);
-  if (valid) {
-    return data;
-  } else {
-    throw new Error(validate.errors[0].message);
-  }
-}
-
-async function insertCouponData(data, connection) {
-  const coupon = await insert('coupon').given(data).execute(connection);
-  return coupon;
-}
-
-/**
- * Create coupon service. This service will create a coupon with all related data
- * @param {Object} data
- * @param {Object} context
- */
-async function createCoupon(data, context) {
-  const connection = await getConnection();
-  await startTransaction(connection);
-  try {
-    const couponData = await getValue('couponDataBeforeCreate', data);
-    // Validate coupon data
-    validateCouponDataBeforeInsert(couponData);
-
-    // Insert coupon data
-    const coupon = await hookable(insertCouponData, { ...context, connection })(
-      couponData,
-      connection
-    );
-    await commit(connection);
-    return coupon;
-  } catch (e) {
-    await rollback(connection);
-    throw e;
-  }
-}
-
-export default async (data, context) => {
-  // Make sure the context is either not provided or is an object
-  if (context && typeof context !== 'object') {
-    throw new Error('Context must be an object');
-  }
-  const coupon = await hookable(createCoupon, context)(data, context);
-  return coupon;
-};

package/src/modules/promotion/services/coupon/deleteCoupon.js

@@ -1,49 +0,0 @@
-import {
-  commit,
-  del,
-  rollback,
-  select,
-  startTransaction
-} from '@evershop/postgres-query-builder';
-import { getConnection } from '../../../../lib/postgres/connection.js';
-import { hookable } from '../../../../lib/util/hookable.js';
-
-async function deleteCouponData(uuid, connection) {
-  await del('coupon').where('uuid', '=', uuid).execute(connection);
-}
-
-/**
- * Delete coupon service. This service will delete a coupon with all related data
- * @param {String} uuid
- * @param {Object} context
- */
-async function deleteCoupon(uuid, context) {
-  const connection = await getConnection();
-  await startTransaction(connection);
-  try {
-    const query = select().from('coupon');
-    const coupon = await query.where('uuid', '=', uuid).load(connection);
-
-    if (!coupon) {
-      throw new Error('Invalid coupon id');
-    }
-    await hookable(deleteCouponData, { ...context, coupon, connection })(
-      uuid,
-      connection
-    );
-    await commit(connection);
-    return coupon;
-  } catch (e) {
-    await rollback(connection);
-    throw e;
-  }
-}
-
-export default async (uuid, context) => {
-  // Make sure the context is either not provided or is an object
-  if (context && typeof context !== 'object') {
-    throw new Error('Context must be an object');
-  }
-  const coupon = await hookable(deleteCoupon, context)(uuid, context);
-  return coupon;
-};

package/src/modules/promotion/services/coupon/updateCoupon.js

@@ -1,94 +0,0 @@
-import {
-  commit,
-  rollback,
-  select,
-  startTransaction,
-  update
-} from '@evershop/postgres-query-builder';
-import { getConnection } from '../../../../lib/postgres/connection.js';
-import { hookable } from '../../../../lib/util/hookable.js';
-import {
-  getValue,
-  getValueSync
-} from '../../../../lib/util/registry.js';
-import { getAjv } from '../../../base/services/getAjv.js';
-import couponDataSchema from './couponDataSchema.json' with { type: 'json' };
-
-function validateCouponDataBeforeInsert(data) {
-  const ajv = getAjv();
-  couponDataSchema.required = [];
-  const jsonSchema = getValueSync(
-    'updateCouponDataJsonSchema',
-    couponDataSchema
-  );
-  const validate = ajv.compile(jsonSchema);
-  const valid = validate(data);
-  if (valid) {
-    return data;
-  } else {
-    throw new Error(validate.errors[0].message);
-  }
-}
-
-async function updateCouponData(uuid, data, connection) {
-  const coupon = await select()
-    .from('coupon')
-    .where('uuid', '=', uuid)
-    .load(connection);
-
-  if (!coupon) {
-    throw new Error('Requested coupon not found');
-  }
-
-  try {
-    const newCoupon = await update('coupon')
-      .given(data)
-      .where('uuid', '=', uuid)
-      .execute(connection);
-
-    return newCoupon;
-  } catch (e) {
-    if (!e.message.includes('No data was provided')) {
-      throw e;
-    } else {
-      return coupon;
-    }
-  }
-}
-
-/**
- * Update coupon service. This service will update a coupon with all related data
- * @param {Object} data
- * @param {Object} context
- */
-async function updateCoupon(uuid, data, context) {
-  const connection = await getConnection();
-  await startTransaction(connection);
-  try {
-    const couponData = await getValue('couponDataBeforeUpdate', data);
-    // Validate coupon data
-    validateCouponDataBeforeInsert(couponData);
-
-    // Insert coupon data
-    const coupon = await hookable(updateCouponData, { ...context, connection })(
-      uuid,
-      couponData,
-      connection
-    );
-
-    await commit(connection);
-    return coupon;
-  } catch (e) {
-    await rollback(connection);
-    throw e;
-  }
-}
-
-export default async (uuid, data, context) => {
-  // Make sure the context is either not provided or is an object
-  if (context && typeof context !== 'object') {
-    throw new Error('Context must be an object');
-  }
-  const coupon = await hookable(updateCoupon, context)(uuid, data, context);
-  return coupon;
-};

package/src/types/request.d.ts

@@ -1,7 +0,0 @@
-import { Request as ExpressRequest } from 'express';
-import { Route } from './route.js';
-export interface EvershopRequest extends ExpressRequest {
-  isAdmin?: boolean;
-  session?: any;
-  currentRoute?: Route;
-}