Merge pull request #1382 from SciCatProject/dependabot/npm_and_yarn/e…

…lastic/elasticsearch-8.15.0 build(deps): bump @elastic/elasticsearch from 8.13.1 to 8.15.0
SciCatProject · Aug 30, 2024 · 9d223b6 · 9d223b6
2 parents d0e24ce + a7558f4
commit 9d223b6
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 28 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -31,7 +31,7 @@
   },
   "dependencies": {
     "@casl/ability": "^6.3.2",
-    "@elastic/elasticsearch": "^8.9.0",
+    "@elastic/elasticsearch": "^8.15.0",
     "@nestjs-modules/mailer": "^2.0.2",
     "@nestjs/axios": "^3.0.0",
     "@nestjs/common": "^10.3.8",
@@ -118,6 +118,9 @@
     "wait-on": "^8.0.0"
   },
   "jest": {
+    "setupFilesAfterEnv": [
+      "../test/config/jest.setup.js"
+    ],
     "moduleFileExtensions": [
       "js",
       "json",

diff --git a/src/elastic-search/elastic-search.service.ts b/src/elastic-search/elastic-search.service.ts
@@ -262,7 +262,7 @@ export class ElasticSearchService implements OnModuleInit {
     limit = 20,
     skip = 0,
     sort?: Record<string, SortOrder>,
-  ): Promise<{ totalCount: number; data: string[] }> {
+  ): Promise<{ totalCount: number; data: (string | undefined)[] }> {
     const defaultMinScore = searchParam.text ? 1 : 0;
 
     try {

diff --git a/test/config/jest-e2e.json b/test/config/jest-e2e.json
@@ -1,4 +1,5 @@
 {
+  "setupFilesAfterEnv": ["./test/config/jest.setup.js"],
   "moduleFileExtensions": ["js", "json", "ts"],
   "rootDir": "../../",
   "testTimeout": 30000,
@@ -16,5 +17,4 @@
       "isolatedModules": true
     }
   }
-
 }
diff --git a/test/config/jest.setup.js b/test/config/jest.setup.js
@@ -0,0 +1,2 @@
+/* eslint-disable @typescript-eslint/no-var-requires */
+global.ReadableStream = require("node:stream/web").ReadableStream;
Original file line number	Diff line number	Diff line change
		@@ -0,0 +1,2 @@
		/* eslint-disable @typescript-eslint/no-var-requires */
		global.ReadableStream = require("node:stream/web").ReadableStream;