@unchainedshop/api 3.0.0-rc7 → 3.0.0-rc9

package/src/resolvers/mutations/countries/updateCountry.ts

@@ -5,7 +5,7 @@ import { Context } from '../../../context.js';
 
 export default async function updateCountry(
   root: never,
-  { country, countryId }: { country: Country & { defaultCurrencyId: string }; countryId: string },
+  { country, countryId }: { country: Country; countryId: string },
   { userId, modules }: Context,
 ) {
   log(`mutation updateCountry ${countryId}`, { userId });
@@ -15,12 +15,7 @@ export default async function updateCountry(
   if (!(await modules.countries.countryExists({ countryId })))
     throw new CountryNotFoundError({ countryId });
 
-  const currencyObject = await modules.currencies.findCurrency({
-    currencyId: country.defaultCurrencyId,
-  });
-  const defaultCurrencyCode = country?.defaultCurrencyCode || currencyObject?.isoCode;
-
-  await modules.countries.update(countryId, { ...country, defaultCurrencyCode });
+  await modules.countries.update(countryId, country);
 
   return modules.countries.findCountry({ countryId });
 }

package/src/resolvers/queries/users/validateResetPasswordToken.ts

@@ -10,7 +10,7 @@ export default async function validateResetPasswordToken(
 
   log('query validateResetPasswordToken', { userId, token: params.token });
 
-  const user = await modules.users.findUserByResetToken(params.token);
+  const resetToken = await modules.users.findResetToken(params.token);
 
-  return !!user;
+  return !!resetToken;
 }

package/src/resolvers/type/delivery-provider-types.ts

@@ -1,7 +1,6 @@
 import { Context } from '../../context.js';
 import { DeliveryProvider as DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { DeliveryDirector, DeliveryError, DeliveryPricingDirector } from '@unchainedshop/core';
-import { sha256 } from '@unchainedshop/utils';
 
 export type HelperType<P, T> = (provider: DeliveryProviderType, params: P, context: Context) => T;
 
@@ -24,7 +23,6 @@ export interface DeliveryProviderHelperTypes {
       context: any;
     },
     Promise<{
-      _id: string;
       amount: number;
       currencyCode: string;
       countryCode: string;
@@ -84,7 +82,6 @@ export const DeliveryProvider: DeliveryProviderHelperTypes = {
     };
 
     return {
-      _id: await sha256([deliveryProvider._id, country, useNetPrice, order ? order._id : ''].join('')),
       amount: orderPrice.amount,
       currencyCode: orderPrice.currency,
       countryCode: country,

package/src/resolvers/type/index.ts

@@ -12,7 +12,6 @@ import { Country } from './country-types.js';
 import { Currency } from './currency-types.js';
 import { DeliveryProvider } from './delivery-provider-types.js';
 import { Dimensions } from './dimensions-types.js';
-import { Dispatch } from './dispatch-types.js';
 import { Enrollment } from './enrollment/enrollment-types.js';
 import { EnrollmentDelivery } from './enrollment/enrollment-delivery-types.js';
 import { EnrollmentPayment } from './enrollment/enrollment-payment-types.js';
@@ -57,7 +56,6 @@ import { Quotation } from './quotation-types.js';
 import { Shop } from './shop-types.js';
 import { SimpleProduct } from './product/product-simple-types.js';
 import { TokenizedProduct } from './product/product-tokenized-types.js';
-import { Stock } from './stock-types.js';
 import { User } from './user-types.js';
 import { WebAuthnCredentials } from './webauthn-credentials-types.js';
 import { WarehousingProvider } from './warehousing-provider-types.js';
@@ -84,7 +82,6 @@ const types = {
   Currency,
   DeliveryProvider,
   Dimensions,
-  Dispatch,
   Enrollment,
   EnrollmentDelivery,
   EnrollmentPayment,
@@ -131,7 +128,6 @@ const types = {
   SimpleProduct,
   TokenizedProduct,
   Token,
-  Stock,
   User,
   WebAuthnCredentials,
   WarehousingProvider,

package/src/resolvers/type/order/order-delivery-discount-types.ts

@@ -1,6 +1,5 @@
 import { Context } from '../../../context.js';
 import { OrderDeliveryDiscount as OrderDeliveryDiscountType } from '@unchainedshop/core-orders';
-import { sha256 } from '@unchainedshop/utils';
 
 export const OrderDeliveryDiscount = {
   _id(obj: OrderDeliveryDiscountType) {
@@ -13,9 +12,8 @@ export const OrderDeliveryDiscount = {
     });
   },
 
-  async total(obj: OrderDeliveryDiscountType) {
+  total(obj: OrderDeliveryDiscountType) {
     return {
-      _id: await sha256([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

package/src/resolvers/type/order/order-global-discount-types.ts

@@ -1,6 +1,6 @@
 import { Order } from '@unchainedshop/core-orders';
 import { Context } from '../../../context.js';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 
 export const OrderGlobalDiscount = {
   _id(
@@ -25,14 +25,13 @@ export const OrderGlobalDiscount = {
     });
   },
 
-  async total(
+  total(
     obj: Price & {
       order: Order;
       discountId: string;
     },
   ) {
     return {
-      _id: await sha256([`${obj.order._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

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

@@ -1,4 +1,3 @@
-import { sha256 } from '@unchainedshop/utils';
 import { Context } from '../../../context.js';
 import { OrderPositionDiscount } from '@unchainedshop/core-orders';
 
@@ -13,9 +12,8 @@ export const OrderItemDiscount = {
     });
   },
 
-  async total(obj: OrderPositionDiscount) {
+  total(obj: OrderPositionDiscount) {
     return {
-      _id: await sha256([`${obj.item._id}:${obj.discountId}`, obj.amount, obj.currency].join('')),
       amount: obj.amount,
       currency: obj.currency,
     };

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

@@ -5,7 +5,7 @@ import { OrderPosition, OrderPositionDiscount } from '@unchainedshop/core-orders
 import { Product } from '@unchainedshop/core-products';
 import { Quotation } from '@unchainedshop/core-quotations';
 import { TokenSurrogate, WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 import { ProductPricingSheet } from '@unchainedshop/core';
 
 const getPricingSheet = async (orderPosition: OrderPosition, context: Context) => {
@@ -120,11 +120,7 @@ export const OrderItem = {
     const pricing = await getPricingSheet(orderPosition, context);
 
     if (pricing.isValid()) {
-      const price = pricing.total(params);
-      return {
-        _id: await sha256([orderPosition._id, JSON.stringify(params), JSON.stringify(price)].join('')),
-        ...price,
-      };
+      return pricing.total(params);
     }
     return null;
   },
@@ -137,11 +133,7 @@ export const OrderItem = {
     const pricing = await getPricingSheet(orderPosition, context);
 
     if (pricing.isValid()) {
-      const price = pricing.unitPrice(params);
-      return {
-        _id: await sha256([`${orderPosition._id}-unit`, price.amount, pricing.currency].join('')),
-        ...price,
-      };
+      return pricing.unitPrice(params);
     }
     return null;
   },

package/src/resolvers/type/order/order-payment-discount-types.ts

@@ -1,6 +1,6 @@
 import { Context } from '../../../context.js';
 import { OrderPayment } from '@unchainedshop/core-orders';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 
 export const OrderPaymentDiscount = {
   _id: (orderDelivery: Price & { discountId: string; item: OrderPayment }) =>
@@ -15,15 +15,8 @@ export const OrderPaymentDiscount = {
       discountId: orderDelivery.discountId,
     }),
 
-  async total(orderDelivery: Price & { discountId: string; item: OrderPayment }) {
+  total(orderDelivery: Price & { discountId: string; item: OrderPayment }) {
     return {
-      _id: await sha256(
-        [
-          `${orderDelivery.item._id}-${orderDelivery.discountId}`,
-          orderDelivery.amount,
-          orderDelivery.currency,
-        ].join(''),
-      ),
       amount: orderDelivery.amount,
       currency: orderDelivery.currency,
     };

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

@@ -11,7 +11,7 @@ import {
   OrderDelivery,
 } from '@unchainedshop/core-orders';
 import { User } from '@unchainedshop/core-users';
-import { Price, sha256 } from '@unchainedshop/utils';
+import { Price } from '@unchainedshop/utils';
 import { OrderPricingSheet } from '@unchainedshop/core';
 
 export const Order = {
@@ -74,18 +74,14 @@ export const Order = {
     return order.status;
   },
 
-  async total(order: OrderType, params: { category: string; useNetPrice: boolean }): Promise<Price> {
+  total(order: OrderType, params: { category: string; useNetPrice: boolean }): Price {
     const pricing = OrderPricingSheet({
       calculation: order.calculation,
       currency: order.currency,
     });
 
     if (pricing.isValid()) {
-      const price = pricing.total(params);
-      return {
-        _id: await sha256([order._id, JSON.stringify(params), JSON.stringify(price)].join('')),
-        ...price,
-      };
+      return pricing.total(params);
     }
     return null;
   },

package/src/resolvers/type/payment/payment-provider-types.ts

@@ -1,7 +1,6 @@
 import { Context } from '../../../context.js';
 import { PaymentProvider as PaymentProviderType } from '@unchainedshop/core-payment';
 import { PaymentDirector, PaymentPricingDirector } from '@unchainedshop/core';
-import { sha256 } from '@unchainedshop/utils';
 
 export const PaymentProvider = {
   interface(provider: PaymentProviderType) {
@@ -53,7 +52,6 @@ export const PaymentProvider = {
     };
 
     return {
-      _id: await sha256([paymentProvider._id, country, useNetPrice, order ? order._id : ''].join('')),
       amount: orderPrice.amount,
       currencyCode: orderPrice.currency,
       countryCode: country,

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

@@ -1,7 +1,6 @@
 import accounting from 'accounting';
 
 type PriceType = {
-  _id?: string;
   isTaxable?: boolean;
   isNetPrice?: boolean;
   countryCode?: string;

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

@@ -7,7 +7,6 @@ import {
 } from '@unchainedshop/core-products';
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
-import { sha256 } from '@unchainedshop/utils';
 
 export const ConfigurableProduct = {
   ...Product,
@@ -127,15 +126,6 @@ export const ConfigurableProduct = {
           const unitPrice = pricing.unitPrice({ useNetPrice });
 
           return {
-            _id: await sha256(
-              [
-                proxyProduct._id,
-                countryContext,
-                quantity,
-                useNetPrice,
-                requestContext.userId || 'ANONYMOUS',
-              ].join(''),
-            ),
             ...unitPrice,
             isNetPrice: useNetPrice,
             isTaxable: pricing.taxSum() > 0,
@@ -152,36 +142,9 @@ export const ConfigurableProduct = {
       prices: filteredPrices,
     });
 
-    const minPriceHash = await sha256(
-      [
-        product._id,
-        minPrice?.isTaxable,
-        minPrice?.isNetPrice,
-        minPrice?.amount,
-        minPrice?.currencyCode,
-      ].join(''),
-    );
-
-    const maxPriceHash = await sha256(
-      [
-        product._id,
-        maxPrice?.isTaxable,
-        maxPrice?.isNetPrice,
-        maxPrice?.amount,
-        maxPrice?.currencyCode,
-      ].join(''),
-    );
-
     return {
-      _id: await sha256([product._id, minPriceHash, maxPriceHash].join('')),
-      minPrice: {
-        _id: minPriceHash,
-        ...minPrice,
-      },
-      maxPrice: {
-        _id: maxPriceHash,
-        ...maxPrice,
-      },
+      minPrice,
+      maxPrice,
     };
   },
 };

package/src/resolvers/type/product/product-discount.ts

@@ -1,6 +1,5 @@
 import { ProductDiscount as ProductDiscountType } from '@unchainedshop/core-products';
 import { ProductDiscountDirector } from '@unchainedshop/core';
-import { sha256 } from '@unchainedshop/utils';
 
 export const ProductDiscount = {
   interface: async (productDiscount: ProductDiscountType) => {
@@ -15,11 +14,10 @@ export const ProductDiscount = {
     };
   },
 
-  async total(productDiscount: ProductDiscountType) {
-    const { total, _id } = productDiscount;
+  total(productDiscount: ProductDiscountType) {
+    const { total } = productDiscount;
     if (productDiscount.total) {
       return {
-        _id: await sha256([`${_id}`, total.amount, total.currency].join('')),
         amount: total.amount,
         currency: total.currency,
       };

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

@@ -5,7 +5,6 @@ import {
 } from '@unchainedshop/core-products';
 import { Context } from '../../../context.js';
 import { Product } from './product-types.js';
-import { sha256 } from '@unchainedshop/utils';
 
 export const PlanProduct = {
   ...Product,
@@ -56,9 +55,6 @@ export const PlanProduct = {
     const unitPrice = pricing.unitPrice({ useNetPrice });
 
     return {
-      _id: await sha256(
-        [obj._id, countryContext, quantity, useNetPrice, user ? user._id : 'ANONYMOUS'].join(''),
-      ),
       ...unitPrice,
       isNetPrice: useNetPrice,
       isTaxable: pricing.taxSum() > 0,

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

@@ -1,5 +1,4 @@
 import { Product, ProductSupply } from '@unchainedshop/core-products';
-import { WarehousingContext, WarehousingDirector } from '@unchainedshop/core';
 import { Context } from '../../../context.js';
 import { DeliveryProviderType } from '@unchainedshop/core-delivery';
 import { DeliveryProvider } from '@unchainedshop/core-delivery';

package/src/schema/inputTypes.ts

@@ -45,7 +45,6 @@ export default [
       isoCode: String!
       isActive: Boolean
       defaultCurrencyCode: String
-      defaultCurrencyId: String @deprecated(reason: "Use defaultCurrencyCode instead")
     }
 
     input CreateCurrencyInput {

package/src/schema/types/dispatch.ts

@@ -1,7 +1,6 @@
 export default [
   /* GraphQL */ `
     type Dispatch {
-      _id: ID!
       deliveryProvider: DeliveryProvider
       warehousingProvider: WarehousingProvider
       shipping: DateTime

package/src/schema/types/price.ts

@@ -1,7 +1,6 @@
 export default [
   /* GraphQL */ `
     type Price @cacheControl(maxAge: 60) {
-      _id: ID!
       isTaxable: Boolean!
       isNetPrice: Boolean!
       amount: Int!
@@ -9,7 +8,6 @@ export default [
     }
 
     type PriceRange @cacheControl(maxAge: 60) {
-      _id: ID!
       minPrice: Price!
       maxPrice: Price!
     }

package/src/schema/types/stock.ts

@@ -1,7 +1,6 @@
 export default [
   /* GraphQL */ `
     type Stock {
-      _id: ID!
       deliveryProvider: DeliveryProvider
       warehousingProvider: WarehousingProvider
       quantity: Int

package/lib/resolvers/type/dispatch-types.d.ts

@@ -1,15 +0,0 @@
-import { DeliveryProvider } from '@unchainedshop/core-delivery';
-import { Product } from '@unchainedshop/core-products';
-import { WarehousingProvider } from '@unchainedshop/core-warehousing';
-export declare const Dispatch: {
-    _id: (params: {
-        product: Product;
-        deliveryProvider: DeliveryProvider;
-        warehousingProvider: WarehousingProvider;
-        referenceDate: Date;
-        quantity: number;
-        country: string;
-        userId?: string;
-    }) => Promise<string>;
-};
-//# sourceMappingURL=dispatch-types.d.ts.map

package/lib/resolvers/type/dispatch-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"dispatch-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/dispatch-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAGtE,eAAO,MAAM,QAAQ;kBACC;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,gBAAgB,EAAE,gBAAgB,CAAC;QACnC,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,aAAa,EAAE,IAAI,CAAC;QACpB,QAAQ,EAAE,MAAM,CAAC;QACjB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;CAYF,CAAC"}

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

@@ -1,13 +0,0 @@
-import { sha256 } from '@unchainedshop/utils';
-export const Dispatch = {
-    _id: async (params) => await sha256([
-        params.product._id,
-        params.deliveryProvider._id,
-        params.warehousingProvider._id,
-        params.referenceDate,
-        params.quantity,
-        params.country,
-        params.userId || 'ANONYMOUS',
-    ].join('')),
-};
-//# sourceMappingURL=dispatch-types.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"dispatch-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/dispatch-types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,CAAC,MAAM,QAAQ,GAAG;IACtB,GAAG,EAAE,KAAK,EAAE,MAQX,EAAE,EAAE,CACH,MAAM,MAAM,CACV;QACE,MAAM,CAAC,OAAO,CAAC,GAAG;QAClB,MAAM,CAAC,gBAAgB,CAAC,GAAG;QAC3B,MAAM,CAAC,mBAAmB,CAAC,GAAG;QAC9B,MAAM,CAAC,aAAa;QACpB,MAAM,CAAC,QAAQ;QACf,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,MAAM,IAAI,WAAW;KAC7B,CAAC,IAAI,CAAC,EAAE,CAAC,CACX;CACJ,CAAC"}

package/lib/resolvers/type/stock-types.d.ts

@@ -1,14 +0,0 @@
-import { DeliveryProvider } from '@unchainedshop/core-delivery';
-import { Product } from '@unchainedshop/core-products';
-import { WarehousingProvider } from '@unchainedshop/core-warehousing';
-export declare const Stock: {
-    _id: (params: {
-        product: Product;
-        deliveryProvider: DeliveryProvider;
-        warehousingProvider: WarehousingProvider;
-        referenceDate: Date;
-        country: string;
-        userId?: string;
-    }) => Promise<string>;
-};
-//# sourceMappingURL=stock-types.d.ts.map

package/lib/resolvers/type/stock-types.d.ts.map

@@ -1 +0,0 @@
-{"version":3,"file":"stock-types.d.ts","sourceRoot":"","sources":["../../../src/resolvers/type/stock-types.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,gBAAgB,EAAE,MAAM,8BAA8B,CAAC;AAChE,OAAO,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AACvD,OAAO,EAAE,mBAAmB,EAAE,MAAM,iCAAiC,CAAC;AAGtE,eAAO,MAAM,KAAK;kBACI;QAClB,OAAO,EAAE,OAAO,CAAC;QACjB,gBAAgB,EAAE,gBAAgB,CAAC;QACnC,mBAAmB,EAAE,mBAAmB,CAAC;QACzC,aAAa,EAAE,IAAI,CAAC;QACpB,OAAO,EAAE,MAAM,CAAC;QAChB,MAAM,CAAC,EAAE,MAAM,CAAC;KACjB;CAWF,CAAC"}

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

@@ -1,12 +0,0 @@
-import { sha256 } from '@unchainedshop/utils';
-export const Stock = {
-    _id: async (params) => await sha256([
-        params.product._id,
-        params.deliveryProvider._id,
-        params.warehousingProvider._id,
-        params.referenceDate,
-        params.country,
-        params.userId || 'ANONYMOUS',
-    ].join('')),
-};
-//# sourceMappingURL=stock-types.js.map

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

@@ -1 +0,0 @@
-{"version":3,"file":"stock-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/stock-types.ts"],"names":[],"mappings":"AAGA,OAAO,EAAE,MAAM,EAAE,MAAM,sBAAsB,CAAC;AAE9C,MAAM,CAAC,MAAM,KAAK,GAAG;IACnB,GAAG,EAAE,KAAK,EAAE,MAOX,EAAE,EAAE,CACH,MAAM,MAAM,CACV;QACE,MAAM,CAAC,OAAO,CAAC,GAAG;QAClB,MAAM,CAAC,gBAAgB,CAAC,GAAG;QAC3B,MAAM,CAAC,mBAAmB,CAAC,GAAG;QAC9B,MAAM,CAAC,aAAa;QACpB,MAAM,CAAC,OAAO;QACd,MAAM,CAAC,MAAM,IAAI,WAAW;KAC7B,CAAC,IAAI,CAAC,EAAE,CAAC,CACX;CACJ,CAAC"}

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

@@ -1,27 +0,0 @@
-import { DeliveryProvider } from '@unchainedshop/core-delivery';
-import { Product } from '@unchainedshop/core-products';
-import { WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { sha256 } from '@unchainedshop/utils';
-
-export const Dispatch = {
-  _id: async (params: {
-    product: Product;
-    deliveryProvider: DeliveryProvider;
-    warehousingProvider: WarehousingProvider;
-    referenceDate: Date;
-    quantity: number;
-    country: string;
-    userId?: string;
-  }) =>
-    await sha256(
-      [
-        params.product._id,
-        params.deliveryProvider._id,
-        params.warehousingProvider._id,
-        params.referenceDate,
-        params.quantity,
-        params.country,
-        params.userId || 'ANONYMOUS',
-      ].join(''),
-    ),
-};

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

@@ -1,25 +0,0 @@
-import { DeliveryProvider } from '@unchainedshop/core-delivery';
-import { Product } from '@unchainedshop/core-products';
-import { WarehousingProvider } from '@unchainedshop/core-warehousing';
-import { sha256 } from '@unchainedshop/utils';
-
-export const Stock = {
-  _id: async (params: {
-    product: Product;
-    deliveryProvider: DeliveryProvider;
-    warehousingProvider: WarehousingProvider;
-    referenceDate: Date;
-    country: string;
-    userId?: string;
-  }) =>
-    await sha256(
-      [
-        params.product._id,
-        params.deliveryProvider._id,
-        params.warehousingProvider._id,
-        params.referenceDate,
-        params.country,
-        params.userId || 'ANONYMOUS',
-      ].join(''),
-    ),
-};