Merge pull request #6 from Health-Informatics-UoN/fix/build

change elasticsearch client

Author: vpnu

.github/workflows/build.open-case-reports.yml

@@ -4,7 +4,7 @@ on:
   workflow_dispatch:
   pull_request:
     paths:
-      - .
+      - '**'
       - .github/workflows/omop-case-reports.yml
 
 env:

lib/elasticsearch.ts

@@ -1,12 +1,13 @@
-import { Client } from '@elastic/elasticsearch';
-const isDev = process.env.NODE_ENV === 'development';
-export const es = new Client({
-  node: process.env.ELASTICSEARCH_URL,
-  auth: {
-    username: process.env.ELASTICSEARCH_USERNAME!,
-    password: process.env.ELASTICSEARCH_PASSWORD!,
-  },
-  tls: isDev
-    ? { rejectUnauthorized: false }
-    : undefined,
-});
+import { Client } from "@elastic/elasticsearch";
+const isDev = process.env.NODE_ENV === "development";
+
+export function getElasticClient() {
+  return new Client({
+    node: process.env.ELASTICSEARCH_URL,
+    auth: {
+      username: process.env.ELASTICSEARCH_USERNAME!,
+      password: process.env.ELASTICSEARCH_PASSWORD!,
+    },
+    tls: isDev ? { rejectUnauthorized: false } : undefined,
+  });
+}

lib/services/conceptsService.ts

@@ -1,13 +1,13 @@
-import { es } from "@/lib/elasticsearch";
+import { getElasticClient } from "@/lib/elasticsearch";
 
 export async function getConcepts(domain?: string) {
   const must: any[] = [];
 
   if (domain && domain !== "All") {
     must.push({ term: { "domain.keyword": domain } });
   }
-
-  const result = await es.search({
+ 
+  const result = await getElasticClient().search({
     index: "notes_nlp",
     size: 0,
     query: {
@@ -41,7 +41,7 @@ export async function getConcepts(domain?: string) {
 }
 
 export async function getNotesForConcept(conceptId: string) {
-  const resultConcept = await es.search({
+  const resultConcept = await getElasticClient().search({
     index: "notes_nlp",
     size: 100,
     query: {
@@ -56,7 +56,7 @@ export async function getNotesForConcept(conceptId: string) {
 
   if (noteIds.length === 0) return [];
 
-  const notes = await es.search({
+  const notes = await getElasticClient().search({
     index: "notes",
     size: 100,
     query: {