Merge pull request #353 from CodeForNagasaki/development

#352 直近のデータから取得できるようにパラメータにソートを追加
CodeForNagasaki · Aug 25, 2021 · a3dac3f · a3dac3f
2 parents 0012252 + 863e823
commit a3dac3f
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 12 deletions.
diff --git a/pages/cards/_card.vue b/pages/cards/_card.vue
@@ -151,7 +151,7 @@ export default {
   },
   async mounted() {
     // 動的に最新情報を取得する
-    await this.$store.dispatch('GET_BODIK_JSONP')
+    // await this.$store.dispatch('GET_BODIK_JSONP')
   },
   head() {
     const url = 'https://nagasaki.stopcovid19.jp'

diff --git a/pages/index.vue b/pages/index.vue
@@ -103,7 +103,7 @@ export default Vue.extend({
   async mounted() {
     // 動的に最新情報を取得する
     await sleep(50)
-    await this.$store.dispatch('GET_BODIK_JSONP')
+    // await this.$store.dispatch('GET_BODIK_JSONP')
   },
   head(): MetaInfo {
     return {

diff --git a/services/bodikApi.js b/services/bodikApi.js
@@ -13,21 +13,24 @@ const nagasakiOtherInfoId = '438f03f1-0ee8-466d-a5d9-e874f5367507'
 
 // Bodikからのデータ取得上限
 const limit = 10000
+const sort = '_id desc'
 
 export const fetchNagasakiPrefectureTestedCases = () =>
-  callFetchJsonp(baseUrl, nagasakiPrefectureTestedCasesId, { limit })
+  callFetchJsonp(baseUrl, nagasakiPrefectureTestedCasesId, { limit, sort })
 export const fetchNagasakiPrefectureConfirmedCases = () =>
-  callFetchJsonp(baseUrl, nagasakiPrefectureConfirmedCasesId, { limit })
+  callFetchJsonp(baseUrl, nagasakiPrefectureConfirmedCasesId, { limit, sort })
 export const fetchNagasakiCityNews = () =>
   callFetchJsonp(baseUrl, nagasakiCityNewsId, { limit })
 export const fetchNagasakiOtherInfo = () =>
   callFetchJsonp(baseUrl, nagasakiOtherInfoId, { limit })
 
 export const axiosNagasakiPrefectureTestedCases = axios =>
-  axios.$get(baseUrl + nagasakiPrefectureTestedCasesId, { params: { limit } })
+  axios.$get(baseUrl + nagasakiPrefectureTestedCasesId, {
+    params: { limit, sort }
+  })
 export const axiosNagasakiPrefectureConfirmedCases = axios =>
   axios.$get(baseUrl + nagasakiPrefectureConfirmedCasesId, {
-    params: { limit }
+    params: { limit, sort }
   })
 export const axiosNagasakiCityNews = axios =>
   axios.$get(baseUrl + nagasakiCityNewsId, { params: { limit } })

diff --git a/store/index.js b/store/index.js
@@ -108,15 +108,19 @@ export const actions = {
     try {
       const result1 = await bodikApi.axiosNagasakiPrefectureTestedCases($axios)
       // console.log(result1, 'result1')
-      if (result1.result.records)
-        commit('setPrefectureTestedCases', result1.result.records)
+      if (result1.result.records) {
+        const result = result1.result.records.reverse()
+        commit('setPrefectureTestedCases', result)
+      }
 
       const result2 = await bodikApi.axiosNagasakiPrefectureConfirmedCases(
         $axios
       )
       // console.log(result2, 'result2')
-      if (result2.result.records)
-        commit('PrefectureConfirmedCases', result2.result.records)
+      if (result2.result.records) {
+        const result = result2.result.records.reverse()
+        commit('PrefectureConfirmedCases', result)
+      }
 
       const newsRes = await bodikApi.axiosNagasakiCityNews($axios)
       if (newsRes.result.records)
@@ -141,12 +145,18 @@ export const actions = {
       // 長崎県新型コロナウイルス感染症検査実施数のロード
       const result1 = await bodikApi.fetchNagasakiPrefectureTestedCases()
       // console.log(result1, 'fetchNagasakiPrefectureTestedCases')
-      if (result1.records) commit('setPrefectureTestedCases', result1.records)
+      if (result1.records) {
+        const result = result1.records.reverse()
+        commit('setPrefectureTestedCases', result)
+      }
 
       // 長崎県新型コロナウイルス感染症陽性患者発表情報のロード
       await sleep(500)
       const result2 = await bodikApi.fetchNagasakiPrefectureConfirmedCases()
-      if (result2.records) commit('PrefectureConfirmedCases', result2.records)
+      if (result2.records) {
+        const result = result2.recordsreverse()
+        commit('PrefectureConfirmedCases', result)
+      }
 
       await sleep(500)
       const newsRes = await bodikApi.fetchNagasakiCityNews()