@unchainedshop/api 2.9.4 → 2.10.1

package/lib/resolvers/mutations/utils/getOrderCart.js

@@ -1,18 +1,13 @@
-import { OrderNotFoundError, OrderWrongStatusError } from '../../../errors.js';
+import { OrderNotFoundError } from '../../../errors.js';
 export const getOrderCart = async (params, context) => {
-    const { countryContext, modules, services } = context;
+    const { modules, services } = context;
     const { orderId, user } = params;
     if (orderId) {
         const order = await modules.orders.findOrder({ orderId });
         if (!order)
             throw new OrderNotFoundError({ orderId });
-        if (!modules.orders.isCart(order))
-            throw new OrderWrongStatusError({ status: order.status });
         return order;
     }
-    const cart = await modules.orders.cart({ countryContext }, user);
-    if (cart)
-        return cart;
-    return services.orders.createUserCart({ user, countryCode: context.countryContext }, context);
+    return services.orders.nextUserCart({ user, countryCode: context.countryContext, forceCartCreation: true }, context);
 };
 //# sourceMappingURL=getOrderCart.js.map

package/lib/resolvers/mutations/utils/getOrderCart.js.map

@@ -1 +1 @@
-{"version":3,"file":"getOrderCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/utils/getOrderCart.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAwC,EAAE,OAAgB,EAAE,EAAE;IAC/F,MAAM,EAAE,cAAc,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtD,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAEtD,IAAI,CAAC,OAAO,CAAC,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC;YAAE,MAAM,IAAI,qBAAqB,CAAC,EAAE,MAAM,EAAE,KAAK,CAAC,MAAM,EAAE,CAAC,CAAC;QAC7F,OAAO,KAAK,CAAC;IACf,CAAC;IAED,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,EAAE,IAAI,CAAC,CAAC;IACjE,IAAI,IAAI;QAAE,OAAO,IAAI,CAAC;IAEtB,OAAO,QAAQ,CAAC,MAAM,CAAC,cAAc,CAAC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,EAAE,OAAO,CAAC,CAAC;AAChG,CAAC,CAAC"}
+{"version":3,"file":"getOrderCart.js","sourceRoot":"","sources":["../../../../src/resolvers/mutations/utils/getOrderCart.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,kBAAkB,EAAE,MAAM,oBAAoB,CAAC;AAExD,MAAM,CAAC,MAAM,YAAY,GAAG,KAAK,EAAE,MAAwC,EAAE,OAAgB,EAAE,EAAE;IAC/F,MAAM,EAAE,OAAO,EAAE,QAAQ,EAAE,GAAG,OAAO,CAAC;IACtC,MAAM,EAAE,OAAO,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAEjC,IAAI,OAAO,EAAE,CAAC;QACZ,MAAM,KAAK,GAAG,MAAM,OAAO,CAAC,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QAC1D,IAAI,CAAC,KAAK;YAAE,MAAM,IAAI,kBAAkB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;QACtD,OAAO,KAAK,CAAC;IACf,CAAC;IAED,OAAO,QAAQ,CAAC,MAAM,CAAC,YAAY,CACjC,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,CAAC,cAAc,EAAE,iBAAiB,EAAE,IAAI,EAAE,EACtE,OAAO,CACR,CAAC;AACJ,CAAC,CAAC"}

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

@@ -58,17 +58,21 @@ export const User = {
     async cart(user, params, context) {
         const { modules, countryContext } = context;
         await checkAction(context, viewUserOrders, [user, params]);
-        return modules.orders.cart({ countryContext, orderNumber: params.orderNumber }, user);
+        return modules.orders.cart({
+            countryContext: countryContext || user.lastLogin?.countryCode,
+            orderNumber: params.orderNumber,
+            userId: user._id,
+        });
     },
     async tokens(user, params, context) {
         await checkAction(context, viewUserPrivateInfos, [user, params]);
         return context.modules.warehousing.findTokensForUser(user);
     },
-    country: async (user, params, context) => {
+    async country(user, params, context) {
         await checkAction(context, viewUserPrivateInfos, [user, params]);
         return context.services.users.getUserCountry(user, context);
     },
-    enrollments: async (user, params, context) => {
+    async enrollments(user, params, context) {
         await checkAction(context, viewUserEnrollments, [user, params]);
         return context.modules.enrollments.findEnrollments({
             ...(params || {}),

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

@@ -1 +1 @@
-{"version":3,"file":"user-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"AAqBA,OAAO,EAAE,KAAK,EAAE,WAAW,EAAE,MAAM,sBAAsB,CAAC;AAE1D,OAAO,EAAE,WAAW,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAC9D,OAAO,EAAE,OAAO,EAAE,MAAM,sBAAsB,CAAC;AAwE/C,MAAM,EACJ,oBAAoB,EACpB,mBAAmB,EACnB,cAAc,EACd,mBAAmB,EACnB,kBAAkB,EAClB,sBAAsB,GACvB,GAAG,OAAiC,CAAC;AAEtC,MAAM,eAAe,GAAG,CAAC,IAAc,EAAE,EAAE;IACzC,OAAO,CAAC,IAAI,CAAC,MAAM,IAAI,EAAE,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,EAAE,KAAK,EAAE,EAAE,CAAC,MAAM,CAAC,KAAK,CAAC,QAAQ,CAAC,GAAG,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;AACxG,CAAC,CAAC;AAEF,MAAM,CAAC,MAAM,IAAI,GAAoB;IACnC,GAAG,EAAE,iBAAiB,CAAC,mBAAmB,EAAE,KAAK,CAAC;IAClD,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,MAAM,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,QAAQ,CAAC;IACzD,kBAAkB,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,oBAAoB,CAAC;IACjF,WAAW,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,aAAa,CAAC;IACnE,SAAS,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,WAAW,CAAC;IAC/D,OAAO,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,SAAS,CAAC;IAC3D,KAAK,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,OAAO,CAAC;IACvD,IAAI,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,MAAM,CAAC;IACrD,QAAQ,EAAE,iBAAiB,CAAC,oBAAoB,EAAE,UAAU,CAAC;IAE7D,IAAI,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACpC,MAAM,WAAW,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAEhE,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;QACzB,IAAI,OAAO,IAAI,OAAO,CAAC,WAAW,IAAI,OAAO,CAAC,WAAW,KAAK,EAAE;YAAE,OAAO,OAAO,CAAC,WAAW,CAAC;QAE7F,MAAM,YAAY,GAAG,eAAe,CAAC,IAAI,CAAC,CAAC;QAC3C,OAAO,YAAY,EAAE,OAAO,IAAI,IAAI,CAAC,GAAG,CAAC;IAC3C,CAAC;IAED,YAAY,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC5C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,eAAe,CAAC,IAAI,CAAC,CAAC;IAC/B,CAAC;IAED,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACjD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,MAAM,EAAE,QAAQ,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QAC/E,OAAO,IAAI,CAAC,eAAe,IAAI,CAAC,CAAC,OAAO,CAAC;IAC3C,CAAC;IACD,kBAAkB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,MAAM,EAAE,YAAY,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,EAAE,EAAE,GAAG,IAAI,CAAC,QAAQ,IAAI,EAAE,CAAC;QACjF,OAAO,CAAC,CAAC,MAAM,CAAC;IAClB,CAAC;IACD,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACvC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC;IACtB,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtC,MAAM,WAAW,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAChE,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,OAAO,OAAO,CAAC,UAAU,CAAC,IAAI,CAAC;YAC7B,MAAM,EAAE,IAAI,CAAC,QAAQ;SACtB,CAAC,CAAC;IACL,CAAC;IAED,SAAS,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACzC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,SAAS,CAAC,qBAAqB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC;IACnE,CAAC;IAED,KAAK,CAAC,IAAI,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QAC9B,MAAM,EAAE,OAAO,EAAE,cAAc,EAAE,GAAG,OAAO,CAAC;QAC5C,MAAM,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,MAAM,CAAC,IAAI,CAAC,EAAE,cAAc,EAAE,WAAW,EAAE,MAAM,CAAC,WAAW,EAAE,EAAE,IAAI,CAAC,CAAC;IACxF,CAAC;IAED,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QAChC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,iBAAiB,CAAC,IAAI,CAAC,CAAC;IAC7D,CAAC;IAED,OAAO,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACvC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,cAAc,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC9D,CAAC;IAED,WAAW,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC3C,MAAM,WAAW,CAAC,OAAO,EAAE,mBAAmB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAChE,OAAO,OAAO,CAAC,OAAO,CAAC,WAAW,CAAC,eAAe,CAAC;YACjD,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IAED,QAAQ,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACxC,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,QAAQ,CAAC,KAAK,CAAC,eAAe,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;IAC/D,CAAC;IAED,cAAc,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC9C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAEjE,MAAM,SAAS,GAAG,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,GAAG,EAAE,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;QAClE,OAAO,WAAW,CAAC,SAAS,EAAE,OAAO,CAAC,KAAK,CAAsB,CAAC;IACpE,CAAC;IAED,MAAM,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACtC,MAAM,WAAW,CAAC,OAAO,EAAE,cAAc,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC3D,OAAO,OAAO,CAAC,OAAO,CAAC,MAAM,CAAC,UAAU,CAAC;YACvC,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IAED,kBAAkB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAClD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,OAAO,CAAC,OAAO,CAAC,OAAO,CAAC,kBAAkB,CAAC,sBAAsB,CACtE,EAAE,GAAG,MAAM,CAAC,QAAQ,EAAE,MAAM,EAAE,IAAI,CAAC,GAAG,EAAE,EACxC;YACE,IAAI,EAAE;gBACJ,OAAO,EAAE,CAAC,CAAC;aACZ;SACF,CACF,CAAC;IACJ,CAAC;IAED,mBAAmB,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QACnD,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,QAAQ,EAAE,QAAQ,IAAI,EAAE,CAAC;IACvC,CAAC;IAED,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,IAAI,CAAC,QAAQ,EAAE,IAAI,IAAI,EAAE,CAAC;IACnC,CAAC;IACD,UAAU,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC1C,MAAM,WAAW,CAAC,OAAO,EAAE,kBAAkB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QAC/D,OAAO,OAAO,CAAC,OAAO,CAAC,UAAU,CAAC,cAAc,CAAC;YAC/C,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,MAAM,EAAE,IAAI,CAAC,GAAG;SACjB,CAAC,CAAC;IACL,CAAC;IACD,iBAAiB,EAAE,KAAK,EAAE,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,EAAE;QAC5C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,CAAC,CAAC,CAAC;QACzD,OAAO,CAAC,IAAI,EAAE,iBAAiB,IAAI,EAAE,CAAC,CAAC,GAAG,CAAC,CAAC,EAAE,IAAI,EAAE,SAAS,EAAE,cAAc,EAAE,QAAQ,EAAE,EAAE,EAAE,CAAC,CAAC;YAC7F,GAAG,EAAE,IAAI,CAAC,MAAM;YAChB,SAAS;YACT,cAAc;YACd,QAAQ;SACT,CAAC,CAAC,CAAC;IACN,CAAC;IACD,aAAa,EAAE,KAAK,EAAE,IAAI,EAAE,MAAM,EAAE,OAAO,EAAE,EAAE;QAC7C,MAAM,WAAW,CAAC,OAAO,EAAE,oBAAoB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACjE,OAAO,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,QAAQ,EAAE,KAAK,IAAI,EAAE,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,QAAQ,EAAE,QAAQ,CAAC,EAAE,EAAE;YACjF,OAAQ,QAAgB,CAAC,GAAG,CAAC,CAAC,YAAY,EAAE,EAAE,CAAC,CAAC;gBAC9C,QAAQ;gBACR,GAAI,YAAoB;aACzB,CAAC,CAAC,CAAC;QACN,CAAC,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QACjC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,WAAW,CAAC,OAAO,EAAE,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,kBAAkB,CAAC;YACjD,GAAG,CAAC,MAAM,IAAI,EAAE,CAAC;YACjB,QAAQ,EAAE,IAAI,CAAC,GAAG;SACnB,CAAC,CAAC;IACL,CAAC;IACD,KAAK,CAAC,YAAY,CAAC,IAAI,EAAE,MAAM,EAAE,OAAO;QACtC,MAAM,EAAE,OAAO,EAAE,GAAG,OAAO,CAAC;QAC5B,MAAM,WAAW,CAAC,OAAO,EAAE,sBAAsB,EAAE,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,CAAC;QACnE,OAAO,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,KAAK,CAAC;YACpC,QAAQ,EAAE,IAAI,CAAC,GAAG;SACnB,CAAC,CAAC;IACL,CAAC;CACF,CAAC"}
+{"version":3,"file":"user-types.js","sourceRoot":"","sources":["../../../src/resolvers/type/user-types.ts"],"names":[],"mappings":"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"}

package/lib/schema/mutation.js

@@ -193,7 +193,7 @@ export default [
       Process the checkout (automatically charge & deliver if possible), the cart will get
       transformed to an ordinary order if everything goes well.
       """
-      checkoutCart(orderId: ID, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      checkoutCart(orderId: ID, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Change the quantity or configuration of an item in an open order.align-baselineAll
@@ -304,12 +304,12 @@ export default [
       """
       Manually confirm an order which is in progress
       """
-      confirmOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      confirmOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually reject an order which is in progress
       """
-      rejectOrder(orderId: ID!, orderContext: JSON, paymentContext: JSON, deliveryContext: JSON): Order!
+      rejectOrder(orderId: ID!, paymentContext: JSON, deliveryContext: JSON): Order!
 
       """
       Manually mark an unpaid/partially paid order as fully paid

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@unchainedshop/api",
-  "version": "2.9.4",
+  "version": "2.10.1",
   "main": "lib/api-index.js",
   "exports": {
     ".": "./lib/api-index.js",
@@ -48,11 +48,11 @@
   },
   "dependencies": {
     "@metamask/eth-sig-util": "^7.0.2",
-    "@unchainedshop/core": "^2.9.4",
-    "@unchainedshop/events": "^2.9.4",
-    "@unchainedshop/logger": "^2.9.4",
-    "@unchainedshop/roles": "^2.9.4",
-    "@unchainedshop/utils": "^2.9.4",
+    "@unchainedshop/core": "^2.10.1",
+    "@unchainedshop/events": "^2.10.1",
+    "@unchainedshop/logger": "^2.10.1",
+    "@unchainedshop/roles": "^2.10.1",
+    "@unchainedshop/utils": "^2.10.1",
     "accounting": "0.4.1",
     "dataloader": "^2.2.2",
     "graphql-scalars": "^1.23.0",
@@ -64,8 +64,8 @@
   "devDependencies": {
     "@types/graphql-upload": "^16.0.7",
     "@types/locale": "^0.1.4",
-    "@types/node": "^20.12.13",
-    "@unchainedshop/types": "^2.9.4",
+    "@types/node": "^20.14.1",
+    "@unchainedshop/types": "^2.10.1",
     "express": "^4.19.2",
     "jest": "^29.7.0",
     "ts-jest": "^29.1.4",

package/src/loaders/index.ts

@@ -38,236 +38,274 @@ const loaders = async (
   unchainedAPI: UnchainedCore,
 ): Promise<UnchainedLoaders['loaders']> => {
   return {
-    assortmentLoader: new DataLoader(async (queries) => {
-      const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
-
-      const assortments = await unchainedAPI.modules.assortments.findAssortments({
-        assortmentIds,
-        includeInactive: true,
-        includeLeaves: true,
-      });
-
-      return queries.map(({ assortmentId }) => {
-        return assortments.find((assortment) => {
-          if (assortment._id !== assortmentId) return false;
-          return true;
-        });
-      });
-    }),
+    assortmentLoader: new DataLoader(
+      async (queries) => {
+        const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
 
-    assortmentTextLoader: new DataLoader(async (queries) => {
-      const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+        const assortments = await unchainedAPI.modules.assortments.findAssortments({
+          assortmentIds,
+          includeInactive: true,
+          includeLeaves: true,
+        });
 
-      const texts = await unchainedAPI.modules.assortments.texts.findTexts(
-        { assortmentId: { $in: assortmentIds } },
-        {
-          sort: {
-            assortmentId: 1,
+        return queries.map(({ assortmentId }) => {
+          return assortments.find((assortment) => {
+            if (assortment._id !== assortmentId) return false;
+            return true;
+          });
+        });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    assortmentTextLoader: new DataLoader(
+      async (queries) => {
+        const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
+
+        const texts = await unchainedAPI.modules.assortments.texts.findTexts(
+          { assortmentId: { $in: assortmentIds } },
+          {
+            sort: {
+              assortmentId: 1,
+            },
           },
-        },
-      );
-
-      const filterFn =
-        ({ assortmentId }) =>
-        (text) =>
-          text.assortmentId === assortmentId;
-
-      return getFilteredQueries({ queries, texts, filterFn });
-    }),
-
-    assortmentMediaTextLoader: new DataLoader(async (queries) => {
-      const assortmentMediaIds = [...new Set(queries.map((q) => q.assortmentMediaId).filter(Boolean))];
-
-      const texts = await unchainedAPI.modules.assortments.media.texts.findMediaTexts(
-        { assortmentMediaId: { $in: assortmentMediaIds } },
-        {
-          sort: {
-            assortmentMediaId: 1,
+        );
+
+        const filterFn =
+          ({ assortmentId }) =>
+          (text) =>
+            text.assortmentId === assortmentId;
+
+        return getFilteredQueries({ queries, texts, filterFn });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    assortmentMediaTextLoader: new DataLoader(
+      async (queries) => {
+        const assortmentMediaIds = [...new Set(queries.map((q) => q.assortmentMediaId).filter(Boolean))];
+
+        const texts = await unchainedAPI.modules.assortments.media.texts.findMediaTexts(
+          { assortmentMediaId: { $in: assortmentMediaIds } },
+          {
+            sort: {
+              assortmentMediaId: 1,
+            },
           },
-        },
-      );
+        );
 
-      const filterFn =
-        ({ assortmentMediaId }) =>
-        (text) =>
-          text.assortmentMediaId === assortmentMediaId;
+        const filterFn =
+          ({ assortmentMediaId }) =>
+          (text) =>
+            text.assortmentMediaId === assortmentMediaId;
 
-      return getFilteredQueries({ queries, texts, filterFn });
-    }),
+        return getFilteredQueries({ queries, texts, filterFn });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
 
-    assortmentLinkLoader: new DataLoader(async (queries) => {
-      const parentAssortmentIds = [...new Set(queries.map((q) => q.parentAssortmentId).filter(Boolean))];
+    assortmentLinkLoader: new DataLoader(
+      async (queries) => {
+        const parentAssortmentIds = [
+          ...new Set(queries.map((q) => q.parentAssortmentId).filter(Boolean)),
+        ];
 
-      const links = await unchainedAPI.modules.assortments.links.findLinks({
-        parentAssortmentIds,
-      });
+        const links = await unchainedAPI.modules.assortments.links.findLinks({
+          parentAssortmentIds,
+        });
 
-      return queries.map(({ parentAssortmentId, childAssortmentId }) => {
-        return links.find((link) => {
-          if (link.parentAssortmentId !== parentAssortmentId) return false;
-          if (childAssortmentId && link.childAssortmentId !== childAssortmentId) return false;
-          return true;
+        return queries.map(({ parentAssortmentId, childAssortmentId }) => {
+          return links.find((link) => {
+            if (link.parentAssortmentId !== parentAssortmentId) return false;
+            if (childAssortmentId && link.childAssortmentId !== childAssortmentId) return false;
+            return true;
+          });
         });
-      });
-    }),
-
-    assortmentLinksLoader: new DataLoader(async (queries) => {
-      const parentAssortmentIds = [
-        ...new Set(queries.flatMap((q) => q.parentAssortmentId).filter(Boolean)),
-      ];
-      const assortmentIds = [...new Set(queries.flatMap((q) => q.assortmentId).filter(Boolean))];
-
-      const linksByParentAssortmentId =
-        parentAssortmentIds?.length &&
-        (await unchainedAPI.modules.assortments.links.findLinks({
-          parentAssortmentIds,
-        }));
-      const linksByAssortmentId =
-        assortmentIds?.length &&
-        (await unchainedAPI.modules.assortments.links.findLinks({
-          assortmentIds,
-        }));
-
-      return queries.map(({ parentAssortmentId, assortmentId }) => {
-        if (parentAssortmentId) {
-          return linksByParentAssortmentId.filter(
-            (link) => link.parentAssortmentId === parentAssortmentId,
-          );
-        }
-        if (assortmentId) {
-          return linksByAssortmentId.filter(
-            (link) =>
-              link.parentAssortmentId === assortmentId || link.childAssortmentId === assortmentId,
-          );
-        }
-        return [];
-      });
-    }),
-
-    assortmentProductLoader: new DataLoader(async (queries) => {
-      const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
-
-      const assortmentProducts = await unchainedAPI.modules.assortments.products.findProducts({
-        assortmentIds,
-      });
-
-      return queries.map(({ assortmentId, productId }) => {
-        return assortmentProducts.find((assortmentProduct) => {
-          if (assortmentProduct.assortmentId !== assortmentId) return false;
-          if (assortmentProduct.productId !== productId) return false;
-          return true;
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    assortmentLinksLoader: new DataLoader(
+      async (queries) => {
+        const parentAssortmentIds = [
+          ...new Set(queries.flatMap((q) => q.parentAssortmentId).filter(Boolean)),
+        ];
+        const assortmentIds = [...new Set(queries.flatMap((q) => q.assortmentId).filter(Boolean))];
+
+        const linksByParentAssortmentId =
+          parentAssortmentIds?.length &&
+          (await unchainedAPI.modules.assortments.links.findLinks({
+            parentAssortmentIds,
+          }));
+        const linksByAssortmentId =
+          assortmentIds?.length &&
+          (await unchainedAPI.modules.assortments.links.findLinks({
+            assortmentIds,
+          }));
+
+        return queries.map(({ parentAssortmentId, assortmentId }) => {
+          if (parentAssortmentId) {
+            return linksByParentAssortmentId.filter(
+              (link) => link.parentAssortmentId === parentAssortmentId,
+            );
+          }
+          if (assortmentId) {
+            return linksByAssortmentId.filter(
+              (link) =>
+                link.parentAssortmentId === assortmentId || link.childAssortmentId === assortmentId,
+            );
+          }
+          return [];
         });
-      });
-    }),
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
 
-    filterLoader: new DataLoader(async (queries) => {
-      const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
+    assortmentProductLoader: new DataLoader(
+      async (queries) => {
+        const assortmentIds = [...new Set(queries.map((q) => q.assortmentId).filter(Boolean))];
 
-      const filters = await unchainedAPI.modules.filters.findFilters({
-        filterIds,
-        includeInactive: true,
-      });
+        const assortmentProducts = await unchainedAPI.modules.assortments.products.findProducts({
+          assortmentIds,
+        });
 
-      return queries.map(({ filterId }) => {
-        return filters.find((product) => {
-          if (product._id !== filterId) return false;
-          return true;
+        return queries.map(({ assortmentId, productId }) => {
+          return assortmentProducts.find((assortmentProduct) => {
+            if (assortmentProduct.assortmentId !== assortmentId) return false;
+            if (assortmentProduct.productId !== productId) return false;
+            return true;
+          });
         });
-      });
-    }),
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
 
-    filterTextLoader: new DataLoader(async (queries) => {
-      const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
+    filterLoader: new DataLoader(
+      async (queries) => {
+        const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
 
-      const texts = await unchainedAPI.modules.filters.texts.findTexts(
-        { filterId: { $in: filterIds } },
-        {
-          sort: {
-            filterId: 1,
-          },
-        },
-      );
-
-      const filterFn =
-        ({ filterId, filterOptionValue }) =>
-        (text) =>
-          text.filterId === filterId && text.filterOptionValue === filterOptionValue;
-
-      return getFilteredQueries({ queries, texts, filterFn });
-    }),
-
-    productLoader: new DataLoader(async (queries) => {
-      const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))]; // you don't need lodash, _.unique my ass
-
-      const products = await unchainedAPI.modules.products.findProducts({
-        productIds,
-        productSelector: {
-          status: { $in: [null, ProductStatus.ACTIVE, ProductStatus.DELETED] },
-        },
-      });
-
-      return queries.map(({ productId }) => {
-        return products.find((product) => {
-          if (product._id !== productId) return false;
-          return true;
+        const filters = await unchainedAPI.modules.filters.findFilters({
+          filterIds,
+          includeInactive: true,
         });
-      });
-    }),
-
-    productTextLoader: new DataLoader(async (queries) => {
-      const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
 
-      const texts = await unchainedAPI.modules.products.texts.findTexts(
-        { productId: { $in: productIds } },
-        {
-          sort: {
-            productId: 1,
+        return queries.map(({ filterId }) => {
+          return filters.find((product) => {
+            if (product._id !== filterId) return false;
+            return true;
+          });
+        });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    filterTextLoader: new DataLoader(
+      async (queries) => {
+        const filterIds = [...new Set(queries.map((q) => q.filterId).filter(Boolean))];
+
+        const texts = await unchainedAPI.modules.filters.texts.findTexts(
+          { filterId: { $in: filterIds } },
+          {
+            sort: {
+              filterId: 1,
+            },
           },
-        },
-      );
-
-      const filterFn =
-        ({ productId }) =>
-        (text) =>
-          text.productId === productId;
-
-      return getFilteredQueries({ queries, texts, filterFn });
-    }),
-
-    productMediaTextLoader: new DataLoader(async (queries) => {
-      const productMediaIds = [...new Set(queries.map((q) => q.productMediaId).filter(Boolean))];
+        );
+
+        const filterFn =
+          ({ filterId, filterOptionValue }) =>
+          (text) =>
+            text.filterId === filterId && text.filterOptionValue === filterOptionValue;
+
+        return getFilteredQueries({ queries, texts, filterFn });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    productLoader: new DataLoader(
+      async (queries) => {
+        const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))]; // you don't need lodash, _.unique my ass
+
+        const products = await unchainedAPI.modules.products.findProducts({
+          productIds,
+          productSelector: {
+            status: { $in: [null, ProductStatus.ACTIVE, ProductStatus.DELETED] },
+          },
+        });
 
-      const texts = await unchainedAPI.modules.products.media.texts.findMediaTexts(
-        { productMediaId: { $in: productMediaIds } },
-        {
-          sort: {
-            productMediaId: 1,
+        return queries.map(({ productId }) => {
+          return products.find((product) => {
+            if (product._id !== productId) return false;
+            return true;
+          });
+        });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    productTextLoader: new DataLoader(
+      async (queries) => {
+        const productIds = [...new Set(queries.map((q) => q.productId).filter(Boolean))];
+
+        const texts = await unchainedAPI.modules.products.texts.findTexts(
+          { productId: { $in: productIds } },
+          {
+            sort: {
+              productId: 1,
+            },
+          },
+        );
+
+        const filterFn =
+          ({ productId }) =>
+          (text) =>
+            text.productId === productId;
+
+        return getFilteredQueries({ queries, texts, filterFn });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
+
+    productMediaTextLoader: new DataLoader(
+      async (queries) => {
+        const productMediaIds = [...new Set(queries.map((q) => q.productMediaId).filter(Boolean))];
+
+        const texts = await unchainedAPI.modules.products.media.texts.findMediaTexts(
+          { productMediaId: { $in: productMediaIds } },
+          {
+            sort: {
+              productMediaId: 1,
+            },
           },
-        },
-      );
+        );
 
-      const filterFn =
-        ({ productMediaId }) =>
-        (text) =>
-          text.productMediaId === productMediaId;
+        const filterFn =
+          ({ productMediaId }) =>
+          (text) =>
+            text.productMediaId === productMediaId;
 
-      return getFilteredQueries({ queries, texts, filterFn });
-    }),
+        return getFilteredQueries({ queries, texts, filterFn });
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
 
-    fileLoader: new DataLoader(async (queries) => {
-      const fileIds = [...new Set(queries.map((q) => q.fileId).filter(Boolean))]; // you don't need lodash, _.unique my ass
+    fileLoader: new DataLoader(
+      async (queries) => {
+        const fileIds = [...new Set(queries.map((q) => q.fileId).filter(Boolean))]; // you don't need lodash, _.unique my ass
 
-      const files = await unchainedAPI.modules.files.findFiles({
-        _id: { $in: fileIds },
-      });
+        const files = await unchainedAPI.modules.files.findFiles({
+          _id: { $in: fileIds },
+        });
 
-      return queries.map(({ fileId }) => {
-        return files.find((file) => {
-          if (file._id !== fileId) return false;
-          return true;
+        return queries.map(({ fileId }) => {
+          return files.find((file) => {
+            if (file._id !== fileId) return false;
+            return true;
+          });
         });
-      });
-    }),
+      },
+      { batchScheduleFn: (cb) => setImmediate(cb) },
+    ),
   };
 };
 

package/src/resolvers/mutations/orders/addCartDiscount.ts

@@ -1,6 +1,7 @@
 import { Context, Root } from '@unchainedshop/types/api.js';
 import { log } from '@unchainedshop/logger';
 import { getOrderCart } from '../utils/getOrderCart.js';
+import { OrderWrongStatusError } from '../../../errors.js';
 
 export default async function addCartDiscount(
   root: Root,
@@ -11,7 +12,9 @@ export default async function addCartDiscount(
 
   log(`mutation addCartDiscount ${code} ${orderId}`, { userId, orderId });
 
-  const cart = await getOrderCart({ orderId, user }, context);
+  const order = await getOrderCart({ orderId, user }, context);
 
-  return modules.orders.discounts.createManualOrderDiscount({ order: cart, code }, context);
+  if (!modules.orders.isCart(order)) throw new OrderWrongStatusError({ status: order.status });
+
+  return modules.orders.discounts.createManualOrderDiscount({ order, code }, context);
 }