From c9f9532a1c63aaafd8a76a27a5bb335182c1dce4 Mon Sep 17 00:00:00 2001
From: Asa <26807394+a01sa01to@users.noreply.github.com>
Date: Tue, 4 May 2021 10:20:03 +0900
Subject: [PATCH] =?UTF-8?q?Update:=20=E3=83=AD=E3=83=BC=E3=83=A9=E3=83=BC?=
 =?UTF-8?q?=E4=BD=9C=E6=88=A6=E3=81=AEChartData=E7=94=9F=E6=88=90=E3=82=92?=
 =?UTF-8?q?=E5=85=B1=E9=80=9A=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 components/roller/Mito.vue            | 37 ++++---------------
 components/roller/TsuchiuraSakura.vue | 37 ++++---------------
 components/roller/TsukubaAmakubo.vue  | 37 ++++---------------
 utils/formatRollerInspection.ts       | 51 +++++++++++++++++++++++++++
 4 files changed, 69 insertions(+), 93 deletions(-)
 create mode 100644 utils/formatRollerInspection.ts

diff --git a/components/roller/Mito.vue b/components/roller/Mito.vue
index a9c295424e3..aabb9500993 100644
--- a/components/roller/Mito.vue
+++ b/components/roller/Mito.vue
@@ -39,11 +39,10 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import DataView from '@/components/DataView.vue'
 import RollerChart from '@/components/RollerChart.vue'
 import Data from '@/data/roller/mito.json'
+import formatRollerInspection from '@/utils/formatRollerInspection'
 
 export default {
   components: {
@@ -51,35 +50,11 @@ export default {
     RollerChart,
   },
   data() {
-    // 検査陽性者の状況
-    const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
-
-    const data = Data.data
-    const today = new Date()
-    const chartDataAccept = []
-    const chartDataCollect = []
-    let acSum = 0
-    let coSum = 0
-    data
-      .filter((d) => new Date(d.date) < today)
-      .forEach((d) => {
-        const date = new Date(d.date)
-        if (!isNaN(d.accept) && !isNaN(d.collect)) {
-          acSum += d.accept
-          coSum += d.collect
-          chartDataAccept.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.accept,
-            cumulative: acSum,
-          })
-          chartDataCollect.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.collect,
-            cumulative: coSum,
-          })
-        }
-      })
-
+    const {
+      chartDataAccept,
+      chartDataCollect,
+      updatedAt,
+    } = formatRollerInspection(Data)
     return {
       Data,
       chartDataAccept,
diff --git a/components/roller/TsuchiuraSakura.vue b/components/roller/TsuchiuraSakura.vue
index 10f09188748..6cd1b4279c0 100644
--- a/components/roller/TsuchiuraSakura.vue
+++ b/components/roller/TsuchiuraSakura.vue
@@ -39,11 +39,10 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import DataView from '@/components/DataView.vue'
 import RollerChart from '@/components/RollerChart.vue'
 import Data from '@/data/roller/tsuchiuraSakura.json'
+import formatRollerInspection from '@/utils/formatRollerInspection'
 
 export default {
   components: {
@@ -51,35 +50,11 @@ export default {
     RollerChart,
   },
   data() {
-    // 検査陽性者の状況
-    const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
-
-    const data = Data.data
-    const today = new Date()
-    const chartDataAccept = []
-    const chartDataCollect = []
-    let acSum = 0
-    let coSum = 0
-    data
-      .filter((d) => new Date(d.date) < today)
-      .forEach((d) => {
-        const date = new Date(d.date)
-        if (!isNaN(d.accept) && !isNaN(d.collect)) {
-          acSum += d.accept
-          coSum += d.collect
-          chartDataAccept.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.accept,
-            cumulative: acSum,
-          })
-          chartDataCollect.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.collect,
-            cumulative: coSum,
-          })
-        }
-      })
-
+    const {
+      chartDataAccept,
+      chartDataCollect,
+      updatedAt,
+    } = formatRollerInspection(Data)
     return {
       Data,
       chartDataAccept,
diff --git a/components/roller/TsukubaAmakubo.vue b/components/roller/TsukubaAmakubo.vue
index b3597d1f5ac..c329c4f54cb 100644
--- a/components/roller/TsukubaAmakubo.vue
+++ b/components/roller/TsukubaAmakubo.vue
@@ -39,11 +39,10 @@
 </template>
 
 <script>
-import dayjs from 'dayjs'
-
 import DataView from '@/components/DataView.vue'
 import RollerChart from '@/components/RollerChart.vue'
 import Data from '@/data/roller/tsukubaAmakubo.json'
+import formatRollerInspection from '@/utils/formatRollerInspection'
 
 export default {
   components: {
@@ -51,35 +50,11 @@ export default {
     RollerChart,
   },
   data() {
-    // 検査陽性者の状況
-    const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
-
-    const data = Data.data
-    const today = new Date()
-    const chartDataAccept = []
-    const chartDataCollect = []
-    let acSum = 0
-    let coSum = 0
-    data
-      .filter((d) => new Date(d.date) < today)
-      .forEach((d) => {
-        const date = new Date(d.date)
-        if (!isNaN(d.accept) && !isNaN(d.collect)) {
-          acSum += d.accept
-          coSum += d.collect
-          chartDataAccept.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.accept,
-            cumulative: acSum,
-          })
-          chartDataCollect.push({
-            label: `${date.getMonth() + 1}/${date.getDate()}`,
-            transition: d.collect,
-            cumulative: coSum,
-          })
-        }
-      })
-
+    const {
+      chartDataAccept,
+      chartDataCollect,
+      updatedAt,
+    } = formatRollerInspection(Data)
     return {
       Data,
       chartDataAccept,
diff --git a/utils/formatRollerInspection.ts b/utils/formatRollerInspection.ts
new file mode 100644
index 00000000000..ddd510e68de
--- /dev/null
+++ b/utils/formatRollerInspection.ts
@@ -0,0 +1,51 @@
+import dayjs from 'dayjs'
+type DataType = {
+  date: string
+  nowTotal: { ac: number; co: number }
+  data: { date: string; accept: number; collect: number }[]
+}
+type ChartDataType = {
+  label: string
+  transition: number
+  cumulative: number
+}[]
+export default (Data: DataType) => {
+  // 検査陽性者の状況
+  const updatedAt = dayjs(Data.date).format('YYYY/MM/DD HH:mm')
+
+  const data = Data.data
+  const today = new Date()
+  const chartDataAccept: ChartDataType = []
+  const chartDataCollect: ChartDataType = []
+  let acSum = 0
+  let coSum = 0
+  data
+    .filter((d) => new Date(d.date) < today)
+    .forEach((d) => {
+      const date = new Date(d.date)
+      if (!isNaN(d.accept) && !isNaN(d.collect)) {
+        acSum += d.accept
+        coSum += d.collect
+        chartDataAccept.push({
+          label: `${date.getFullYear()}/${
+            date.getMonth() + 1
+          }/${date.getDate()}`,
+          transition: d.accept,
+          cumulative: acSum,
+        })
+        chartDataCollect.push({
+          label: `${date.getFullYear()}/${
+            date.getMonth() + 1
+          }/${date.getDate()}`,
+          transition: d.collect,
+          cumulative: coSum,
+        })
+      }
+    })
+
+  return {
+    chartDataAccept,
+    chartDataCollect,
+    updatedAt,
+  }
+}