From 1c3ac35ed1a5c6671bf68d7d2a50fb34fc1e3050 Mon Sep 17 00:00:00 2001 From: Methapon2001 <61303214+Methapon2001@users.noreply.github.com> Date: Thu, 23 Nov 2023 10:32:49 +0700 Subject: [PATCH] refactor: get index from .env --- .../server/src/controllers/fileController.ts | 20 +++++++++---------- .../src/controllers/searchController.ts | 2 +- .../controllers/subFolderFileController.ts | 20 +++++++++---------- 3 files changed, 21 insertions(+), 21 deletions(-) diff --git a/Services/server/src/controllers/fileController.ts b/Services/server/src/controllers/fileController.ts index 8c5fb09..6fb9393 100644 --- a/Services/server/src/controllers/fileController.ts +++ b/Services/server/src/controllers/fileController.ts @@ -58,7 +58,7 @@ export class FileController extends Controller { if (!info) throw new Error("Object storage error occured."); const search = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: pathname, @@ -82,7 +82,7 @@ export class FileController extends Controller { if (!exist) { await esClient.index({ pipeline: "attachment", - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', document: { data: Buffer.from(file.buffer).toString("base64"), createdAt: new Date().toISOString(), @@ -96,7 +96,7 @@ export class FileController extends Controller { await esClient.delete({ index: exist._index, id: exist._id }); await esClient.index({ pipeline: "attachment", - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', document: { data: Buffer.from(file.buffer).toString("base64"), createdAt: exist._source?.createdAt, @@ -124,7 +124,7 @@ export class FileController extends Controller { attachment: Record; } >({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { prefix: { pathname: `${cabinetName}/${drawerName}/${folderName}/`, @@ -163,7 +163,7 @@ export class FileController extends Controller { @FormField() category?: string, ) { const search = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: `${cabinetName}/${drawerName}/${folderName}/${fileName}`, @@ -180,7 +180,7 @@ export class FileController extends Controller { if (!file) { const esResult = await esClient .update({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', id: data._id, doc: { title, @@ -216,7 +216,7 @@ export class FileController extends Controller { await esClient.delete({ index: data._index, id: data._id }); await esClient.index({ pipeline: "attachment", - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', document: { data: Buffer.from(file.buffer).toString("base64"), pathname, @@ -253,7 +253,7 @@ export class FileController extends Controller { attachment: Record; } >({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: `${cabinetName}/${drawerName}/${folderName}/${fileName}`, @@ -267,7 +267,7 @@ export class FileController extends Controller { const esResult = await esClient .delete({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', id: search.hits.hits[0]._id, }) .catch((e) => console.error(e)); @@ -289,7 +289,7 @@ export class FileController extends Controller { @Path() fileName: string, ) { const search = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: `${cabinetName}/${drawerName}/${folderName}/${fileName}`, diff --git a/Services/server/src/controllers/searchController.ts b/Services/server/src/controllers/searchController.ts index 08a7b25..5edb848 100644 --- a/Services/server/src/controllers/searchController.ts +++ b/Services/server/src/controllers/searchController.ts @@ -11,7 +11,7 @@ export class SearchController extends Controller { @SuccessResponse(HttpStatusCode.OK) public async searchFile(@Body() search: Search): Promise { const result = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { bool: { must: search.AND?.map((v) => ({ match: { [v.field]: v.value } })), diff --git a/Services/server/src/controllers/subFolderFileController.ts b/Services/server/src/controllers/subFolderFileController.ts index 4162877..af513d9 100644 --- a/Services/server/src/controllers/subFolderFileController.ts +++ b/Services/server/src/controllers/subFolderFileController.ts @@ -61,7 +61,7 @@ export class SubFolderFileController extends Controller { if (!info) throw new Error("Object storage error occured."); const search = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: pathname, @@ -85,7 +85,7 @@ export class SubFolderFileController extends Controller { if (!exist) { await esClient.index({ pipeline: "attachment", - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', document: { data: Buffer.from(file.buffer).toString("base64"), createdAt: new Date().toISOString(), @@ -99,7 +99,7 @@ export class SubFolderFileController extends Controller { await esClient.delete({ index: exist._index, id: exist._id }); await esClient.index({ pipeline: "attachment", - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', document: { data: Buffer.from(file.buffer).toString("base64"), createdAt: exist._source?.createdAt, @@ -128,7 +128,7 @@ export class SubFolderFileController extends Controller { attachment: Record; } >({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { prefix: { pathname: `${cabinetName}/${drawerName}/${folderName}/${subFolderName}`, @@ -168,7 +168,7 @@ export class SubFolderFileController extends Controller { @FormField() category?: string, ) { const search = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: `${cabinetName}/${drawerName}/${folderName}/${subFolderName}/${fileName}`, @@ -185,7 +185,7 @@ export class SubFolderFileController extends Controller { if (!file) { const esResult = await esClient .update({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', id: data._id, doc: { title, @@ -221,7 +221,7 @@ export class SubFolderFileController extends Controller { await esClient.delete({ index: data._index, id: data._id }); await esClient.index({ pipeline: "attachment", - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', document: { data: Buffer.from(file.buffer).toString("base64"), pathname, @@ -259,7 +259,7 @@ export class SubFolderFileController extends Controller { attachment: Record; } >({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: `${cabinetName}/${drawerName}/${folderName}/${subFolderName}/${fileName}`, @@ -273,7 +273,7 @@ export class SubFolderFileController extends Controller { const esResult = await esClient .delete({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', id: search.hits.hits[0]._id, }) .catch((e) => console.error(e)); @@ -299,7 +299,7 @@ export class SubFolderFileController extends Controller { @Path() fileName: string, ) { const search = await esClient.search }>({ - index: "ehr-api-client", + index: process.env.ELASTICSEARCH_INDEX ?? 'ehr-index', query: { match: { pathname: `${cabinetName}/${drawerName}/${folderName}/${subFolderName}/${fileName}`,