reactioncommerce · aldeed · Oct 3, 2019 · Oct 3, 2019 · Oct 3, 2019 · Oct 3, 2019
diff --git a/imports/node-app/core-services/.gitkeep b/imports/node-app/core-services/.gitkeep
diff --git a/...s/core/tags/server/no-meteor/i18n/en.json → .../node-app/core-services/tags/i18n/en.json b/...s/core/tags/server/no-meteor/i18n/en.json → .../node-app/core-services/tags/i18n/en.json
diff --git a/.../core/tags/server/no-meteor/i18n/index.js → ...node-app/core-services/tags/i18n/index.js b/.../core/tags/server/no-meteor/i18n/index.js → ...node-app/core-services/tags/i18n/index.js
diff --git a/...ns/core/tags/server/no-meteor/register.js → imports/node-app/core-services/tags/index.js b/...ns/core/tags/server/no-meteor/register.js → imports/node-app/core-services/tags/index.js
@@ -1,8 +1,9 @@
-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";
+import { Tag } from "./simpleSchemas.js";
 
 /**
  * @summary Import and call this function to add this plugin to your API.
@@ -35,6 +36,9 @@ export default async function register(app) {
     },
     mutations,
     queries,
+    simpleSchemas: {
+      Tag
+    },
     registry: [{
       label: "Tags",
       description: "Tag Management",

diff --git a/...tations/__snapshots__/addTag.test.js.snap → ...tations/__snapshots__/addTag.test.js.snap b/...tations/__snapshots__/addTag.test.js.snap → ...tations/__snapshots__/addTag.test.js.snap
diff --git a/...ions/__snapshots__/removeTag.test.js.snap → ...ions/__snapshots__/removeTag.test.js.snap b/...ions/__snapshots__/removeTag.test.js.snap → ...ions/__snapshots__/removeTag.test.js.snap
diff --git a/...ions/__snapshots__/updateTag.test.js.snap → ...ions/__snapshots__/updateTag.test.js.snap b/...ions/__snapshots__/updateTag.test.js.snap → ...ions/__snapshots__/updateTag.test.js.snap
diff --git a/...tags/server/no-meteor/mutations/addTag.js → ...pp/core-services/tags/mutations/addTag.js b/...tags/server/no-meteor/mutations/addTag.js → ...pp/core-services/tags/mutations/addTag.js
@@ -1,7 +1,7 @@
 import Random from "@reactioncommerce/random";
 import ReactionError from "@reactioncommerce/reaction-error";
-import { Tag as TagSchema } from "/imports/collections/schemas";
-import getSlug from "/imports/plugins/core/core/server/Reaction/getSlug";
+import getSlug from "@reactioncommerce/api-utils/getSlug.js";
+import { Tag as TagSchema } from "../simpleSchemas.js"; // TODO: update schemas
 
 /**
  * @name Mutation.addTag

diff --git a/...server/no-meteor/mutations/addTag.test.js → ...re-services/tags/mutations/addTag.test.js b/...server/no-meteor/mutations/addTag.test.js → ...re-services/tags/mutations/addTag.test.js
@@ -1,5 +1,5 @@
-import mockContext from "/imports/test-utils/helpers/mockContext";
-import addTag from "./addTag";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import addTag from "./addTag.js";
 
 beforeEach(() => {
   jest.resetAllMocks();

diff --git a/imports/node-app/core-services/tags/mutations/index.js b/imports/node-app/core-services/tags/mutations/index.js
@@ -0,0 +1,11 @@
+import addTag from "./addTag.js";
+import setTagHeroMedia from "./setTagHeroMedia.js";
+import removeTag from "./removeTag.js";
+import updateTag from "./updateTag.js";
+
+export default {
+  addTag,
+  setTagHeroMedia,
+  removeTag,
+  updateTag
+};
diff --git a/...s/server/no-meteor/mutations/removeTag.js → ...core-services/tags/mutations/removeTag.js b/...s/server/no-meteor/mutations/removeTag.js → ...core-services/tags/mutations/removeTag.js
diff --git a/...ver/no-meteor/mutations/removeTag.test.js → ...services/tags/mutations/removeTag.test.js b/...ver/no-meteor/mutations/removeTag.test.js → ...services/tags/mutations/removeTag.test.js
@@ -1,5 +1,5 @@
-import mockContext from "/imports/test-utils/helpers/mockContext";
-import removeTag from "./removeTag";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import removeTag from "./removeTag.js";
 
 const testShopId = "1234";
 const testTagId = "5678";

diff --git a/...er/no-meteor/mutations/setTagHeroMedia.js → ...ervices/tags/mutations/setTagHeroMedia.js b/...er/no-meteor/mutations/setTagHeroMedia.js → ...ervices/tags/mutations/setTagHeroMedia.js
diff --git a/...s/server/no-meteor/mutations/updateTag.js → ...core-services/tags/mutations/updateTag.js b/...s/server/no-meteor/mutations/updateTag.js → ...core-services/tags/mutations/updateTag.js
@@ -1,6 +1,6 @@
 import ReactionError from "@reactioncommerce/reaction-error";
 import SimpleSchema from "simpl-schema";
-import getSlug from "/imports/plugins/core/core/server/Reaction/getSlug";
+import getSlug from "@reactioncommerce/api-utils/getSlug.js";
 
 const inputSchema = new SimpleSchema({
   "slug": String,

diff --git a/...ver/no-meteor/mutations/updateTag.test.js → ...services/tags/mutations/updateTag.test.js b/...ver/no-meteor/mutations/updateTag.test.js → ...services/tags/mutations/updateTag.test.js
@@ -1,6 +1,6 @@
 /* eslint-disable id-length */
-import mockContext from "/imports/test-utils/helpers/mockContext";
-import updateTag from "./updateTag";
+import mockContext from "@reactioncommerce/api-utils/tests/mockContext.js";
+import updateTag from "./updateTag.js";
 
 const testShopId = "1234";
 const testTagId = "5678";

diff --git a/imports/node-app/core-services/tags/queries/index.js b/imports/node-app/core-services/tags/queries/index.js
@@ -0,0 +1,5 @@
+import productsByTagId from "./productsByTagId.js";
+
+export default {
+  productsByTagId
+};
diff --git a/...rver/no-meteor/queries/productsByTagId.js → ...-services/tags/queries/productsByTagId.js b/...rver/no-meteor/queries/productsByTagId.js → ...-services/tags/queries/productsByTagId.js
@@ -1,5 +1,5 @@
 import ReactionError from "@reactioncommerce/reaction-error";
-import arrayJoinPlusRemainingQuery from "/imports/utils/arrayJoinPlusRemainingQuery";
+import arrayJoinPlusRemainingQuery from "@reactioncommerce/api-utils/arrayJoinPlusRemainingQuery.js";
 
 /**
  * @name queries.productsByTagId

diff --git a/...er/no-meteor/resolvers/Mutation/addTag.js → ...ervices/tags/resolvers/Mutation/addTag.js b/...er/no-meteor/resolvers/Mutation/addTag.js → ...ervices/tags/resolvers/Mutation/addTag.js
diff --git a/...-meteor/resolvers/Mutation/addTag.test.js → ...es/tags/resolvers/Mutation/addTag.test.js b/...-meteor/resolvers/Mutation/addTag.test.js → ...es/tags/resolvers/Mutation/addTag.test.js
@@ -1,6 +1,6 @@
 import { encodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 import { encodeTagOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/tag";
-import addTag from "./addTag";
+import addTag from "./addTag.js";
 
 beforeEach(() => {
   jest.resetAllMocks();

diff --git a/imports/node-app/core-services/tags/resolvers/Mutation/index.js b/imports/node-app/core-services/tags/resolvers/Mutation/index.js
@@ -0,0 +1,11 @@
+import addTag from "./addTag.js";
+import setTagHeroMedia from "./setTagHeroMedia.js";
+import removeTag from "./removeTag.js";
+import updateTag from "./updateTag.js";
+
+export default {
+  addTag,
+  setTagHeroMedia,
+  removeTag,
+  updateTag
+};
diff --git a/...no-meteor/resolvers/Mutation/removeTag.js → ...ices/tags/resolvers/Mutation/removeTag.js b/...no-meteor/resolvers/Mutation/removeTag.js → ...ices/tags/resolvers/Mutation/removeTag.js
diff --git a/...teor/resolvers/Mutation/removeTag.test.js → ...tags/resolvers/Mutation/removeTag.test.js b/...teor/resolvers/Mutation/removeTag.test.js → ...tags/resolvers/Mutation/removeTag.test.js
@@ -1,7 +1,7 @@
 
 import { encodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 import { encodeTagOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/tag";
-import removeTag from "./removeTag";
+import removeTag from "./removeTag.js";
 
 beforeEach(() => {
   jest.resetAllMocks();

diff --git a/...eor/resolvers/Mutation/setTagHeroMedia.js → ...ags/resolvers/Mutation/setTagHeroMedia.js b/...eor/resolvers/Mutation/setTagHeroMedia.js → ...ags/resolvers/Mutation/setTagHeroMedia.js
diff --git a/...no-meteor/resolvers/Mutation/updateTag.js → ...ices/tags/resolvers/Mutation/updateTag.js b/...no-meteor/resolvers/Mutation/updateTag.js → ...ices/tags/resolvers/Mutation/updateTag.js
diff --git a/...teor/resolvers/Mutation/updateTag.test.js → ...tags/resolvers/Mutation/updateTag.test.js b/...teor/resolvers/Mutation/updateTag.test.js → ...tags/resolvers/Mutation/updateTag.test.js
@@ -1,6 +1,6 @@
 import { encodeShopOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/shop";
 import { encodeTagOpaqueId } from "@reactioncommerce/reaction-graphql-xforms/tag";
-import updateTag from "./updateTag";
+import updateTag from "./updateTag.js";
 
 beforeEach(() => {
   jest.resetAllMocks();

diff --git a/imports/node-app/core-services/tags/resolvers/Query/index.js b/imports/node-app/core-services/tags/resolvers/Query/index.js
@@ -0,0 +1,5 @@
+import productsByTagId from "./productsByTagId.js";
+
+export default {
+  productsByTagId
+};
diff --git a/...meteor/resolvers/Query/productsByTagId.js → ...s/tags/resolvers/Query/productsByTagId.js b/...meteor/resolvers/Query/productsByTagId.js → ...s/tags/resolvers/Query/productsByTagId.js
diff --git a/.../tags/server/no-meteor/resolvers/index.js → ...app/core-services/tags/resolvers/index.js b/.../tags/server/no-meteor/resolvers/index.js → ...app/core-services/tags/resolvers/index.js
@@ -1,6 +1,6 @@
 import { getConnectionTypeResolvers } from "@reactioncommerce/reaction-graphql-utils";
-import Mutation from "./Mutation";
-import Query from "./Query";
+import Mutation from "./Mutation/index.js";
+import Query from "./Query/index.js";
 
 export default {
   Mutation,

diff --git a/...re/tags/server/no-meteor/schemas/index.js → ...e-app/core-services/tags/schemas/index.js b/...re/tags/server/no-meteor/schemas/index.js → ...e-app/core-services/tags/schemas/index.js
diff --git a/...s/server/no-meteor/schemas/schema.graphql → ...core-services/tags/schemas/schema.graphql b/...s/server/no-meteor/schemas/schema.graphql → ...core-services/tags/schemas/schema.graphql
diff --git a/imports/node-app/core-services/tags/simpleSchemas.js b/imports/node-app/core-services/tags/simpleSchemas.js
@@ -0,0 +1,125 @@
+import SimpleSchema from "simpl-schema";
+
+/**
+ * @name Metafield
+ * @memberof Schemas
+ * @type {SimpleSchema}
+ * @property {String} key optional
+ * @property {String} namespace optional
+ * @property {String} scope optional
+ * @property {String} value optional
+ * @property {String} valueType optional
+ * @property {String} description optional
+ */
+const Metafield = new SimpleSchema({
+  key: {
+    type: String,
+    max: 30,
+    optional: true
+  },
+  namespace: {
+    type: String,
+    max: 20,
+    optional: true
+  },
+  scope: {
+    type: String,
+    optional: true
+  },
+  value: {
+    type: String,
+    optional: true
+  },
+  valueType: {
+    type: String,
+    optional: true
+  },
+  description: {
+    type: String,
+    optional: true
+  }
+});
+
+/**
+ * @name Tag
+ * @memberof Schemas
+ * @type {SimpleSchema}
+ * @property {String} _id optional
+ * @property {String} name required
+ * @property {String} slug required
+ * @property {String} type optional
+ * @property {Metafield[]} metafields optional
+ * @property {Number} position optional
+ * @property {String[]} relatedTagIds optional
+ * @property {Boolean} isDeleted default value: `false`
+ * @property {Boolean} isTopLevel required
+ * @property {Boolean} isVisible default value: `true`
+ * @property {String[]} groups optional, default value: `[],` groupIds that this tag belongs to
+ * @property {String} shopId Tag shopId
+ * @property {Date} createdAt required
+ * @property {Date} updatedAt required
+ */
+export const Tag = new SimpleSchema({
+  "_id": {
+    type: String,
+    optional: true
+  },
+  "name": String,
+  "slug": String,
+  "type": {
+    type: String,
+    optional: true
+  },
+  "metafields": {
+    type: Array,
+    optional: true
+  },
+  "metafields.$": Metafield,
+  "position": {
+    type: SimpleSchema.Integer,
+    optional: true
+  },
+  "relatedTagIds": {
+    type: Array,
+    optional: true
+  },
+  "relatedTagIds.$": String,
+  "isDeleted": {
+    type: Boolean,
+    defaultValue: false
+  },
+  "isTopLevel": Boolean,
+  "isVisible": {
+    type: Boolean,
+    defaultValue: true
+  },
+  "groups": {
+    type: Array, // groupIds that this tag belongs to
+    optional: true,
+    defaultValue: []
+  },
+  "groups.$": String,
+  "shopId": {
+    type: String,
+    label: "Tag shopId"
+  },
+  "createdAt": {
+    type: Date
+  },
+  "updatedAt": {
+    type: Date
+  },
+  "heroMediaUrl": {
+    type: String,
+    optional: true
+  },
+  "displayTitle": {
+    type: String,
+    optional: true
+  },
+  "featuredProductIds": {
+    type: Array,
+    optional: true
+  },
+  "featuredProductIds.$": String
+});
diff --git a/imports/node-app/registerPlugins.js b/imports/node-app/registerPlugins.js
@@ -6,6 +6,7 @@ import registerI18nPlugin from "./core-services/i18n/index.js";
 import registerSettingsPlugin from "./core-services/settings/index.js";
 import registerShippingPlugin from "./core-services/shipping/index.js";
 import registerShopPlugin from "./core-services/shop/index.js";
+import registerTagsPlugin from "./core-services/tags/index.js";
 
 /* plugins */
 import registerAddressPlugin from "./plugins/address/index.js";
@@ -43,7 +44,6 @@ import registerProductPlugin from "/imports/plugins/core/product/server/no-meteo
 import registerProductVariantPlugin from "/imports/plugins/included/product-variant/server/no-meteor/register";
 import registerSitemapGeneratorPlugin from "/imports/plugins/included/sitemap-generator/server/no-meteor/register";
 import registerStripePaymentsPlugin from "/imports/plugins/included/payments-stripe/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";
 

diff --git a/imports/plugins/core/tags/register.js b/imports/plugins/core/tags/register.js
@@ -6,6 +6,6 @@
  * temporary bridge.
  */
 import Reaction from "/imports/plugins/core/core/server/Reaction";
-import register from "./server/no-meteor/register";
+import register from "/imports/node-app/core-services/tags/index.js";
 
 Reaction.whenAppInstanceReady(register);
diff --git a/imports/plugins/core/tags/server/no-meteor/mutations/index.js b/imports/plugins/core/tags/server/no-meteor/mutations/index.js
diff --git a/imports/plugins/core/tags/server/no-meteor/queries/index.js b/imports/plugins/core/tags/server/no-meteor/queries/index.js
diff --git a/imports/plugins/core/tags/server/no-meteor/resolvers/Mutation/index.js b/imports/plugins/core/tags/server/no-meteor/resolvers/Mutation/index.js
diff --git a/imports/plugins/core/tags/server/no-meteor/resolvers/Query/index.js b/imports/plugins/core/tags/server/no-meteor/resolvers/Query/index.js