remove filtering by id substring (only exact match support for now)

Author: maxceem

migrations/elasticsearch_sync.js

@@ -209,8 +209,7 @@ function getRequestBody(indexName) {
         },
       },
       id: {
-        type: 'string',
-        index: 'not_analyzed',
+        type: 'long',
       },
       members: {
         type: 'nested',

postman.json

@@ -1,6 +1,6 @@
 {
 	"info": {
-		"_postman_id": "97085cd7-b298-4f1c-9629-24af14ff5f13",
+		"_postman_id": "4fc2b7cf-404a-4fd7-b6d2-4828a3994859",
 		"name": "tc-project-service",
 		"schema": "https://schema.getpostman.com/json/collection/v2.1.0/collection.json"
 	},
@@ -1452,7 +1452,7 @@
 					"response": []
 				},
 				{
-					"name": "List projects with filters applied",
+					"name": "List projects with filters - type (exact)",
 					"request": {
 						"method": "GET",
 						"header": [
@@ -1466,7 +1466,7 @@
 							"raw": ""
 						},
 						"url": {
-							"raw": "{{api-url}}/v4/projects?filter=type%3Dgeneric",
+							"raw": "{{api-url}}/v4/projects?filter=type%3Dapp",
 							"host": [
 								"{{api-url}}"
 							],
@@ -1477,7 +1477,7 @@
 							"query": [
 								{
 									"key": "filter",
-									"value": "type%3Dgeneric"
+									"value": "type%3Dapp"
 								}
 							]
 						},
@@ -1486,10 +1486,21 @@
 					"response": []
 				},
 				{
-					"name": "List projects with filters - name, code, customer, manager",
+					"name": "List projects with filters - id (exact)",
 					"request": {
+						"method": "GET",
+						"header": [
+							{
+								"key": "Authorization",
+								"value": "Bearer {{jwt-token}}"
+							}
+						],
+						"body": {
+							"mode": "raw",
+							"raw": ""
+						},
 						"url": {
-							"raw": "{{api-url}}/v4/projects?filter=id%3D1*%26name%3Dtes*%26code=test*%26customer%3DDiya*%26manager=first*",
+							"raw": "{{api-url}}/v4/projects?filter=id%3D1",
 							"host": [
 								"{{api-url}}"
 							],
@@ -1500,34 +1511,30 @@
 							"query": [
 								{
 									"key": "filter",
-									"value": "id%3D1*%26name%3Dtes*%26code=test*%26customer%3DDiya*%26manager=first*",
-									"equals": true,
-									"description": ""
+									"value": "id%3D1"
 								}
-							],
-							"variable": []
+							]
 						},
+						"description": "List all the project with filters applied. The filter string should be url encoded. Default limit and offset is applicable"
+					},
+					"response": []
+				},
+				{
+					"name": "List projects with filters - name, code, customer, manager",
+					"request": {
 						"method": "GET",
 						"header": [
 							{
 								"key": "Authorization",
-								"value": "Bearer {{jwt-token}}",
-								"description": ""
+								"value": "Bearer {{jwt-token}}"
 							}
 						],
 						"body": {
 							"mode": "raw",
 							"raw": ""
 						},
-						"description": "List all the project with filters applied. The filter string should be url encoded. Default limit and offset is applicable"
-					},
-					"response": []
-				},
-				{
-					"name": "List projects with filters - id",
-					"request": {
 						"url": {
-							"raw": "{{api-url}}/v4/projects?filter=id%3D2",
+							"raw": "{{api-url}}/v4/projects?filter=id%3D1*%26name%3Dtes*%26code=test*%26customer%3DDiya*%26manager=first*",
 							"host": [
 								"{{api-url}}"
 							],
@@ -1538,32 +1545,28 @@
 							"query": [
 								{
 									"key": "filter",
-									"value": "id%3D2",
-									"equals": true,
-									"description": ""
+									"value": "id%3D1*%26name%3Dtes*%26code=test*%26customer%3DDiya*%26manager=first*"
 								}
-							],
-							"variable": []
+							]
 						},
+						"description": "List all the project with filters applied. The filter string should be url encoded. Default limit and offset is applicable"
+					},
+					"response": []
+				},
+				{
+					"name": "List projects with filters - code",
+					"request": {
 						"method": "GET",
 						"header": [
 							{
 								"key": "Authorization",
-								"value": "Bearer {{jwt-token}}",
-								"description": ""
+								"value": "Bearer {{jwt-token}}"
 							}
 						],
 						"body": {
 							"mode": "raw",
 							"raw": ""
 						},
-						"description": "List all the project with filters applied. The filter string should be url encoded. Default limit and offset is applicable"
-					},
-					"response": []
-				},
-				{
-					"name": "List projects with filters - code",
-					"request": {
 						"url": {
 							"raw": "{{api-url}}/v4/projects?filter=code%3Dtest*",
 							"host": [
@@ -1576,24 +1579,9 @@
 							"query": [
 								{
 									"key": "filter",
-									"value": "code%3Dtest*",
-									"equals": true,
-									"description": ""
+									"value": "code%3Dtest*"
 								}
-							],
-							"variable": []
-						},
-						"method": "GET",
-						"header": [
-							{
-								"key": "Authorization",
-								"value": "Bearer {{jwt-token}}",
-								"description": ""
-							}
-						],
-						"body": {
-							"mode": "raw",
-							"raw": ""
+							]
 						},
 						"description": "List all the project with filters applied. The filter string should be url encoded. Default limit and offset is applicable"
 					},
@@ -5509,4 +5497,4 @@
 			]
 		}
 	]
-}
+}

src/routes/projects/list.js

@@ -241,8 +241,6 @@ const parseElasticSearchCriteria = (criteria, fields, order) => {
         values: criteria.filters.id.$in,
       },
     });
-  } else if (_.has(criteria, 'filters.id') && criteria.filters.id.indexOf('*') > -1) {
-    mustQuery = _.concat(mustQuery, buildEsQueryWithFilter('id', criteria.filters.id, MATCH_TYPE_WILDCARD, ['id']));
   } else if (_.has(criteria, 'filters.id')) {
     boolQuery.push({
       term: {
@@ -287,6 +285,21 @@ const parseElasticSearchCriteria = (criteria, fields, order) => {
     });
   }
 
+  if (_.has(criteria, 'filters.type.$in')) {
+    // type is an array
+    boolQuery.push({
+      terms: {
+        type: criteria.filters.type.$in,
+      },
+    });
+  } else if (_.has(criteria, 'filters.type')) {
+    // type is simple string
+    boolQuery.push({
+      term: {
+        type: criteria.filters.type,
+      },
+    });
+  }
   if (_.has(criteria, 'filters.keyword')) {
     // keyword is a full text search
     // escape special fields from keyword search
@@ -400,7 +413,7 @@ module.exports = [
       'type', 'type asc', 'type desc',
     ];
     if (!util.isValidFilter(filters,
-      ['id', 'status', 'memberOnly', 'keyword', 'name', 'code', 'customer', 'manager']) ||
+      ['id', 'status', 'memberOnly', 'keyword', 'type', 'name', 'code', 'customer', 'manager']) ||
       (sort && _.indexOf(sortableProps, sort) < 0)) {
       return util.handleError('Invalid filters or sort', null, req, next);
     }

src/routes/projects/list.spec.js

@@ -513,9 +513,9 @@ describe('LIST Project', () => {
         });
     });
 
-    it('should return project that match when filtering by id', (done) => {
+    it('should return project that match when filtering by id (exact)', (done) => {
       request(server)
-        .get('/v4/projects/?filter=id%3D1*')
+        .get('/v4/projects/?filter=id%3D1')
         .set({
           Authorization: `Bearer ${testUtil.jwts.admin}`,
         })