Merge branch 'master' into clean-up-jscs-in-tests-api-v1-subjects

api/v1/controllers/aspects.js

@@ -101,7 +101,7 @@ module.exports = {
     u.findAssociatedInstances(helper,
       params, helper.userModelAssociationName, options)
     .then((o) => {
-    // if the resolved object is an empty array, throw a ResourceNotFound error
+      // throw a ResourceNotFound error if resolved object is empty array
       u.throwErrorForEmptyArray(o,
         params.userNameOrId.value, userProps.modelName);
       const retval = u.responsify(o, helper, req.method);

api/v1/controllers/globalconfig.js

@@ -28,9 +28,7 @@ function isAdmin(req) {
     if (req.headers.authorization) {
       // use the token
       jwtUtil.getUsernameFromToken(req)
-      .then((username) => {
-        return User.findOne({ where: { name: username } });
-      })
+      .then((username) => User.findOne({ where: { name: username } }))
       .then((user) => {
         resolve(Profile.isAdmin(user.profileId));
       })

api/v1/controllers/lenses.js

@@ -112,7 +112,6 @@ function handleLensMetadata(requestObj, libraryParam, seqObj) {
   }
 }
 
-
 /**
  * Prepares the object to be sent back in the response ("cleans" the object,
  * strips out nulls, adds API links).
@@ -197,7 +196,7 @@ module.exports = {
     u.findAssociatedInstances(helper,
       params, helper.userModelAssociationName, options)
     .then((o) => {
-    // if the resolved object is an empty array, throw a ResourceNotFound error
+      // throw a ResourceNotFound error if resolved object is empty array
       u.throwErrorForEmptyArray(o,
         params.userNameOrId.value, userProps.modelName);
       const retval = u.responsify(o, helper, req.method);

api/v1/controllers/perspectives.js

@@ -101,7 +101,7 @@ module.exports = {
     u.findAssociatedInstances(helper,
       params, helper.userModelAssociationName, options)
     .then((o) => {
-    // if the resolved object is an empty array, throw a ResourceNotFound error
+      // throw ResourceNotFound error if resolved object is empty array
       u.throwErrorForEmptyArray(o,
         params.userNameOrId.value, userProps.modelName);
       const retval = u.responsify(o, helper, req.method);

api/v1/controllers/ssoconfig.js

@@ -37,13 +37,11 @@ function getApiLinks(key, props, method) {
   }
 
   // Otherwise include all the methods specified for this resource
-  return Object.keys(props.apiLinks).map((i) => {
-    return {
-      href: props.baseUrl,
-      method: i,
-      rel: props.apiLinks[i],
-    };
-  });
+  return Object.keys(props.apiLinks).map((i) => ({
+    href: props.baseUrl,
+    method: i,
+    rel: props.apiLinks[i],
+  }));
 } // getApiLinks
 
 /**

api/v1/controllers/subjects.js

@@ -36,17 +36,19 @@ const ONE = 1;
  */
 function checkDuplicates(tagsArr) {
   const LEN = tagsArr.length - ONE;
-  // to store lowercase copies
-  const copyArr = [];
+  const copyArr = []; // store lowercase copies
   let toAdd;
   for (let i = LEN; i >= ZERO; i--) {
     toAdd = tagsArr[i].toLowerCase();
+
     // if duplicate found, return true
     if (copyArr.indexOf(toAdd) > -ONE) {
       return true;
     }
+
     copyArr.push(toAdd);
   }
+
   return false;
 }
 
@@ -66,9 +68,11 @@ function validateRequest(requestBody, params) {
     // params.tags.value is a comma delimited string, not empty.
     tags = params.tags.value ? params.tags.value.split(',') : [];
   }
+
   if (absolutePath) {
     throw new apiErrors.SubjectValidationError();
   }
+
   if (tags && tags.length) {
     if (checkDuplicates(tags)) {
       throw new apiErrors.DuplicateFieldError();
@@ -206,7 +210,7 @@ module.exports = {
     u.findAssociatedInstances(helper,
       params, helper.userModelAssociationName, options)
     .then((o) => {
-    // if the resolved object is an empty array, throw a ResourceNotFound error
+      // throw ResourceNotFound error if resolved object is empty array
       u.throwErrorForEmptyArray(o,
         params.userNameOrId.value, userProps.modelName);
       const retval = u.responsify(o, helper, req.method);

api/v1/controllers/tokens.js

@@ -116,7 +116,7 @@ module.exports = {
     .catch((err) => u.handleError(next, err, helper.modelName));
   },
 
-    /**
+  /**
    * POST /tokens/{key}/revoke
    *
    * Revoke access for the specified token.
@@ -141,4 +141,4 @@ module.exports = {
     })
     .catch((err) => u.handleError(next, err, helper.modelName));
   },
-}; // exports
+}; // exports

api/v1/controllers/userTokens.js

@@ -65,10 +65,8 @@ module.exports = {
       err.key = user + ', ' + tokenName;
       throw err;
     })
-    .then((o) => {
-      return res.status(httpStatus.OK)
-      .json(u.responsify(o, helper, req.method));
-    })
+    .then((o) => res.status(httpStatus.OK)
+      .json(u.responsify(o, helper, req.method)))
     .catch((err) => u.handleError(next, err, helper.modelName));
   },
 
@@ -170,4 +168,4 @@ module.exports = {
     })
     .catch((err) => u.handleError(next, err, helper.modelName));
   },
-}; // exports
+}; // exports

api/v1/helpers/nouns/samples.js

@@ -22,7 +22,6 @@ const loggingEnabled = (
   config.auditSamples === 'API' || config.auditSamples === 'ALL'
   ) || false;
 
-
 module.exports = {
   apiLinks: {
     DELETE: `Delete this ${m}`,

api/v1/helpers/verbs/doFind.js

@@ -82,6 +82,7 @@ function doFindAll(reqResNext, props, opts) {
     if (tags && tags.value && tags.value.length) {
       retval = fu.filterArrFromArr(retval, tags.value);
     }
+
     reqResNext.res.status(httpStatus.OK).json(retval);
   })
   .catch((err) => u.handleError(reqResNext.next, err, props.modelName));

api/v1/helpers/verbs/doPut.js

@@ -50,6 +50,7 @@ function doPut(req, res, next, props) {
         o.set(key, toPut[key]);
       }
     }
+
     return o.save();
   })
   .then((o) => {

api/v1/helpers/verbs/findUtils.js

@@ -41,10 +41,8 @@ function escapePercentLiterals(val) {
  */
 function toSequelizeWildcards(val) {
   const chars = val.split(constants.EMPTY_STRING);
-  const arr = chars.map((ch) => {
-    return ch === constants.QUERY_PARAM_WILDCARD ?
-      constants.SEQ_WILDCARD : ch;
-  });
+  const arr = chars.map((ch) =>
+    (ch === constants.QUERY_PARAM_WILDCARD ? constants.SEQ_WILDCARD : ch));
   return arr.join(constants.EMPTY_STRING);
 } // toSequelizeWildcards
 
@@ -116,6 +114,7 @@ function toSequelizeWhere(filter, props) {
       if (Array.isArray(props.fieldsWithEnum) &&
         props.fieldsWithEnum.indexOf(key) > -ONE) {
         const enumArr = filter[key];
+
         // to use $in instead of $contains in toWhereClause
         props.isEnum = true;
         values.push(toWhereClause(enumArr, props));
@@ -239,22 +238,27 @@ function options(params, props) {
 function filterArrFromArr(sArr, tagsStr) {
   const tagsArr = tagsStr.split(',');
   const TAGLEN = tagsArr.length;
-  // assume TAGLEN has > 0 tags, since if ther's
-  // 0 tags express would've thrown an error
+
+  // Assume TAGLEN has > 0 tags (otherwise express would throw error)
   const INCLUDE = tagsArr[ZERO].charAt(ZERO) !== '-';
-  // if !INCLUDE, splice out the leading -  in tags
-  // else throw exception if tag starts with -
+
+  /*
+   * If !INCLUDE, splice out the leading "-" in tags. Otherwise throw an
+   * exception if tag starts with "-".
+   */
   for (let i = TAGLEN - ONE; i >= ZERO; i--) {
     if (tagsArr[i].charAt(ZERO) === '-') {
       if (INCLUDE) {
         throw new Error('To specify EXCLUDE tags, ' +
           'prepend each tag with -');
       }
+
       tagsArr[i] = tagsArr[i].slice(ONE);
     }
   }
 
-  let filteredArr = [];
+  const filteredArr = [];
+
   // append iff subject's tags contains all tags in tagsArr
   if (INCLUDE) {
     for (let i = ZERO; i < sArr.length; i++) {
@@ -265,6 +269,7 @@ function filterArrFromArr(sArr, tagsStr) {
           count++;
         }
       }
+
       if (count === TAGLEN) {
         filteredArr.push(sArr[i]);
       }
@@ -281,11 +286,13 @@ function filterArrFromArr(sArr, tagsStr) {
           break;
         }
       }
+
       if (addToArr) {
         filteredArr.push(sArr[i]);
       }
     }
   }
+
   return filteredArr;
 }
 

api/v1/helpers/verbs/utils.js

@@ -59,9 +59,9 @@ function includeAssocToCreate(obj, props) {
   return includedAssoc;
 } // includeAssocToCreate
 
-
 /**
- * Function that capitalises the first letter of the string and returns it.
+ * Capitalize the first letter of the string and returns the modified string.
+ *
  * @param  {String} str - String that has to have its first letter capitalized
  * @returns {String} str - String with the first letter capitalized
  */
@@ -167,15 +167,11 @@ function getApiLinks(key, props, method) {
   }
 
   // Otherwise include all the methods specified for this resource
-  return Object.keys(props.apiLinks).map((i) => {
-    return {
-      href: i === 'POST' ?
-        props.baseUrl :
-        props.baseUrl + constants.SLASH + key,
-      method: i,
-      rel: props.apiLinks[i],
-    };
-  });
+  return Object.keys(props.apiLinks).map((i) => ({
+    href: i === 'POST' ? props.baseUrl : props.baseUrl + constants.SLASH + key,
+    method: i,
+    rel: props.apiLinks[i],
+  }));
 } // getApiLinks
 
 /**

db/helpers/common.js

@@ -49,6 +49,7 @@ function augmentSampleWithSubjectAspectInfo(seq, inst) {
       if (sub) {
         inst.dataValues.absolutePath = sub.absolutePath;
       }
+
       inst.subject = sub;
     }).then(() => inst.getAspect())
     .then((asp) => {

db/model/aspect.js

@@ -207,8 +207,8 @@ module.exports = function aspect(seq, dataTypes) {
         if (inst.changed('tags')) {
           return new seq.Promise((resolve, reject) => {
             inst.getSamples()
-            .each((samp) => {
-              return common.sampleAspectAndSubjectArePublished(seq, samp)
+            .each((samp) =>
+              common.sampleAspectAndSubjectArePublished(seq, samp)
               .then((published) => {
                 if (published) {
                   return common.augmentSampleWithSubjectAspectInfo(seq, samp)
@@ -218,8 +218,7 @@ module.exports = function aspect(seq, dataTypes) {
                 }
 
                 return seq.Promise.resolve(true);
-              });
-            })
+              }))
             .then(() => resolve(inst))
             .catch(reject);
           });
@@ -255,8 +254,8 @@ module.exports = function aspect(seq, dataTypes) {
         if (inst.changed('tags')) {
           return new seq.Promise((resolve, reject) => {
             inst.getSamples()
-            .each((samp) => {
-              return common.sampleAspectAndSubjectArePublished(seq, samp)
+            .each((samp) =>
+              common.sampleAspectAndSubjectArePublished(seq, samp)
               .then((published) => {
                 if (published) {
                   return common.augmentSampleWithSubjectAspectInfo(seq, samp)
@@ -266,8 +265,7 @@ module.exports = function aspect(seq, dataTypes) {
                 }
 
                 return seq.Promise.resolve(true);
-              });
-            })
+              }))
             .then(() => resolve(inst))
             .catch(reject);
           });
@@ -316,8 +314,8 @@ module.exports = function aspect(seq, dataTypes) {
     ],
     instanceMethods: {
       isWritableBy(who) {
-        return new seq.Promise((resolve, reject) => {
-          return this.getWriters()
+        return new seq.Promise((resolve /* , reject */) =>
+          this.getWriters()
           .then((writers) => {
             if (!writers.length) {
               resolve(true);
@@ -326,8 +324,7 @@ module.exports = function aspect(seq, dataTypes) {
             const found = writers.filter((w) =>
               w.name === who || w.id === who);
             resolve(found.length === 1);
-          });
-        });
+          }));
       }, // isWritableBy
     },
     paranoid: true,

db/model/lens.js

@@ -168,8 +168,8 @@ module.exports = function lens(seq, dataTypes) {
     ],
     instanceMethods: {
       isWritableBy(who) {
-        return new seq.Promise((resolve, reject) => {
-          return this.getWriters()
+        return new seq.Promise((resolve /* , reject */) =>
+          this.getWriters()
           .then((writers) => {
             if (!writers.length) {
               resolve(true);
@@ -178,8 +178,7 @@ module.exports = function lens(seq, dataTypes) {
             const found = writers.filter((w) =>
               w.name === who || w.id === who);
             resolve(found.length === 1);
-          });
-        });
+          }));
       }, // isWritableBy
     },
     paranoid: true,

db/model/perspective.js

@@ -173,8 +173,8 @@ module.exports = function perspective(seq, dataTypes) {
     ],
     instanceMethods: {
       isWritableBy(who) {
-        return new seq.Promise((resolve, reject) => {
-          return this.getWriters()
+        return new seq.Promise((resolve /* , reject */) =>
+          this.getWriters()
           .then((writers) => {
             if (!writers.length) {
               resolve(true);
@@ -183,8 +183,7 @@ module.exports = function perspective(seq, dataTypes) {
             const found = writers.filter((w) =>
               w.name === who || w.id === who);
             resolve(found.length === 1);
-          });
-        });
+          }));
       }, // isWritableBy
     },
     paranoid: true,