Adjusted query/tag flow

models/action.js

@@ -1,17 +1,8 @@
 const mongoose = require('../services/mongoose');
 const uuid = require('uuid');
 const Schema = mongoose.Schema;
-
-const ACTION_TYPES = [
-  'LIKE',
-  'FLAG'
-];
-
-const ITEM_TYPES = [
-  'ASSETS',
-  'COMMENTS',
-  'USERS'
-];
+const ACTION_TYPES = require('./enum/action_types');
+const ITEM_TYPES = require('./enum/item_types');
 
 const ActionSchema = new Schema({
   id: {

models/comment.js

@@ -1,13 +1,8 @@
 const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
+const TagLinkSchema = require('./schema/tag_link');
 const uuid = require('uuid');
-
-const STATUSES = [
-  'ACCEPTED',
-  'REJECTED',
-  'PREMOD',
-  'NONE'
-];
+const COMMENT_STATUS = require('./enum/comment_status');
 
 /**
  * The Mongo schema for a Comment Status.
@@ -16,7 +11,7 @@ const STATUSES = [
 const StatusSchema = new Schema({
   type: {
     type: String,
-    enum: STATUSES,
+    enum: COMMENT_STATUS,
   },
 
   // The User ID of the user that assigned the status.
@@ -30,29 +25,6 @@ const StatusSchema = new Schema({
   _id: false
 });
 
-/**
- * The Mongo schema for a Comment Tag.
- * @type {Schema}
- */
-const TagSchema = new Schema({
-
-  // This is the actual 'tag' and we only permit tags that are in Setting.tags.
-  id: String,
-
-  // The User ID of the user that added the tag.
-  added_by: {
-    type: String,
-    default: null
-  },
-
-  created_at: {
-    type: Date,
-    default: Date
-  }
-}, {
-  _id: false
-});
-
 /**
  * The Mongo schema for a Comment.
  * @type {Schema}
@@ -73,12 +45,11 @@ const CommentSchema = new Schema({
   status_history: [StatusSchema],
   status: {
     type: String,
-    enum: STATUSES,
+    enum: COMMENT_STATUS,
     default: 'NONE'
   },
   parent_id: String,
-
-  tags: [TagSchema],
+  tags: [TagLinkSchema],
 
   // Additional metadata stored on the field.
   metadata: {
@@ -92,10 +63,9 @@ const CommentSchema = new Schema({
   }
 });
 
-// Add the indexes on the comment tag.
+// Add the indexes for the id of the comment.
 CommentSchema.index({
-  'id': 1,
-  'tags.id': 1
+  'id': 1
 }, {
   unique: true,
   background: false

models/enum/action_types.js

@@ -0,0 +1,4 @@
+module.exports = [
+  'LIKE',
+  'FLAG'
+];

models/enum/comment_status.js

@@ -0,0 +1,6 @@
+module.exports = [
+  'ACCEPTED',
+  'REJECTED',
+  'PREMOD',
+  'NONE'
+];

models/enum/item_types.js

@@ -0,0 +1,5 @@
+module.exports = [
+  'ASSETS',
+  'COMMENTS',
+  'USERS'
+];

models/enum/moderation_options.js

@@ -0,0 +1,4 @@
+module.exports = [
+  'PRE',
+  'POST'
+];

models/enum/user_roles.js

@@ -0,0 +1,4 @@
+module.exports = [
+  'ADMIN',
+  'MODERATOR'
+];

models/enum/user_status.js

@@ -0,0 +1,6 @@
+module.exports = [
+  'ACTIVE',
+  'BANNED',
+  'PENDING',
+  'APPROVED' // Indicates that the users' username has been approved
+];

models/schema/tag.js

@@ -0,0 +1,53 @@
+const mongoose = require('../../services/mongoose');
+const Schema = mongoose.Schema;
+
+const ITEM_TYPES = require('../enum/item_types');
+const USER_ROLES = require('../enum/user_roles');
+
+/**
+ * The Mongo schema for a Tag.
+ * @type {Schema}
+ */
+const TagSchema = new Schema({
+
+  // The actual name of the tag.
+  name: String,
+
+  // Contains permission data.
+  permissions: {
+
+    // Determines if this tag is public or not.
+    public: {
+      type: Boolean,
+      default: true
+    },
+
+    // Determines if the owner of the Model can add/remove this tag on their own
+    // resources.
+    self: Boolean,
+
+    // Determines other roles that are allowed to set this tag on other
+    // resources.
+    roles: [{
+      type: String,
+      enum: USER_ROLES,
+      default: []
+    }]
+  },
+
+  // A list of all the model types that this tag can be added to.
+  models: [{
+    type: String,
+    enum: ITEM_TYPES
+  }],
+
+  // The date for when the tag was created.
+  created_at: {
+    type: Date,
+    default: Date
+  }
+}, {
+  _id: false
+});
+
+module.exports = TagSchema;

models/schema/tag_link.js

@@ -0,0 +1,31 @@
+const mongoose = require('../../services/mongoose');
+const Schema = mongoose.Schema;
+const TagSchema = require('./tag');
+
+/**
+ * The Mongo schema for linking a Tag to a Model.
+ * @type {Schema}
+ */
+const TagLinkSchema = new Schema({
+
+  // A deep copy of the tag that is the origin for this link. If the ID matches
+  // with existing tags in the global/asset context then content will be
+  // substituted.
+  tag: TagSchema,
+
+  // The User ID of the user that assigned the status.
+  assigned_by: {
+    type: String,
+    default: null
+  },
+
+  // The date when the tag was added to the model.
+  created_at: {
+    type: Date,
+    default: Date
+  }
+}, {
+  _id: false
+});
+
+module.exports = TagLinkSchema;

models/setting.js

@@ -1,45 +1,7 @@
 const mongoose = require('../services/mongoose');
 const Schema = mongoose.Schema;
-
-const PERMISSIONS = [
-  'ADMIN'
-];
-
-/**
- * The Mongo schema for a Tag.
- * @type {Schema}
- */
-const TagSchema = new Schema({
-  id: {
-    type: String,
-    unique: true,
-    default: 'STAFF'
-  },
-  public: Boolean,
-  text: {
-    type: Schema.Types.Mixed,
-    default:  null
-  },
-  permissions: [{
-    type: String,
-    enum: PERMISSIONS,
-    default: 'ADMIN'
-  }],
-  models: [String],
-
-  // Additional metadata stored on the field.
-  metadata: Schema.Types.Mixed
-}, {
-  timestamps: {
-    createdAt: 'created_at',
-    updatedAt: 'updated_at'
-  }
-});
-
-const MODERATION_OPTIONS = [
-  'PRE',
-  'POST'
-];
+const TagSchema = require('./schema/tag');
+const MODERATION_OPTIONS = require('./enum/moderation_options');
 
 /**
  * SettingSchema manages application settings that get used on front and backend.
@@ -156,4 +118,3 @@ SettingSchema.method('merge', function(src) {
 const Setting = mongoose.model('Setting', SettingSchema);
 
 module.exports = Setting;
-module.exports.MODERATION_OPTIONS = MODERATION_OPTIONS;

models/user.js

@@ -4,41 +4,10 @@ const Schema = mongoose.Schema;
 const uuid = require('uuid');
 
 // USER_ROLES is the array of roles that is permissible as a user role.
-const USER_ROLES = [
-  'ADMIN',
-  'MODERATOR'
-];
+const USER_ROLES = require('./enum/user_roles');
 
 // USER_STATUS is the list of statuses that are permitted for the user status.
-const USER_STATUS = [
-  'ACTIVE',
-  'BANNED',
-  'PENDING',
-  'APPROVED' // Indicates that the users' username has been approved
-];
-
-// /**
-//  * The Mongo schema for a User Tag.
-//  * @type {Schema}
-//  */
-// const TagSchema = new Schema({
-//
-//   // This is the actual 'tag' and we only permit tags that are in Setting.tags.
-//   id: String,
-//
-//   // The User ID of the user that added the tag.
-//   added_by: {
-//     type: String,
-//     default: null
-//   },
-//
-//   created_at: {
-//     type: Date,
-//     default: Date
-//   }
-// }, {
-//   _id: false
-// });
+const USER_STATUS = require('./enum/user_status');
 
 // ProfileSchema is the mongoose schema defined as the representation of a
 // User's profile stored in MongoDB.
@@ -245,12 +214,6 @@ UserSchema.method('can', function(...actions) {
     return false;
   }
 
-  // {add,remove}CommentTag - requires admin and/or moderator role
-  const userCanModifyTags = user => ['ADMIN', 'MODERATOR'].some(r => user.hasRoles(r));
-  if (actions.some(a => ['mutation:removeCommentTag', 'mutation:addCommentTag', 'mutation:removeUserTag', 'mutation: addUserTag'].includes(a)) && ! userCanModifyTags(this)) {
-    return false;
-  }
-
   return true;
 });
 
@@ -258,5 +221,3 @@ UserSchema.method('can', function(...actions) {
 const UserModel = mongoose.model('User', UserSchema);
 
 module.exports = UserModel;
-module.exports.USER_ROLES = USER_ROLES;
-module.exports.USER_STATUS = USER_STATUS;