reactioncommerce · mikemurray · Dec 16, 2019 · Dec 11, 2019 · Dec 11, 2019 · Dec 16, 2019
diff --git a/src/plugins/surcharges/util/surchargeSchema.js b/src/plugins/surcharges/util/surchargeSchema.js
@@ -54,7 +54,7 @@ const Message = new SimpleSchema({
   language: String
 });
 
-const surchargeSchema = new SimpleSchema({
+export const Surcharge = new SimpleSchema({
   "amount": {
     type: Number
   },
@@ -98,4 +98,4 @@ const surchargeSchema = new SimpleSchema({
   }
 });
 
-export default surchargeSchema;
+export default Surcharge;
diff --git a/tests/integration/api/queries/surchargeById/SurchargeByIdQuery.graphql b/tests/integration/api/queries/surchargeById/SurchargeByIdQuery.graphql
@@ -0,0 +1,8 @@
+
+query ($shopId: ID!, $surchargeId: ID!){
+  surchargeById(shopId: $shopId, surchargeId: $surchargeId){
+    amount {
+      amount
+    }
+  }
+}
diff --git a/tests/integration/api/queries/surchargeById/surchargeById.test.js b/tests/integration/api/queries/surchargeById/surchargeById.test.js
@@ -0,0 +1,54 @@
+import encodeOpaqueId from "@reactioncommerce/api-utils/encodeOpaqueId.js";
+import importAsString from "@reactioncommerce/api-utils/importAsString.js";
+import Factory from "/tests/util/factory.js";
+import TestApp from "/tests/util/TestApp.js";
+
+const SurchargeByIdQuery = importAsString("./SurchargeByIdQuery.graphql");
+
+jest.setTimeout(300000);
+
+const internalShopId = "123";
+const internalSurchargeId = "456";
+const opaqueShopId = encodeOpaqueId("reaction/shop", internalShopId); // reaction/shop:123
+const opaqueSurchargeId = encodeOpaqueId("reaction/surcharge", internalSurchargeId); // reaction/surcharge:456
+const shopName = "Test Shop";
+let testApp;
+let surchargeById;
+
+const mockSurcharge = Factory.Surcharge.makeOne({
+  _id: internalSurchargeId,
+  shopId: internalShopId,
+  amount: 20
+});
+
+beforeAll(async () => {
+  testApp = new TestApp();
+  await testApp.start();
+
+  await testApp.insertPrimaryShop({ _id: internalShopId, name: shopName });
+  await testApp.collections.Surcharges.insertOne(mockSurcharge);
+  surchargeById = testApp.query(SurchargeByIdQuery);
+});
+
+afterAll(async () => {
+  await testApp.collections.Accounts.deleteMany({});
+  await testApp.collections.Surcharges.deleteMany({});
+  await testApp.collections.Shops.deleteMany({});
+  await testApp.stop();
+});
+
+test("retrieve a surcharge by its id", async () => {
+  let result;
+
+  try {
+    result = await surchargeById({
+      shopId: opaqueShopId,
+      surchargeId: opaqueSurchargeId
+    });
+  } catch (error) {
+    expect(error).toBeUndefined();
+    return;
+  }
+
+  expect(result.surchargeById.amount.amount).toEqual(20);
+});
diff --git a/tests/integration/api/queries/surcharges/SurchargesQuery.graphql b/tests/integration/api/queries/surcharges/SurchargesQuery.graphql
@@ -0,0 +1,10 @@
+
+query ($shopId: ID!, $first: ConnectionLimitInt){
+  surcharges(shopId: $shopId, first: $first){
+    nodes {
+      amount {
+        amount
+      }
+    }
+  }
+}
diff --git a/tests/integration/api/queries/surcharges/surcharges.test.js b/tests/integration/api/queries/surcharges/surcharges.test.js
@@ -0,0 +1,52 @@
+import encodeOpaqueId from "@reactioncommerce/api-utils/encodeOpaqueId.js";
+import importAsString from "@reactioncommerce/api-utils/importAsString.js";
+import Factory from "/tests/util/factory.js";
+import TestApp from "/tests/util/TestApp.js";
+
+const SurchargesQuery = importAsString("./SurchargesQuery.graphql");
+
+jest.setTimeout(300000);
+
+const internalShopId = "123";
+const opaqueShopId = encodeOpaqueId("reaction/shop", internalShopId); // reaction/shop:123
+const shopName = "Test Shop";
+let testApp;
+let surcharges;
+let mockSurcharges;
+
+beforeAll(async () => {
+  testApp = new TestApp();
+  await testApp.start();
+
+  await testApp.insertPrimaryShop({ _id: internalShopId, name: shopName });
+  mockSurcharges = Factory.Surcharge.makeMany(3, {
+    shopId: internalShopId,
+    amount: 10
+  });
+  await testApp.collections.Surcharges.insertMany(mockSurcharges);
+  surcharges = testApp.query(SurchargesQuery);
+});
+
+afterAll(async () => {
+  await testApp.collections.Accounts.deleteMany({});
+  await testApp.collections.Surcharges.deleteMany({});
+  await testApp.collections.Shops.deleteMany({});
+  await testApp.stop();
+});
+
+test("retrieve a list of surcharges", async () => {
+  let result;
+
+  try {
+    result = await surcharges({
+      shopId: opaqueShopId,
+      first: 3
+    });
+  } catch (error) {
+    expect(error).toBeUndefined();
+    return;
+  }
+
+  expect(result.surcharges.nodes[0].amount.amount).toEqual(10);
+  expect(result.surcharges.nodes.length).toEqual(3);
+});
diff --git a/tests/util/factory.js b/tests/util/factory.js
@@ -54,6 +54,10 @@ import {
   Shop
 } from "../../src/core-services/shop/simpleSchemas.js";
 
+import {
+  Surcharge
+} from "../../src/plugins/surcharges/util/surchargeSchema.js";
+
 import {
   Tag
 } from "../../src/core-services/tags/simpleSchemas.js";
@@ -107,6 +111,7 @@ const schemasToAddToFactory = {
   ProductVariant,
   ShipmentQuote,
   Shop,
+  Surcharge,
   Tag,
   TaxRates
 };