Merge pull request #418 from protofire/issue-416

Remove timestamp_gt filter from queries to prevent getting cache out of sinc
protofire · Jun 2, 2020 · 6d38eb5 · 6d38eb5
2 parents bcde40c + ff7adc4
commit 6d38eb5
Show file tree

Hide file tree

Showing 7 changed files with 436,067 additions and 233,706 deletions.
diff --git a/.env.example b/.env.example
@@ -3,5 +3,6 @@ REACT_APP_GRAPH_HTTP='https://api.thegraph.com/subgraphs/name/protofire/makerdao
 REACT_APP_MKR_GRAPH_HTTP='https://api.thegraph.com/subgraphs/name/protofire/mkr-registry'
 REACT_APP_GOV_DB_HTTP='/api/v1'
 REACT_APP_ETHERSCAN_API_KEY='XQ2QTEM7H4KX7AQTE9JWXD3HWTTZ46TTU9'
-REACT_APP_LAST_CACHE_UPDATE='1587733935'
+REACT_APP_LAST_CACHE_UPDATE='1591122639'
+REACT_APP_CACHE_FORCE_UPDATE='1591122639'
 REACT_APP_HOME_DATA_TTL='5'
diff --git a/netlify.toml b/netlify.toml
@@ -18,7 +18,8 @@
   REACT_APP_MKR_GRAPH_HTTP='https://api.thegraph.com/subgraphs/name/protofire/mkr-registry'
   REACT_APP_GOV_DB_HTTP='/api/v1'
   REACT_APP_ETHERSCAN_API_KEY='XQ2QTEM7H4KX7AQTE9JWXD3HWTTZ46TTU9'
-  REACT_APP_LAST_CACHE_UPDATE='1587733935'
+  REACT_APP_LAST_CACHE_UPDATE='1591122639'
+  REACT_APP_CACHE_FORCE_UPDATE='1591122639'
   REACT_APP_HOME_DATA_TTL='5'
 
 [context.branch-deploy.environment]
@@ -27,7 +28,8 @@
   REACT_APP_MKR_GRAPH_HTTP='https://api.thegraph.com/subgraphs/name/protofire/mkr-registry'
   REACT_APP_GOV_DB_HTTP='/api/v1'
   REACT_APP_ETHERSCAN_API_KEY='XQ2QTEM7H4KX7AQTE9JWXD3HWTTZ46TTU9'
-  REACT_APP_LAST_CACHE_UPDATE='1587733935'
+  REACT_APP_LAST_CACHE_UPDATE='1591122639'
+  REACT_APP_CACHE_FORCE_UPDATE='1591122639'
   REACT_APP_HOME_DATA_TTL='5'
 
 [context.deploy-preview.environment]
@@ -36,5 +38,6 @@
   REACT_APP_MKR_GRAPH_HTTP='https://api.thegraph.com/subgraphs/name/protofire/mkr-registry'
   REACT_APP_GOV_DB_HTTP='/api/v1'
   REACT_APP_ETHERSCAN_API_KEY='XQ2QTEM7H4KX7AQTE9JWXD3HWTTZ46TTU9'
-  REACT_APP_LAST_CACHE_UPDATE='1587733935'
+  REACT_APP_LAST_CACHE_UPDATE='1591122639'
+  REACT_APP_CACHE_FORCE_UPDATE='1591122639'
   REACT_APP_HOME_DATA_TTL='5'
diff --git a/src/containers/App/index.tsx b/src/containers/App/index.tsx
@@ -33,21 +33,28 @@ const items = [
 ]
 
 const LAST_CACHE_UPDATE = process.env.REACT_APP_LAST_CACHE_UPDATE || 0
+const CACHE_FORCE_UPDATE = process.env.REACT_APP_CACHE_FORCE_UPDATE || 0
 
 function App() {
   const [cacheInitialized, setCacheInitialized] = useState(false)
   const { data, ...result } = useQuery(GOVERNANCE_INFO_QUERY)
 
   useEffect(() => {
-    store.getItem<any>('last-update').then(value => {
-      if (!value || isBefore(fromUnixTime(value), fromUnixTime(Number(LAST_CACHE_UPDATE)))) {
+    Promise.all([store.getItem<any>('last-update'), store.getItem<any>('forced-update')]).then(([last, forced]) => {
+      if (
+        !last ||
+        isBefore(fromUnixTime(last), fromUnixTime(Number(LAST_CACHE_UPDATE))) ||
+        !forced ||
+        isBefore(fromUnixTime(forced), fromUnixTime(Number(CACHE_FORCE_UPDATE)))
+      ) {
         import(`../../data/maker-governance-${LAST_CACHE_UPDATE}.json`).then(data => {
           Promise.all(
             Object.keys(data.default).map(key => {
               return store.setItem(key, data.default[key])
             }),
           ).then(() => {
             store.setItem('last-update', (Date.now() / 1000).toFixed(0))
+            store.setItem('forced-update', (Date.now() / 1000).toFixed(0))
             setCacheInitialized(true)
           })
         })