@unchainedshop/api 4.2.2 → 4.3.1

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

@@ -19,11 +19,25 @@ export const Price = {
   },
   amount(obj: PriceType) {
     if (obj.amount) {
-      return Number(obj.amount).toLocaleString(undefined, {
-        minimumFractionDigits: 0,
-        maximumFractionDigits: 0,
-        useGrouping: false,
-      });
+      /* 
+      Why toFixed(0) Is Actually Reliable
+      For integer rounding specifically:
+
+      Half-values are exact: Numbers like 0.5, 1.5, 2.5 can be represented exactly in binary floating-point (they're powers of 2), so they round correctly.
+      Floating-point errors are tiny: Even with calculation errors, they're usually on the order of 0.0000000001, which won't affect rounding to the nearest integer.
+      Integer boundaries are far apart: Unlike toFixed(2) where the difference between 1.004 and 1.005 matters, for toFixed(0) you need errors approaching 0.5 to cause problems.
+
+      Theoretical Edge Cases
+      The only cases where toFixed(0) might fail would be:
+      javascript// Extremely contrived calculation that should equal exactly 0.5
+      // but might be 0.49999999999999994 (would round to 0 instead of 1)
+
+      // Very large numbers where precision is lost entirely
+      (9007199254740992.5).toFixed(0)  // Might have issues past MAX_SAFE_INTEGER
+
+      // But in practice, these are incredibly rare
+      */
+      return Math.round(obj.amount).toFixed(0);
     }
     return 0;
   },

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

@@ -17,9 +17,8 @@ export interface ProductVariationAssignmentVectorHelperTypes {
 export const ProductVariationAssignmentVector: ProductVariationAssignmentVectorHelperTypes = {
   _id: ({ product, key, value }) => `${product._id}:${key}=${value}`,
 
-  option: async (obj, _, { modules }) => {
-    // TODO: use product variation loader
-    const productVariation = await modules.products.variations.findProductVariationByKey({
+  option: async (obj, _, { loaders }) => {
+    const productVariation = await loaders.productVariationByKeyLoader.load({
       productId: obj.product._id,
       key: obj.key,
     });
@@ -32,9 +31,8 @@ export const ProductVariationAssignmentVector: ProductVariationAssignmentVectorH
     };
   },
 
-  variation: (obj, _, { modules }) => {
-    // TODO: use product variation loader
-    return modules.products.variations.findProductVariationByKey({
+  variation: (obj, _, { loaders }) => {
+    return loaders.productVariationByKeyLoader.load({
       productId: obj?.product?._id,
       key: obj?.key,
     });

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

@@ -20,9 +20,8 @@ export const ProductVariationOption: ProductVariationOptionHelperTypes = {
     return obj.productVariationOption;
   },
 
-  texts: async (obj, { forceLocale }, { modules, locale }) => {
-    // TODO: use variation text loader
-    return modules.products.variations.texts.findLocalizedVariationText({
+  texts: async (obj, { forceLocale }, { loaders, locale }) => {
+    return loaders.productVariationTextLoader.load({
       productVariationId: obj._id,
       productVariationOptionValue: obj.productVariationOption,
       locale: forceLocale ? new Intl.Locale(forceLocale) : locale,

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

@@ -28,9 +28,8 @@ export const ProductVariation: ProductVariationHelperTypes = {
     }));
   },
 
-  texts: async (obj, { forceLocale }, { modules, locale }) => {
-    // TODO: use variation text loader
-    return modules.products.variations.texts.findLocalizedVariationText({
+  texts: async (obj, { forceLocale }, { loaders, locale }) => {
+    return loaders.productVariationTextLoader.load({
       productVariationId: obj._id,
       locale: forceLocale ? new Intl.Locale(forceLocale) : locale,
     });

package/src/schema/types/delivery.ts

@@ -25,7 +25,44 @@ export default [
       WRONG_CREDENTIALS
     }
 
-    type DeliveryProvider @cacheControl(maxAge: 60) {
+    interface DeliveryProvider {
+      _id: ID!
+      created: DateTime
+      updated: DateTime
+      deleted: DateTime
+      type: DeliveryProviderType
+      interface: DeliveryInterface
+      configuration: JSON
+      configurationError: DeliveryProviderError
+      isActive: Boolean
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        orderId: ID
+        context: JSON
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
+    }
+
+    type DeliveryProviderPickUp implements DeliveryProvider @cacheControl(maxAge: 60) {
+      _id: ID!
+      created: DateTime
+      updated: DateTime
+      deleted: DateTime
+      type: DeliveryProviderType
+      interface: DeliveryInterface
+      configuration: JSON
+      configurationError: DeliveryProviderError
+      isActive: Boolean
+      simulatedPrice(
+        currencyCode: String
+        useNetPrice: Boolean = false
+        orderId: ID
+        context: JSON
+      ): Price @cacheControl(scope: PRIVATE, maxAge: 10)
+      pickUpLocations: [PickUpLocation!]!
+    }
+
+    type DeliveryProviderShipping implements DeliveryProvider @cacheControl(maxAge: 60) {
       _id: ID!
       created: DateTime
       updated: DateTime

package/src/schema/types/order/delivery.ts

@@ -33,8 +33,9 @@ export default [
       delivered: DateTime
       fee: Price
       discounts: [OrderDeliveryDiscount!]
-      pickUpLocations: [OrderPickUpLocation!]!
-      activePickUpLocation: OrderPickUpLocation
+      pickUpLocations: [PickUpLocation!]!
+        @deprecated(reason: "Use DeliveryProvider.pickupLocations instead")
+      activePickUpLocation: PickUpLocation
     }
 
     type OrderDeliveryShipping implements OrderDelivery {

package/src/schema/types/order/pick-up-location.ts

@@ -1,8 +1,7 @@
 export default [
   /* GraphQL */ `
-    type OrderPickUpLocation {
+    type PickUpLocation {
       _id: ID!
-      order: Order!
       name: String!
       address: Address
       geoPoint: GeoPosition