Merge branch 'dev'

Author: Parth Shah

ebs_deploy.sh

@@ -4,16 +4,16 @@ SERVICE=$1
 ENV=$2
 TAG_SUFFIX=$3
 TAG="$ENV.$TAG_SUFFIX"
-
+ENV_LOWER=`echo "$ENV" | awk '{print tolower($0)}'`
 
 echo "Deploying to Elasticbeanstalk"
 echo "############################"
 export AWS_ACCESS_KEY_ID=$(eval "echo \$${ENV}_AWS_ACCESS_KEY_ID")
 export AWS_SECRET_ACCESS_KEY=$(eval "echo \$${ENV}_AWS_SECRET_ACCESS_KEY")
 
 # eb deploy
-eb init -r us-east-1 $SERVICE
-EB_OUTPUT="$(eb deploy -l $TAG -r us-east-1)"
+# eb init -r us-east-1 $SERVICE
+EB_OUTPUT="$(eb deploy tc-project-api-v4-${ENV_LOWER} -l $TAG -r us-east-1)"
 
 echo $EB_OUTPUT
 if echo $EB_OUTPUT | grep -iq error; then

src/routes/projects/list.js

@@ -41,10 +41,28 @@ var _retrieveProjects = (req, criteria, sort, fields) => {
   let retrieveAttachments = !req.query.fields || req.query.fields.indexOf('attachments') > -1
   let retrieveMembers = !req.query.fields || !!fields.project_members.length
 
-
-  // special handling for name filter
-  if (_.has(criteria.filters, 'name')) {
-    criteria.filters.name = { ilike: `%${criteria.filters.name}%`}
+  // special handling for keyword filter
+  if (_.has(criteria.filters, 'keyword')) {
+    criteria.filters.$or = [
+      {
+        name: {
+          $ilike: `%${criteria.filters.keyword}%`
+        },
+      }, {
+        description: {
+          $ilike: `%${criteria.filters.keyword}%`
+        },
+      }, {
+        details: {
+          utm: {
+            code: {
+              $ilike: `%${criteria.filters.keyword}%`
+            }
+          }
+        }
+      }
+    ]
+    delete criteria.filters.keyword
   }
 
   return models.Project.findAndCountAll({
@@ -117,7 +135,7 @@ module.exports = [
       'name', 'name asc', 'name desc',
       'type', 'type asc', 'type desc'
     ]
-    if (!util.isValidFilter(filters, ['id', 'status', 'type', 'memberOnly', 'name']) ||
+    if (!util.isValidFilter(filters, ['id', 'status', 'type', 'memberOnly', 'keyword']) ||
       (sort && _.indexOf(sortableProps, sort) < 0)) {
       util.handleError('Invalid filters or sort', null, req, next)
     }

src/routes/projects/list.spec.js

@@ -20,7 +20,11 @@ describe('LIST Project', () => {
             name: 'test1',
             description: 'test project1',
             status: 'active',
-            details: {},
+            details: {
+              utm: {
+                code: 'code1'
+              }
+            },
             createdBy: 1,
             updatedBy: 1
           }).then(p => {
@@ -175,6 +179,84 @@ describe('LIST Project', () => {
             done()
           })
     })
-  })
 
+    it('should return all projects that match when filtering by name', done => {
+      request(server)
+          .get('/v4/projects/?filter=keyword%3Dtest')
+          .set({
+            'Authorization': 'Bearer ' + testUtil.jwts.admin
+          })
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .end(function(err, res) {
+            if (err) {
+              return done(err)
+            }
+            var resJson = res.body.result.content
+            should.exist(resJson)
+            resJson.should.have.lengthOf(3)
+            done()
+          })
+    })
+
+    it('should return the project when filtering by keyword, which matches the name', done => {
+      request(server)
+          .get('/v4/projects/?filter=keyword%3D1')
+          .set({
+            'Authorization': 'Bearer ' + testUtil.jwts.admin
+          })
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .end(function(err, res) {
+            if (err) {
+              return done(err)
+            }
+            var resJson = res.body.result.content
+            should.exist(resJson)
+            resJson.should.have.lengthOf(1)
+            resJson[0].name.should.equal('test1')
+            done()
+          })
+    })
+
+    it('should return the project when filtering by keyword, which matches the description', done => {
+      request(server)
+          .get('/v4/projects/?filter=keyword%3Dproject')
+          .set({
+            'Authorization': 'Bearer ' + testUtil.jwts.admin
+          })
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .end(function(err, res) {
+            if (err) {
+              return done(err)
+            }
+            var resJson = res.body.result.content
+            should.exist(resJson)
+            resJson.should.have.lengthOf(3)
+            done()
+          })
+    })
+
+    it('should return the project when filtering by keyword, which matches the details', done => {
+      request(server)
+          .get('/v4/projects/?filter=keyword%3Dcode')
+          .set({
+            'Authorization': 'Bearer ' + testUtil.jwts.admin
+          })
+          .expect('Content-Type', /json/)
+          .expect(200)
+          .end(function(err, res) {
+            if (err) {
+              return done(err)
+            }
+            var resJson = res.body.result.content
+            should.exist(resJson)
+            resJson.should.have.lengthOf(1)
+            resJson[0].name.should.equal('test1')
+            done()
+          })
+    })
+  })
+  
 })

swagger.yaml

@@ -48,7 +48,7 @@ paths:
              - type
              - status
              - memberOnly
-             - name
+             - keyword
         - name: sort
           required: false
           description: |