Merge d5d216b into e085e83

mergeability · Feb 25, 2021 · a81c66d · a81c66d
2 parents e085e83 + d5d216b
commit a81c66d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 5 deletions.
diff --git a/__fixtures__/unit/helper.js b/__fixtures__/unit/helper.js
@@ -202,7 +202,8 @@ module.exports = {
       },
       probotContext: {
         config: jest.fn().mockResolvedValue(options.configJson)
-      }
+      },
+      globalSettings: {}
     }
   },
 

diff --git a/docs/changelog.rst b/docs/changelog.rst
@@ -1,6 +1,7 @@
 CHANGELOG
 =====================================
 
+| February 25, 2021 : fix: Correct use of cache env
 | February 12, 2021 : feat: Implemented redis as a dependency to the helm-chart
 | February 10, 2021 : feat: global cache manager `#502 <https://github.com/mergeability/mergeable/pull/502>`_
 | February 10, 2021 : feat: Implement and/or filters support `#496 <https://github.com/mergeability/mergeable/pull/504>`_

diff --git a/lib/filters/options_processor/topics.js b/lib/filters/options_processor/topics.js
@@ -13,8 +13,11 @@ class Topics {
 }
 
 const repoTopics = async (context) => {
-  if (process.env.USE_CONFIG_CACHE) {
-    let names = await cacheManager.get(`${context.payload.full_name}#repoTopics`)
+  let repo = context.repo()
+  const globalSettings = context.globalSettings
+
+  if (globalSettings.use_config_cache !== undefined && globalSettings.use_config_cache === true) {
+    let names = await cacheManager.get(`${repo.owner}/${repo.repo}/topics`)
     if (names) {
       return names
     }
@@ -24,8 +27,8 @@ const repoTopics = async (context) => {
     owner: context.payload.repository.owner.login,
     repo: context.payload.repository.name
   }).then(response => {
-    if (process.env.USE_CONFIG_CACHE) {
-      cacheManager.set(`${context.payload.full_name}#repoTopics`, response.data.names)
+    if (globalSettings.use_config_cache !== undefined && globalSettings.use_config_cache === true) {
+      cacheManager.set(`${repo.owner}/${repo.repo}/topics`, response.data.names)
     }
     return response.data.names
   })