chore: Change data source to API repo

.gitignore

@@ -70,6 +70,7 @@ public
 
 # Data API build directory
 _data
+_api
 
 # Storybook build
 storybook-static

gatsby-config.js

@@ -110,14 +110,14 @@ const gatsbyConfig = {
     {
       resolve: 'gatsby-source-covid-tracking-api',
       options: {
-        file: './src/data/race/race-ethnicity-combined.json',
+        file: './_api/v1/race/states-combined.json',
         type: 'CovidRaceDataCombined',
       },
     },
     {
       resolve: 'gatsby-source-covid-tracking-api',
       options: {
-        file: './src/data/race/race-ethnicity-separate.json',
+        file: './_api/v1/race/states-separate.json',
         type: 'CovidRaceDataSeparate',
       },
     },

package.json

@@ -126,8 +126,8 @@
     "set-tz": "^0.2.0"
   },
   "scripts": {
-    "build": "run-s build:fetch build:gatsby build:data build:data-archive build:test",
-    "build-preview": "run-s setup:api-data build:gatsby build:data build:data-archive build:test",
+    "build": "run-s build:fetch setup:api-repo build:gatsby build:data build:data-archive build:test",
+    "build-preview": "run-s setup:api-data setup:api-repo build:gatsby build:data build:data-archive build:test",
     "build:fetch": "node build/index.js",
     "build:gatsby": "gatsby build",
     "build:data": "cp -R _data/* public/api/",
@@ -151,6 +151,7 @@
     "test:api-post-build": "jest  --config=\"{}\" --testPathPattern=./build/__tests__/post-build/",
     "setup": "run-s setup:api-data setup:env-vars",
     "setup:api-data": "curl https://covidtracking.com/api/archive.tar.gz | tar -xz",
-    "setup:env-vars": "curl -L https://covidtracking.com/__developer/env-vars > .env"
+    "setup:env-vars": "curl -L https://covidtracking.com/__developer/env-vars > .env",
+    "setup:api-repo": "git clone --depth 1 https://github.com/COVID19Tracking/covid-public-api.git _api"
   }
 }

src/components/pages/race/dashboard/states.js

@@ -8,59 +8,34 @@ import statesStyle from './states.module.scss'
 export default () => {
   const data = useStaticQuery(graphql`
     query {
-      allCovidRaceDataCombined(sort: { fields: name }) {
+      allCovidRaceDataCombined(sort: { fields: stateName }) {
         nodes {
           id
-          aianANHPINotes
-          aianDeaths
-          aianDeathNotes
-          aianDeathDispFlag
-          aianDeathCaution
-          asianDeathNotes
-          asianDeathDispFlag
-          asianDeathCaution
-          asianANHPINotes
-          aianPositives
-          aianPosNotes
-          aianPosDispFlag
-          aianPosCaution
-          aianPctPos
-          aianPctPop
-          aianPctDeath
-          blackPositives
-          blackPosNotes
-          blackPosDispFlag
-          blackPosCaution
-          blackPctPos
-          blackPctPop
-          blackPctDeath
-          blackDeaths
-          blackDeathNotes
-          blackDeathDispFlag
-          blackDeathCaution
-          blackANHPINotes
-          asianPositives
-          asianPosNotes
-          asianPosDispFlag
-          asianPosCaution
-          asianPctPos
-          asianPctPop
-          asianPctDeath
-          asianDeaths
-          knownRaceEthDeath
-          knownRaceEthPos
-          latinXANHPINotes
-          latinXDeathCaution
-          latinXDeathDispFlag
-          latinXDeathNotes
-          latinXPositives
-          latinXPosNotes
-          latinXPosDispFlag
-          latinXPosCaution
-          latinXPctPos
-          latinXPctPop
-          latinXPctDeath
-          latinXDeaths
+          name: stateName
+          state
+          whitePositives
+          whitePosDispFlag
+          whitePosCaution
+          whitePctPos
+          whitePctPop
+          whitePctDeath
+          whiteDeaths
+          whiteDeathDispFlag
+          whiteDeathCaution
+          unknownRaceEthPos
+          unknownRaceEthDeath
+          twoPositives
+          twoPosNotes
+          twoPosDispFlag
+          twoPosCaution
+          twoPctPos
+          twoPctPop
+          twoPctDeath
+          twoDeaths
+          twoDeathNotes
+          twoDeathDispFlag
+          twoDeathCaution
+          stateName
           state
           otherPositives
           otherPosNotes
@@ -73,7 +48,6 @@ export default () => {
           otherDeathNotes
           otherDeathDispFlag
           otherDeathCaution
-          otherANHPINotes
           nhpiPositives
           nhpiPosNotes
           nhpiPosDispFlag
@@ -86,61 +60,72 @@ export default () => {
           nhpiDeathDispFlag
           nhpiDeathCaution
           nhpiANHPINotes
-          whitePositives
-          whitePosNotes
-          whitePosDispFlag
-          whitePosCaution
-          whitePctPos
-          whitePctPop
-          whitePctDeath
-          whiteDeaths
-          whiteDeathNotes
-          whiteDeathDispFlag
-          whiteDeathCaution
-          whiteANHPINotes
-          unknownRaceEthPos
-          unknownRaceEthDeath
-          twoPositives
-          twoPosNotes
-          twoPosDispFlag
-          twoPosCaution
-          twoPctPos
-          twoPctPop
-          twoPctDeath
-          twoDeaths
-          twoDeathNotes
-          twoDeathDispFlag
-          twoDeathCaution
-          twoANHPINotes
-          name
+          latinXPositives
+          latinXPosDispFlag
+          latinXPosCaution
+          latinXPctPos
+          latinXPctPop
+          latinXPctDeath
+          latinXDeaths
+          latinXDeathDispFlag
+          latinXDeathCaution
+          knownRaceEthPos
+          knownRaceEthDeath
+          blackPositives
+          blackPosDispFlag
+          blackPosCaution
+          blackPctPos
+          blackPctPop
+          blackPctDeath
+          blackDeaths
+          blackDeathDispFlag
+          blackDeathCaution
+          asianPositives
+          asianPosNotes
+          asianPosDispFlag
+          asianPosCaution
+          asianPctPos
+          asianPctPop
+          asianPctDeath
+          asianDeaths
+          asianDeathNotes
+          asianDeathDispFlag
+          asianDeathCaution
+          asianANHPINotes
+          aianPositives
+          aianPosNotes
+          aianPosDispFlag
+          aianPosCaution
+          aianPctPos
+          aianPctPop
+          aianPctDeath
+          aianDeaths
+          aianDeathNotes
+          aianDeathDispFlag
+          aianDeathCaution
         }
       }
-      allCovidRaceDataSeparate(sort: { fields: name }) {
+      allCovidRaceDataSeparate(sort: { fields: stateName }) {
         nodes {
-          name
-          whitePosNotes
+          id
+          state
+          name: stateName
           whitePositives
-          whiteSpecialCaseNotes
           whitePosDispFlag
           whitePosCaution
           whitePctPos
           whitePctPop
           whitePctDeath
           whiteDeaths
-          whiteDeathNotes
           whiteDeathDispFlag
           whiteDeathCaution
-          whiteANHPIPosNotes
-          whiteANHPIDeathNotes
           unknownRacePos
-          unknownRaceEthDeath
           unknownRaceDeath
           unknownEthPos
           unknownEthDeath
-          twoSpecialCaseNotes
           twoPositives
-          twoPosDispFlag
           twoPosNotes
+          twoPosDispFlag
           twoPosCaution
           twoPctPos
           twoPctPop
@@ -149,10 +134,6 @@ export default () => {
           twoDeathNotes
           twoDeathDispFlag
           twoDeathCaution
-          twoANHPIPosNotes
-          twoANHPIDeathNotes
-          state
-          otherSpecialCaseNotes
           otherPositives
           otherPosNotes
           otherPosDispFlag
@@ -164,83 +145,50 @@ export default () => {
           otherDeathNotes
           otherDeathDispFlag
           otherDeathCaution
-          otherANHPIPosNotes
-          otherANHPIDeathNotes
-          nonhispanicSpecialCaseNotes
           nonhispanicPositives
-          nonhispanicPosNotes
           nonhispanicPosDispFlag
           nonhispanicPosCaution
           nonhispanicPctPos
           nonhispanicPctPop
           nonhispanicPctDeath
           nonhispanicDeaths
-          nonhispanicDeathNotes
           nonhispanicDeathDispFlag
           nonhispanicDeathCaution
-          nonhispanicANHPIPosNotes
-          nonhispanicANHPIDeathNotes
-          nhpiSpecialCaseNotes
           nhpiPositives
           nhpiPosNotes
           nhpiPosDispFlag
           nhpiPosCaution
-          nhpiPctPop
           nhpiPctPos
+          nhpiPctPop
           nhpiPctDeath
           nhpiDeaths
           nhpiDeathNotes
           nhpiDeathDispFlag
           nhpiDeathCaution
-          nhpiANHPIDeathNotes
           nhpiANHPIPosNotes
-          latinXSpecialCaseNotes
+          nhpiANHPIDeathNotes
           latinXPositives
-          latinXPosNotes
           latinXPosDispFlag
           latinXPosCaution
           latinXPctPos
           latinXPctPop
           latinXPctDeath
           latinXDeaths
-          latinXDeathNotes
           latinXDeathDispFlag
           latinXDeathCaution
-          latinXANHPIPosNotes
-          latinXANHPIDeathNotes
           knownRacePos
+          knownRaceDeath
           knownEthPos
           knownEthDeath
-          blackSpecialCaseNotes__1
-          id
-          blackSpecialCaseNotes
-          blackPositives__1
           blackPositives
-          blackPosNotes__1
-          blackPosNotes
-          blackPosDispFlag__1
           blackPosDispFlag
-          blackPosCaution__1
           blackPosCaution
-          blackPctPos__1
           blackPctPos
-          blackPctPop__1
           blackPctPop
-          blackPctDeath__1
           blackPctDeath
-          blackDeaths__1
           blackDeaths
-          blackDeathNotes__1
-          blackDeathNotes
-          blackDeathDispFlag__1
           blackDeathDispFlag
-          blackDeathCaution__1
           blackDeathCaution
-          blackANHPIPosNotes__1
-          blackANHPIPosNotes
-          blackANHPIDeathNotes__1
-          blackANHPIDeathNotes
-          asianSpecialCaseNotes
           asianPositives
           asianPosNotes
           asianPosDispFlag
@@ -254,7 +202,6 @@ export default () => {
           asianDeathCaution
           asianANHPIPosNotes
           asianANHPIDeathNotes
-          aianSpecialCaseNotes
           aianPositives
           aianPosNotes
           aianPosDispFlag
@@ -266,8 +213,6 @@ export default () => {
           aianDeathNotes
           aianDeathDispFlag
           aianDeathCaution
-          aianANHPIPosNotes
-          aianANHPIDeathNotes
         }
       }
     }

src/pages/race/dashboard.js

@@ -54,13 +54,13 @@ export const query = graphql`
     }
     allCovidRaceDataSeparate {
       nodes {
-        name
+        name: stateName
         state
       }
     }
     allCovidRaceDataCombined {
       nodes {
-        name
+        name: stateName
         state
       }
     }