Bug fixes

Bug fixes

Author: phoenix303

src/routes/attachments/download.js

@@ -13,7 +13,7 @@ const permissions = tcMiddleware.permissions;
 
 const getFileDownloadUrl = (req, filePath) => {
   if (process.env.NODE_ENV === 'development' || config.get('enableFileUpload') === false) {
-    return ['dummy://url'];
+    return ['', 'dummy://url'];
   }
   return util.getFileDownloadUrl(req, filePath);
 };

src/routes/projectMembers/get.spec.js

@@ -50,26 +50,28 @@ describe('GET project member', () => {
         .then((project) => {
           projectId = project.id;
           // create members
-          models.ProjectMember.bulkCreate([{
+          models.ProjectMember.create({
             id: 1,
             userId: copilotUser.userId,
             projectId,
             role: 'copilot',
             isPrimary: false,
             createdBy: 1,
             updatedBy: 1,
-          }, {
-            id: 2,
-            userId: memberUser.userId,
-            projectId,
-            role: 'customer',
-            isPrimary: true,
-            createdBy: 1,
-            updatedBy: 1,
-          }], { returning: true }).then((members) => {
-            memberId = members[0].id;
-            memberId2 = members[1].id;
-            done();
+          }).then((_member) => {
+            memberId = _member.id;
+            models.ProjectMember.create({
+              id: 2,
+              userId: memberUser.userId,
+              projectId,
+              role: 'customer',
+              isPrimary: true,
+              createdBy: 1,
+              updatedBy: 1,
+            }).then((m) => {
+              memberId2 = m.id;
+              done();
+            });
           });
         });
       });
@@ -142,7 +144,7 @@ describe('GET project member', () => {
         .expect(200, done);
     });
 
-    it('should return 200 for admin', (done) => {
+    it('should return 200 for admin when retrieve member with id=1', (done) => {
       request(server)
         .get(`/v5/projects/${projectId}/members/${memberId}`)
         .set({
@@ -163,7 +165,7 @@ describe('GET project member', () => {
         });
     });
 
-    it('should return 200 for admin with filter', (done) => {
+    it('should return 200 for admin when retrieve member with id=2', (done) => {
       request(server)
         .get(`/v5/projects/${projectId}/members/${memberId2}`)
         .set({

src/routes/projectMembers/list.js

@@ -39,6 +39,9 @@ module.exports = [
     }
 
     util.fetchByIdFromES('members', {
+      sort: [
+        { id: { order: 'asc' } },
+      ],
       query: {
         nested: {
           path: 'members',
@@ -68,6 +71,10 @@ module.exports = [
         }
         return models.ProjectMember.findAll({
           where,
+          // Add order
+          order: [
+              ['id', 'ASC'],
+          ],
           attributes: { exclude: ['deletedAt', 'deletedBy'] },
           raw: true,
         })

src/routes/projectMembers/list.spec.js

@@ -48,23 +48,25 @@ describe('LIST project members', () => {
         .then((project) => {
           id = project.id;
           // create members
-          models.ProjectMember.bulkCreate([{
+          models.ProjectMember.create({
             id: 1,
             userId: copilotUser.userId,
             projectId: id,
             role: 'copilot',
             isPrimary: false,
             createdBy: 1,
             updatedBy: 1,
-          }, {
-            id: 2,
-            userId: memberUser.userId,
-            projectId: id,
-            role: 'customer',
-            isPrimary: true,
-            createdBy: 1,
-            updatedBy: 1,
-          }]).then(() => done());
+          }).then(() => {
+            models.ProjectMember.create({
+              id: 2,
+              userId: memberUser.userId,
+              projectId: id,
+              role: 'customer',
+              isPrimary: true,
+              createdBy: 1,
+              updatedBy: 1,
+            }).then(() => done());
+          });
         });
       });
   });
@@ -137,8 +139,8 @@ describe('LIST project members', () => {
         .end((err, res) => {
           const resJson = res.body;
           resJson.should.have.length(2);
-          resJson[0].userId.should.be.eql(_.parseInt(memberUser.userId));
-          resJson[0].role.should.be.eql('customer');
+          resJson[0].userId.should.be.eql(copilotUser.userId);
+          resJson[0].role.should.be.eql('copilot');
           resJson[0].projectId.should.be.eql(id);
           should.exist(resJson[0].createdAt);
           should.exist(resJson[0].updatedAt);
@@ -151,16 +153,16 @@ describe('LIST project members', () => {
 
     it('should return 200 for admin with filter', (done) => {
       request(server)
-        .get(`/v5/projects/${id}/members?role=copilot`)
+        .get(`/v5/projects/${id}/members?role=customer`)
         .set({
           Authorization: `Bearer ${testUtil.jwts.admin}`,
         })
         .expect(200)
         .end((err, res) => {
           const resJson = res.body;
           resJson.should.have.length(1);
-          resJson[0].userId.should.be.eql(copilotUser.userId);
-          resJson[0].role.should.be.eql('copilot');
+          resJson[0].userId.should.be.eql(_.parseInt(memberUser.userId));
+          resJson[0].role.should.be.eql('customer');
           resJson[0].projectId.should.be.eql(id);
           should.exist(resJson[0].createdAt);
           should.exist(resJson[0].updatedAt);