rename userIds field to allowedUsers

Author: gondzo

migrations/20190201_userIds_project_attachment.sql

@@ -1,4 +1,4 @@
 --
 -- project_attachments
 --
-ALTER TABLE project_attachments ADD COLUMN "userIds" integer[];
+ALTER TABLE project_attachments ADD COLUMN "allowedUsers" integer[];

src/models/projectAttachment.js

@@ -9,7 +9,7 @@ module.exports = function defineProjectAttachment(sequelize, DataTypes) {
     description: { type: DataTypes.STRING, allowNull: true },
     filePath: { type: DataTypes.STRING, allowNull: false },
     contentType: { type: DataTypes.STRING, allowNull: false },
-    userIds: DataTypes.ARRAY({ type: DataTypes.INTEGER, allowNull: true }),
+    allowedUsers: DataTypes.ARRAY({ type: DataTypes.INTEGER, allowNull: true }),
     deletedAt: { type: DataTypes.DATE, allowNull: true },
     createdAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
     updatedAt: { type: DataTypes.DATE, defaultValue: DataTypes.NOW },
@@ -51,7 +51,7 @@ module.exports = function defineProjectAttachment(sequelize, DataTypes) {
             $or: [{
               createdBy: { $eq: userId },
             }, {
-              userIds: {
+              allowedUsers: {
                 $or: [
                   { $contains: [userId] },
                   { $eq: null },

src/permissions/project.downloadAttachment.js

@@ -27,7 +27,8 @@ module.exports = freq => new Promise((resolve, reject) => {
           return resolve(true);
         }
 
-        if (attachment.createdBy === userId || attachment.userIds === null || attachment.userIds.indexOf(userId) >= 0) {
+        if (attachment.createdBy === userId || attachment.allowedUsers === null ||
+          attachment.allowedUsers.indexOf(userId) >= 0) {
           return resolve(true);
         }
 

src/routes/attachments/create.js

@@ -25,7 +25,7 @@ const addAttachmentValidations = {
       filePath: Joi.string().required(),
       s3Bucket: Joi.string().required(),
       contentType: Joi.string().required(),
-      userIds: Joi.array(Joi.number().integer().positive()).allow(null).default(null),
+      allowedUsers: Joi.array(Joi.number().integer().positive()).allow(null).default(null),
     }).required(),
   },
 };
@@ -42,7 +42,7 @@ module.exports = [
     const data = req.body.param;
     // default values
     const projectId = req.params.projectId;
-    const userIds = data.userIds;
+    const allowedUsers = data.allowedUsers;
     _.assign(data, {
       projectId,
       createdBy: req.authUser.userId,
@@ -100,7 +100,7 @@ module.exports = [
       req.log.debug('creating db record');
       return models.ProjectAttachment.create({
         projectId,
-        userIds,
+        allowedUsers,
         createdBy: req.authUser.userId,
         updatedBy: req.authUser.userId,
         title: data.title,

src/routes/attachments/delete.spec.js

@@ -48,7 +48,7 @@ describe('Project Attachments delete', () => {
               size: 12312,
               category: null,
               filePath: 'https://media.topcoder.com/projects/1/test.txt',
-              createdBy: testUtil.userIds.copilot,
+              createdBy: testUtil.allowedUsers.copilot,
               updatedBy: 1,
             }).then((a1) => {
               attachment = a1;

src/routes/attachments/download.spec.js

@@ -52,7 +52,7 @@ describe('Project Attachments download', () => {
               filePath: 'https://media.topcoder.com/projects/1/test.txt',
               createdBy: testUtil.userIds.copilot,
               updatedBy: 1,
-              userIds: [testUtil.userIds.member],
+              allowedUsers: [testUtil.userIds.member],
             }).then((a1) => {
               attachment = a1;
               done();

src/routes/attachments/update.js

@@ -19,7 +19,7 @@ const updateProjectAttachmentValidation = {
     param: Joi.object().keys({
       title: Joi.string().required(),
       description: Joi.string().optional().allow(null).allow(''),
-      userIds: Joi.array(Joi.number().integer().positive()).allow(null).default(null),
+      allowedUsers: Joi.array(Joi.number().integer().positive()).allow(null).default(null),
     }),
   },
 };

src/routes/attachments/update.spec.js

@@ -49,7 +49,7 @@ describe('Project Attachments update', () => {
               filePath: 'https://media.topcoder.com/projects/1/test.txt',
               createdBy: testUtil.userIds.copilot,
               updatedBy: 1,
-              userIds: [],
+              allowedUsers: [],
             }).then((a1) => {
               attachment = a1;
               done();