feat: Refactoring ES error handling

Duke-MatSci · Feb 19, 2024 · d294fe7 · d294fe7
1 parent df3aa53
commit d294fe7
Show file tree

Hide file tree

Showing 4 changed files with 333 additions and 223 deletions.
diff --git a/app/tests/unit/components/metamineNU/VisualizationLayout.spec.js b/app/tests/unit/components/metamineNU/VisualizationLayout.spec.js
@@ -14,18 +14,35 @@ describe('VisualizationLayout.vue', () => {
     link: { to: '/mm', text: 'Pairwise' },
     dense: false
   }
-  const dispatch = jest.spyOn(store, 'dispatch')
+  const originalFunction = store.dispatch
+  const dispatch = jest
+    .spyOn(store, 'dispatch')
+    .mockImplementationOnce(
+      async () => await originalFunction('metamineNU/fetchMetamineDataset')
+    )
+    .mockImplementationOnce(() => Promise.resolve({ val: 'reload' }))
+    .mockImplementationOnce(() => Promise.resolve({ val: 'force-cache' }))
+    .mockImplementationOnce(() => Promise.resolve({ val: 'reload' }))
   const commitSpy = jest.spyOn(store, 'commit')
   global.fetch = jest
     .fn()
     .mockImplementationOnce(() =>
-      Promise.resolve({ json: () => Promise.resolve(mockValues) })
+      Promise.resolve({
+        json: () => Promise.resolve(mockValues),
+        url: 'windows_url/metamine/file_1.csv'
+      })
     )
     .mockImplementationOnce(() =>
-      Promise.resolve({ json: () => Promise.resolve(mockValues2) })
+      Promise.resolve({
+        json: () => Promise.resolve(mockValues2),
+        url: 'windows_url/metamine/file_2.csv'
+      })
     )
     .mockImplementationOnce(() =>
-      Promise.resolve({ json: () => Promise.resolve(mockValues2) })
+      Promise.resolve({
+        json: () => Promise.resolve(mockValues2),
+        url: 'windows_url/metamine/file_3.csv'
+      })
     )
     .mockImplementation(() => {})
 
@@ -39,8 +56,8 @@ describe('VisualizationLayout.vue', () => {
     await jest.resetAllMocks()
   })
 
-  it.skip('makes a fetch call when mounted ', () => {
-    expect.assertions(12)
+  it('makes a fetch call when mounted ', async () => {
+    expect.assertions(10)
     expect(wrapper.exists()).toBe(true)
     expect(dispatch).toHaveBeenCalledTimes(2)
     expect(commitSpy).toHaveBeenCalledTimes(5)
@@ -73,16 +90,14 @@ describe('VisualizationLayout.vue', () => {
       [],
       undefined
     )
+    expect(dispatch).toHaveBeenNthCalledWith(2, 'fetchWrapper', {
+      url: '/api/files/metamine'
+    })
 
-    expect(fetch).toHaveBeenCalledTimes(1 + mockValues.fetchedNames.length)
     // check initial fetch request
-    expect(fetch).toHaveBeenNthCalledWith(1, '/api/files/metamine')
-    for (let i = 0; i < mockValues.fetchedNames.length; i++) {
-      expect(fetch).toHaveBeenNthCalledWith(
-        i + 2,
-        `/api/files/metamine/${mockValues.fetchedNames[i].name}`
-      )
-    }
+    expect(global.fetch).toHaveBeenNthCalledWith(1, '/api/files/metamine', {
+      cache: 'reload'
+    })
   })
 
   it('renders layout properly ', () => {

diff --git a/resfulservice/src/controllers/kgWrapperController.js b/resfulservice/src/controllers/kgWrapperController.js
@@ -172,6 +172,8 @@ exports.getKnowledge = async (req, res, next) => {
  * @returns {*} response.data
  */
 exports.getSparql = async (req, res, next) => {
+  const log = req.logger;
+  log.info('getSparql(): Function entry');
   const whyisPath = req.query.whyisPath;
   try {
     if (!req.env.KNOWLEDGE_ADDRESS) {
@@ -206,6 +208,7 @@ exports.getSparql = async (req, res, next) => {
     if (response.data && whyisPath !== 'pub') {
       req.knowledgeId = req.knowledgeId ?? uuidv4();
       await elasticSearch.createKnowledgeGraphDoc(
+        log,
         req.knowledgeId,
         req.query.queryString,
         response?.data
@@ -277,7 +280,9 @@ exports.getInstanceFromKnowledgeGraph = async (req, res, next) => {
     const view = req?.query?.view;
     let url;
     if (!view) url = `${req.env.KNOWLEDGE_ADDRESS}/about?uri=${req.query.uri}`;
-    else { url = `${req.env.KNOWLEDGE_ADDRESS}/about?uri=${req.query.uri}&view=${view}`; }
+    else {
+      url = `${req.env.KNOWLEDGE_ADDRESS}/about?uri=${req.query.uri}&view=${view}`;
+    }
     return axios
       .get(url, {
         responseType: 'arraybuffer'

diff --git a/resfulservice/src/middlewares/knowledge-cache.js b/resfulservice/src/middlewares/knowledge-cache.js
@@ -13,7 +13,7 @@ exports.isKnowledgeCached = async (req, res, next) => {
   req.logger.info('Middleware.isKnowledgeCached - Function entry');
   const query = req.query.query ?? req.body?.query;
 
-  const cacheResult = await elasticSearch.searchKnowledgeGraph(query);
+  const cacheResult = await elasticSearch.searchKnowledgeGraph(req, query);
   if (cacheResult.length) {
     const {
       _id,