@outliant/sunrise-utils 1.1.0 → 1.1.2

package/.eslintrc

@@ -46,6 +46,7 @@
     "semi": ["error", "always"],
     "quote-props": ["error", "as-needed"],
     "space-infix-ops": "error",
+    "no-undef": "error",
     "object-curly-spacing": ["error", "always"],
     "indent": [
       "error",

package/CHANGELOG.md

@@ -4,9 +4,26 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
+#### [1.1.2](https://github.com/outliant/sunrise-utils/compare/1.1.1...1.1.2)
+
+- chore: set departmentId to optional [`#7`](https://github.com/outliant/sunrise-utils/pull/7)
+
+#### [1.1.1](https://github.com/outliant/sunrise-utils/compare/1.1.0...1.1.1)
+
+> 14 April 2023
+
+- chore: add search for projectIds [`#5`](https://github.com/outliant/sunrise-utils/pull/5)
+- chore: add match_phrase_prefix search for project fields [`#6`](https://github.com/outliant/sunrise-utils/pull/6)
+- chore: revert taskPipeline [`3fb9c24`](https://github.com/outliant/sunrise-utils/commit/3fb9c2486b1459a0b33050e6691963e8aa04cfcf)
+- chore: update projectId filter query [`dbe2f3c`](https://github.com/outliant/sunrise-utils/commit/dbe2f3c6cc40c470d02c78911a1fc0ba30cda900)
+- chore(release): 1.1.1 [`b27a11a`](https://github.com/outliant/sunrise-utils/commit/b27a11a385d0f4f20333e0a681a2b4fc7d8c276b)
+
 #### [1.1.0](https://github.com/outliant/sunrise-utils/compare/1.0.11...1.1.0)
 
+> 13 April 2023
+
 - chore: support task age color #860q9c397 [`50d79a7`](https://github.com/outliant/sunrise-utils/commit/50d79a78e309c70d7eac0f5533686bd65c1167a7)
+- chore(release): 1.1.0 [`73ee00e`](https://github.com/outliant/sunrise-utils/commit/73ee00e07226e06fcfbf4d8c96ba87b8970ce312)
 
 #### [1.0.11](https://github.com/outliant/sunrise-utils/compare/1.0.10...1.0.11)
 

package/helpers/searchFilter.js

@@ -85,6 +85,50 @@ module.exports = (query = {}, searchFields = []) => {
           min_score: 15
         }
       });
+
+      should.push({
+        bool: {
+          must: [
+            {
+              nested: {
+                path: 'fields',
+                query: {
+                  bool: {
+                    must: [
+                      {
+                        term: {
+                          'fields.id': {
+                            value: projectFields[i]
+                          }
+                        }
+                      },
+                      {
+                        bool: {
+                          should: [
+                            {
+                              match: {
+                                [`fields.text.analyzed`]: {
+                                  query: searchString,
+                                  operator: 'and'
+                                }
+                              }
+                            },
+                            {
+                              match_phrase_prefix: {
+                                [`fields.text.analyzed`]: searchString
+                              }
+                            }
+                          ]
+                        }
+                      }
+                    ]
+                  }
+                }
+              }
+            }
+          ]
+        }
+      });
     }
   }
 

package/lib/projectPipeline.js

@@ -23,15 +23,18 @@ class ProjectPipeline {
             value: orgId
           }
         }
-      },
-      {
+      }
+    ];
+
+    if (departmentId) {
+      mustQuery.push({
         term: {
           department_id: {
             value: departmentId
           }
         }
-      }
-    ];
+      });
+    }
 
     if (query.search && query.search.length > 0) {
       const should = searchFilter(query, searchFields);
@@ -45,6 +48,20 @@ class ProjectPipeline {
       }
     }
 
+    if (query.projectIds && query.projectIds.length) {
+      const should = query.projectIds.map(projectId => {
+        return {
+          match: {
+            _id: projectId
+          }
+        };
+      });
+
+      mustQuery.push({
+        bool: { should }
+      });
+    }
+
     if (!filters.length) {
       return {
         bool: {

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@outliant/sunrise-utils",
   "description": "Helper functions for project Sunrise",
-  "version": "1.1.0",
+  "version": "1.1.2",
   "license": "ISC",
   "author": "Outliant",
   "main": "index.js",