refactor: move shipping and surcharges from server/no-meteor to node-app

imports/plugins/core/shipping/server/no-meteor/register.js → imports/node-app/core-services/shipping/index.js

@@ -1,8 +1,8 @@
-import i18n from "./i18n";
-import mutations from "./mutations";
-import queries from "./queries";
-import resolvers from "./resolvers";
-import schemas from "./schemas";
+import i18n from "./i18n/index.js";
+import mutations from "./mutations/index.js";
+import queries from "./queries/index.js";
+import resolvers from "./resolvers/index.js";
+import schemas from "./schemas/index.js";
 
 /**
  * @summary Import and call this function to add this plugin to your API.

imports/plugins/core/shipping/server/no-meteor/mutations/index.js → imports/node-app/core-services/shipping/mutations/index.js

@@ -1,5 +1,5 @@
-import selectFulfillmentOptionForGroup from "./selectFulfillmentOptionForGroup";
-import updateFulfillmentOptionsForGroup from "./updateFulfillmentOptionsForGroup";
+import selectFulfillmentOptionForGroup from "./selectFulfillmentOptionForGroup.js";
+import updateFulfillmentOptionsForGroup from "./updateFulfillmentOptionsForGroup.js";
 
 export default {
   selectFulfillmentOptionForGroup,

imports/plugins/core/shipping/server/no-meteor/mutations/selectFulfillmentOptionForGroup.js → imports/node-app/core-services/shipping/mutations/selectFulfillmentOptionForGroup.js

@@ -1,6 +1,6 @@
 import SimpleSchema from "simpl-schema";
 import ReactionError from "@reactioncommerce/reaction-error";
-import getCartById from "../util/getCartById";
+import getCartById from "../util/getCartById.js";
 
 const inputSchema = new SimpleSchema({
   cartId: String,

imports/plugins/core/shipping/server/no-meteor/mutations/selectFulfillmentOptionForGroup.test.js → imports/node-app/core-services/shipping/mutations/selectFulfillmentOptionForGroup.test.js

@@ -1,5 +1,5 @@
-import mockContext from "/imports/test-utils/helpers/mockContext";
-import selectFulfillmentOptionForGroup from "./selectFulfillmentOptionForGroup";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import selectFulfillmentOptionForGroup from "./selectFulfillmentOptionForGroup.js";
 
 jest.mock("../util/getCartById", () => jest.fn().mockImplementation(() => Promise.resolve({
   _id: "cartId",

imports/plugins/core/shipping/server/no-meteor/mutations/updateFulfillmentOptionsForGroup.js → imports/node-app/core-services/shipping/mutations/updateFulfillmentOptionsForGroup.js

@@ -1,8 +1,7 @@
 import { isEqual } from "lodash";
 import SimpleSchema from "simpl-schema";
 import ReactionError from "@reactioncommerce/reaction-error";
-import xformCartGroupToCommonOrder from "/imports/plugins/core/cart/server/no-meteor/util/xformCartGroupToCommonOrder";
-import getCartById from "../util/getCartById";
+import getCartById from "../util/getCartById.js";
 
 const inputSchema = new SimpleSchema({
   cartId: String,
@@ -71,7 +70,7 @@ export default async function updateFulfillmentOptionsForGroup(context, input) {
   const fulfillmentGroup = (cart.shipping || []).find((group) => group._id === fulfillmentGroupId);
   if (!fulfillmentGroup) throw new ReactionError("not-found", `Fulfillment group with ID ${fulfillmentGroupId} not found in cart with ID ${cartId}`);
 
-  const commonOrder = await xformCartGroupToCommonOrder(cart, fulfillmentGroup, context);
+  const commonOrder = await context.queries.getCommonOrderForCartGroup(context, { cartId: cart._id, fulfillmentGroupId: fulfillmentGroup._id });
 
   // In the future we want to do this async and subscribe to the results
   const rates = await context.queries.getFulfillmentMethodsWithQuotes(commonOrder, context);

imports/plugins/core/shipping/server/no-meteor/mutations/updateFulfillmentOptionsForGroup.test.js → imports/node-app/core-services/shipping/mutations/updateFulfillmentOptionsForGroup.test.js

@@ -1,6 +1,6 @@
-import Factory from "/imports/test-utils/helpers/factory";
-import mockContext from "/imports/test-utils/helpers/mockContext";
-import updateFulfillmentOptionsForGroup from "./updateFulfillmentOptionsForGroup";
+import Factory from "/imports/test-utils/helpers/factory.js";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import updateFulfillmentOptionsForGroup from "./updateFulfillmentOptionsForGroup.js";
 
 jest.mock("../util/getCartById", () => jest.fn().mockImplementation(() => Promise.resolve({
   _id: "cartId",
@@ -26,10 +26,12 @@ jest.mock("../util/getCartById", () => jest.fn().mockImplementation(() => Promis
 const fakeCart = Factory.Cart.makeOne();
 const fakeQuote = Factory.ShipmentQuote.makeOne();
 const mockGetFulfillmentMethodsWithQuotes = jest.fn().mockName("getFulfillmentMethodsWithQuotes");
+const mockGetCommonOrderForCartGroup = jest.fn().mockName("getCommonOrderForCartGroup");
 
 beforeAll(() => {
   mockContext.queries = {
-    getFulfillmentMethodsWithQuotes: mockGetFulfillmentMethodsWithQuotes
+    getFulfillmentMethodsWithQuotes: mockGetFulfillmentMethodsWithQuotes,
+    getCommonOrderForCartGroup: mockGetCommonOrderForCartGroup
   };
   if (!mockContext.mutations.saveCart) {
     mockContext.mutations.saveCart = jest.fn().mockName("context.mutations.saveCart").mockImplementation(async (_, cart) => cart);

imports/plugins/core/shipping/server/no-meteor/queries/getFulfillmentMethodsWithQuotes.js → imports/node-app/core-services/shipping/queries/getFulfillmentMethodsWithQuotes.js

@@ -1,5 +1,5 @@
 import Logger from "@reactioncommerce/logger";
-import extendCommonOrder from "../util/extendCommonOrder";
+import extendCommonOrder from "../util/extendCommonOrder.js";
 
 /**
  * @name getFulfillmentMethodsWithQuotes

imports/plugins/core/shipping/server/no-meteor/queries/index.js → imports/node-app/core-services/shipping/queries/index.js

@@ -1,4 +1,4 @@
-import getFulfillmentMethodsWithQuotes from "./getFulfillmentMethodsWithQuotes";
+import getFulfillmentMethodsWithQuotes from "./getFulfillmentMethodsWithQuotes.js";
 
 export default {
   getFulfillmentMethodsWithQuotes

imports/plugins/core/shipping/server/no-meteor/resolvers/Mutation/index.js → imports/node-app/core-services/shipping/resolvers/Mutation/index.js

@@ -1,5 +1,5 @@
-import selectFulfillmentOptionForGroup from "./selectFulfillmentOptionForGroup";
-import updateFulfillmentOptionsForGroup from "./updateFulfillmentOptionsForGroup";
+import selectFulfillmentOptionForGroup from "./selectFulfillmentOptionForGroup.js";
+import updateFulfillmentOptionsForGroup from "./updateFulfillmentOptionsForGroup.js";
 
 export default {
   selectFulfillmentOptionForGroup,

imports/plugins/core/shipping/server/no-meteor/resolvers/Mutation/selectFulfillmentOptionForGroup.js → imports/node-app/core-services/shipping/resolvers/Mutation/selectFulfillmentOptionForGroup.js

@@ -1,6 +1,6 @@
 import { decodeCartOpaqueId, decodeFulfillmentGroupOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/cart";
 import { decodeFulfillmentMethodOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/fulfillment";
-import selectFulfillmentOptionForGroupMutation from "../../mutations/selectFulfillmentOptionForGroup";
+import selectFulfillmentOptionForGroupMutation from "../../mutations/selectFulfillmentOptionForGroup.js";
 
 /**
  * @name Mutation/selectFulfillmentOptionForGroup

imports/plugins/core/shipping/server/no-meteor/resolvers/Mutation/updateFulfillmentOptionsForGroup.js → imports/node-app/core-services/shipping/resolvers/Mutation/updateFulfillmentOptionsForGroup.js

@@ -1,5 +1,5 @@
 import { decodeCartOpaqueId, decodeFulfillmentGroupOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/cart";
-import updateFulfillmentOptionsForGroupMutation from "../../mutations/updateFulfillmentOptionsForGroup";
+import updateFulfillmentOptionsForGroupMutation from "../../mutations/updateFulfillmentOptionsForGroup.js";
 
 /**
  * @name Mutation/updateFulfillmentOptionsForGroup

imports/plugins/core/shipping/server/no-meteor/resolvers/index.js → imports/node-app/core-services/shipping/resolvers/index.js

@@ -1,5 +1,5 @@
-import FulfillmentMethod from "./FulfillmentMethod";
-import Mutation from "./Mutation";
+import FulfillmentMethod from "./FulfillmentMethod/index.js";
+import Mutation from "./Mutation/index.js";
 
 /**
  * Fulfillment related GraphQL resolvers

imports/plugins/core/shipping/server/no-meteor/util/getCartById.js → imports/node-app/core-services/shipping/util/getCartById.js

@@ -1,5 +1,5 @@
 import ReactionError from "@reactioncommerce/reaction-error";
-import hashLoginToken from "/imports/node-app/core/util/hashLoginToken";
+import hashLoginToken from "../../../core/util/hashLoginToken";
 
 /**
  * @summary Gets a cart from the db by ID. If there is an account for the request, verifies that the

imports/node-app/core/util/buildContext.test.js

@@ -1,4 +1,4 @@
-import mockContext from "/imports/test-utils/helpers/mockContext";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
 import buildContext from "./buildContext";
 
 const fakeUser = {

imports/plugins/included/surcharges/server/no-meteor/getSurcharges.js → imports/node-app/plugins/surcharges/getSurcharges.js

@@ -1,6 +1,6 @@
 import Random from "@reactioncommerce/random";
-import extendCommonOrder from "/imports/plugins/core/shipping/server/no-meteor/util/extendCommonOrder";
-import { surchargeCheck } from "./util/surchargeCheck";
+import extendCommonOrder from "/imports/node-app/core-services/shipping/util/extendCommonOrder"; // TODO: remove cross-plugin import (https://github.com/reactioncommerce/reaction/issues/5633)
+import { surchargeCheck } from "./util/surchargeCheck.js";
 
 
 /**

imports/plugins/included/surcharges/server/no-meteor/register.js → imports/node-app/plugins/surcharges/index.js

@@ -1,9 +1,9 @@
-import getSurcharges from "./getSurcharges";
-import mutations from "./mutations";
-import queries from "./queries";
-import resolvers from "./resolvers";
-import schemas from "./schemas";
-import setSurchargesOnCart from "./util/setSurchargesOnCart";
+import getSurcharges from "./getSurcharges.js";
+import mutations from "./mutations/index.js";
+import queries from "./queries/index.js";
+import resolvers from "./resolvers/index.js";
+import schemas from "./schemas/index.js";
+import setSurchargesOnCart from "./util/setSurchargesOnCart.js";
 
 /**
  * @summary Import and call this function to add this plugin to your API.

imports/plugins/included/surcharges/server/no-meteor/mutations/createSurcharge.js → imports/node-app/plugins/surcharges/mutations/createSurcharge.js

@@ -1,7 +1,7 @@
 import SimpleSchema from "simpl-schema";
 import Random from "@reactioncommerce/random";
 import ReactionError from "@reactioncommerce/reaction-error";
-import surchargeSchema from "../util/surchargeSchema";
+import surchargeSchema from "../util/surchargeSchema.js";
 
 const inputSchema = new SimpleSchema({
   surcharge: surchargeSchema,

imports/plugins/included/surcharges/server/no-meteor/mutations/createSurcharge.test.js → imports/node-app/plugins/surcharges/mutations/createSurcharge.test.js

@@ -1,5 +1,6 @@
-import mockContext, { mockCollection } from "/imports/test-utils/helpers/mockContext";
-import createSurchargeMutation from "./createSurcharge";
+import mockCollection from "@reactioncommerce/api-utils/tests/mockCollection.js";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import createSurchargeMutation from "./createSurcharge.js";
 
 
 // Create mock context with Surcharges collection

imports/plugins/included/surcharges/server/no-meteor/mutations/deleteSurcharge.test.js → imports/node-app/plugins/surcharges/mutations/deleteSurcharge.test.js

@@ -1,5 +1,6 @@
-import mockContext, { mockCollection } from "/imports/test-utils/helpers/mockContext";
-import deleteSurchargeMutation from "./deleteSurcharge";
+import mockCollection from "@reactioncommerce/api-utils/tests/mockCollection.js";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import deleteSurchargeMutation from "./deleteSurcharge.js";
 
 
 // Create mock context with Surcharges collection

imports/node-app/plugins/surcharges/mutations/index.js

@@ -0,0 +1,9 @@
+import createSurcharge from "./createSurcharge.js";
+import deleteSurcharge from "./deleteSurcharge.js";
+import updateSurcharge from "./updateSurcharge.js";
+
+export default {
+  createSurcharge,
+  deleteSurcharge,
+  updateSurcharge
+};

imports/plugins/included/surcharges/server/no-meteor/mutations/updateSurcharge.js → imports/node-app/plugins/surcharges/mutations/updateSurcharge.js

@@ -1,6 +1,6 @@
 import SimpleSchema from "simpl-schema";
 import ReactionError from "@reactioncommerce/reaction-error";
-import surchargeSchema from "../util/surchargeSchema";
+import surchargeSchema from "../util/surchargeSchema.js";
 
 const inputSchema = new SimpleSchema({
   shopId: String,

imports/plugins/included/surcharges/server/no-meteor/mutations/updateSurcharge.test.js → imports/node-app/plugins/surcharges/mutations/updateSurcharge.test.js

@@ -1,5 +1,6 @@
-import mockContext, { mockCollection } from "/imports/test-utils/helpers/mockContext";
-import updateSurchargeMutation from "./updateSurcharge";
+import mockCollection from "@reactioncommerce/api-utils/tests/mockCollection.js";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import updateSurchargeMutation from "./updateSurcharge.js";
 
 
 // Create mock context with Surcharges collection

imports/node-app/plugins/surcharges/queries/index.js

@@ -0,0 +1,7 @@
+import surchargeById from "./surchargeById.js";
+import surcharges from "./surcharges.js";
+
+export default {
+  surchargeById,
+  surcharges
+};

imports/plugins/included/surcharges/server/no-meteor/resolvers/AppliedSurcharge/index.js → imports/node-app/plugins/surcharges/resolvers/AppliedSurcharge/index.js

@@ -1,6 +1,6 @@
-import { encodeSurchargeOpaqueId } from "../../xforms/surcharge";
-import xformSurchargeAmount from "../../xforms/xformSurchargeAmount";
-import getSurchargeMessageForLanguage from "../../util/getSurchargeMessageForLanguage";
+import { encodeSurchargeOpaqueId } from "../../xforms/surcharge.js";
+import xformSurchargeAmount from "../../xforms/xformSurchargeAmount.js";
+import getSurchargeMessageForLanguage from "../../util/getSurchargeMessageForLanguage.js";
 
 export default {
   _id: (node) => encodeSurchargeOpaqueId(node._id),

imports/plugins/included/surcharges/server/no-meteor/resolvers/Mutation/createSurcharge.js → imports/node-app/plugins/surcharges/resolvers/Mutation/createSurcharge.js

@@ -1,6 +1,6 @@
 import { decodeFulfillmentMethodOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/fulfillment";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import createSurchargeMutation from "../../mutations/createSurcharge";
+import createSurchargeMutation from "../../mutations/createSurcharge.js";
 
 /**
  * @name Mutation/createSurcharge

imports/plugins/included/surcharges/server/no-meteor/resolvers/Mutation/deleteSurcharge.js → imports/node-app/plugins/surcharges/resolvers/Mutation/deleteSurcharge.js

@@ -1,6 +1,6 @@
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import { decodeSurchargeOpaqueId } from "../../xforms/surcharge";
-import deleteSurchargeMutation from "../../mutations/deleteSurcharge";
+import { decodeSurchargeOpaqueId } from "../../xforms/surcharge.js";
+import deleteSurchargeMutation from "../../mutations/deleteSurcharge.js";
 
 /**
  * @name Mutation/deleteSurcharge

imports/node-app/plugins/surcharges/resolvers/Mutation/index.js

@@ -0,0 +1,9 @@
+import createSurcharge from "./createSurcharge.js";
+import deleteSurcharge from "./deleteSurcharge.js";
+import updateSurcharge from "./updateSurcharge.js";
+
+export default {
+  createSurcharge,
+  deleteSurcharge,
+  updateSurcharge
+};

imports/plugins/included/surcharges/server/no-meteor/resolvers/Mutation/updateSurcharge.js → imports/node-app/plugins/surcharges/resolvers/Mutation/updateSurcharge.js

@@ -1,7 +1,7 @@
 import { decodeFulfillmentMethodOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/fulfillment";
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import { decodeSurchargeOpaqueId } from "../../xforms/surcharge";
-import updateSurchargeMutation from "../../mutations/updateSurcharge";
+import { decodeSurchargeOpaqueId } from "../../xforms/surcharge.js";
+import updateSurchargeMutation from "../../mutations/updateSurcharge.js";
 
 /**
  * @name Mutation/updateSurcharge

imports/node-app/plugins/surcharges/resolvers/Query/index.js

@@ -0,0 +1,7 @@
+import surchargeById from "./surchargeById.js";
+import surcharges from "./surcharges.js";
+
+export default {
+  surchargeById,
+  surcharges
+};

imports/plugins/included/surcharges/server/no-meteor/resolvers/Query/surchargeById.js → imports/node-app/plugins/surcharges/resolvers/Query/surchargeById.js

@@ -1,5 +1,5 @@
 import { decodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import { decodeSurchargeOpaqueId } from "../../xforms/surcharge";
+import { decodeSurchargeOpaqueId } from "../../xforms/surcharge.js";
 
 /**
  * @name Query/surchargeById

imports/plugins/included/surcharges/server/no-meteor/resolvers/Surcharge/index.js → imports/node-app/plugins/surcharges/resolvers/Surcharge/index.js

@@ -1,8 +1,8 @@
 import { encodeFulfillmentMethodOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/fulfillment";
 import { encodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
-import { encodeSurchargeOpaqueId } from "../../xforms/surcharge";
-import xformSurchargeAmount from "../../xforms/xformSurchargeAmount";
-import getSurchargeMessageForLanguage from "../../util/getSurchargeMessageForLanguage";
+import { encodeSurchargeOpaqueId } from "../../xforms/surcharge.js";
+import xformSurchargeAmount from "../../xforms/xformSurchargeAmount.js";
+import getSurchargeMessageForLanguage from "../../util/getSurchargeMessageForLanguage.js";
 
 export default {
   _id: (node) => encodeSurchargeOpaqueId(node._id),

imports/plugins/included/surcharges/server/no-meteor/resolvers/index.js → imports/node-app/plugins/surcharges/resolvers/index.js

@@ -1,8 +1,8 @@
 import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
-import AppliedSurcharge from "./AppliedSurcharge";
-import Surcharge from "./Surcharge";
-import Mutation from "./Mutation";
-import Query from "./Query";
+import AppliedSurcharge from "./AppliedSurcharge/index.js";
+import Surcharge from "./Surcharge/index.js";
+import Mutation from "./Mutation/index.js";
+import Query from "./Query/index.js";
 
 export default {
   ...getConnectionTypeResolvers("Surcharge"),

imports/plugins/included/surcharges/server/no-meteor/util/setSurchargesOnCart.js → imports/node-app/plugins/surcharges/util/setSurchargesOnCart.js

@@ -1,4 +1,4 @@
-import getSurcharges from "../getSurcharges";
+import getSurcharges from "../getSurcharges.js";
 
 /**
  * @summary Cart transformation function that sets surcharges on cart

imports/plugins/included/surcharges/server/no-meteor/util/surchargeCheck.js → imports/node-app/plugins/surcharges/util/surchargeCheck.js

@@ -1,5 +1,5 @@
-import operators from "/imports/utils/operators";
-import propertyTypes from "/imports/utils/propertyTypes";
+import operators from "@reactioncommerce/api-utils/operators.js";
+import propertyTypes from "@reactioncommerce/api-utils/propertyTypes.js";
 
 /**
  * @summary Filter surcharges based on surcharge restriction data

imports/plugins/included/surcharges/server/no-meteor/util/surchargeCheck.test.js → imports/node-app/plugins/surcharges/util/surchargeCheck.test.js

@@ -1,5 +1,6 @@
-import { surchargeCheck } from "./surchargeCheck";
-import mockContext, { mockCollection } from "/imports/test-utils/helpers/mockContext";
+import mockCollection from "@reactioncommerce/api-utils/tests/mockCollection.js";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import { surchargeCheck } from "./surchargeCheck.js";
 
 // Create mock context with Surcharges collection
 mockContext.collections.Surcharges = mockCollection("Surcharges");

imports/node-app/registerPlugins.js

@@ -1,9 +1,11 @@
 /* node-app imports */
 /* core-services */
 import registerSettingsPlugin from "./core-services/settings/index.js";
+import registerShippingPlugin from "./core-services/shipping/index.js";
 
 /* plugins */
 import registerAddressPlugin from "./plugins/address/index.js";
+import registerSurchargesPlugin from "./plugins/surcharges/index.js";
 import registerSystemInfoPlugin from "./plugins/system-info/index.js";
 import registerTemplatesPlugin from "./plugins/templates/index.js";
 
@@ -31,15 +33,13 @@ import registerPaymentsPlugin from "/imports/plugins/core/payments/server/no-met
 import registerProductPlugin from "/imports/plugins/core/product/server/no-meteor/register";
 import registerProductVariantPlugin from "/imports/plugins/included/product-variant/server/no-meteor/register";
 import registerProductAdminPlugin from "/imports/plugins/included/product-admin/server/no-meteor/register";
-import registerShippingPlugin from "/imports/plugins/core/shipping/server/no-meteor/register";
 import registerShippingRatesPlugin from "/imports/plugins/included/shipping-rates/server/no-meteor/register";
 import registerShopPlugin from "/imports/plugins/core/shop/server/register";
 import registerSimpleInventoryPlugin from "/imports/plugins/included/simple-inventory/server/no-meteor/register";
 import registerSimplePricingPlugin from "/imports/plugins/included/simple-pricing/server/no-meteor/register";
 import registerSitemapGeneratorPlugin from "/imports/plugins/included/sitemap-generator/server/no-meteor/register";
 import registerSMTPEmailPlugin from "/imports/plugins/included/email-smtp/server/no-meteor/register";
 import registerStripePaymentsPlugin from "/imports/plugins/included/payments-stripe/server/no-meteor/register";
-import registerSurchargesPlugin from "/imports/plugins/included/surcharges/server/no-meteor/register";
 import registerTagsPlugin from "/imports/plugins/core/tags/server/no-meteor/register";
 import registerTaxesPlugin from "/imports/plugins/core/taxes/server/no-meteor/register";
 import registerTaxesRatesPlugin from "/imports/plugins/included/taxes-rates/server/no-meteor/register";