wip: Atualizar para 19 de novembro de 2020

emilianoeloi · Nov 21, 2020 · 0fd954f · 0fd954f
1 parent c442689
commit 0fd954f
Show file tree

Hide file tree

Showing 13 changed files with 3,421 additions and 3,433 deletions.
diff --git a/BD/COVID-19 b/BD/COVID-19
diff --git a/README.md b/README.md
@@ -10,7 +10,7 @@ Eu tive um derrame cerebral (AVE-He) que comprometeu uma parte do meu cérebro o
 
 ## Gráfico
 
-![confirmados](confirmados_2020-10-27_France_Germany.png)
+![confirmados](images/confirmados_2020-11-19_US_France_Italy.png)
 
 Confirmados pelo COVID-19 pelo período x confirmados.
 
@@ -23,6 +23,22 @@ Confirmados pelo COVID-19 pelo período x confirmados.
 
 ## Configurações
 
+0. Dados pra testar
+
+```javascript
+/// loadTest.js
+
+const loadTest = new Load(
+    [
+        us,
+        france,
+        italy
+    ],
+    new Date("2020-05-01T00:00:00.000"),
+    new Date("2020-11-19T23:59:59.999")
+)
+```
+
 1. Instalar o projeto
 ```shell
 # make install

diff --git a/confirmados_2020-10-27_France_Germany.png → ...confirmados_2020-10-27_France_Germany.png b/confirmados_2020-10-27_France_Germany.png → ...confirmados_2020-10-27_France_Germany.png
diff --git a/images/confirmados_2020-11-19_US_France_Italy.png b/images/confirmados_2020-11-19_US_France_Italy.png
diff --git a/integrate/__tests__/getCSVReportFiles.test.js b/integrate/__tests__/getCSVReportFiles.test.js
@@ -2,22 +2,21 @@ const getCSVReportFiles = require('../getCSVReportFiles.js')
 const Country = require('../Country.js');
 
 describe('Obeter os relatórios de confirmados', () => {
-    const defaultPath = "./312"
-    const start = new Date("2020-01-22T00:00:00.000")
-    const finish = new Date("2020-01-23T23:59:59.999")
+    const defaultPath = "./__mocks__"
+    const start = new Date("2020-07-03T00:00:00.000")
+    const finish = new Date("2020-07-04T23:59:59.999")
     const countryGroup = [
         new Country("peru", "Peru", "#000"),
         new Country("brazil", "Brazil", "#111")
     ]
 
-    test('Testando os dados do Brazil', done =>  {
+    test('Testando os dados do Brazil', () => {
         getCSVReportFiles(
             defaultPath,
             start,
             finish,
             countryGroup
         )
         expect(b[1].name).toBe('Brazil')
-        done()
     })
 })
diff --git a/integrate/getCSVReportFiles.js b/integrate/getCSVReportFiles.js
@@ -9,7 +9,7 @@ const {
    saveCountriesDataPromise
 } = require('./saveCountriesData.js')
 const {
-   whiteFilePromise
+   writeFilePromise
 } = require('./writeFile.js')
 
 const getCSVReportFiles = function(
@@ -28,21 +28,28 @@ const getCSVReportFiles = function(
 
       readPromise(fileCSV, countryGroup)
       .then((data) => {
-         console.info("readPromise ✨")
          return setStorageCountriesPromise(data)
       })
+      .catch((err) => {
+         console.info("readPromise 🚨", err)
+      })
+
       .then((data) => {
-         console.info("setStorageCountriesPromise ✨")
          return saveCountriesDataPromise(data)
       })
+      .catch((err) => {
+         console.info("saveCountriesDataPromise 🚨", err)
+      })
+
       .then((data) => {
-         console.info("whiteFile ✨")
-         return whiteFilePromise(data)
+         return writeFilePromise(data)
       })
       .catch((err) => {
-         console.info("readPromise, setStorageCountriesPromise, whiteFile, whiteFile 🚨", err)
+         console.info("whiteFile, whiteFile 🚨", err)
       })
 
+      .finally((err) => { })
+
       // readFileCB(fileCSV, countryGroup, saveCountriesData, writeFileCB)   
 
       var newDate = loop.setDate(loop.getDate() + 1);

diff --git a/integrate/loadTest.js b/integrate/loadTest.js
@@ -22,10 +22,12 @@ const us = new Country("us", "US", "#3C3B6E")
 
 const loadTest = new Load(
     [
-        brazil
+        us,
+        france,
+        italy
     ],
-    new Date("2020-07-03T00:00:00.000"),
-    new Date("2020-07-04T23:59:59.999")
+    new Date("2020-05-01T00:00:00.000"),
+    new Date("2020-11-19T23:59:59.999")
 )
 
 module.exports = loadTest;
diff --git a/integrate/readFile.js b/integrate/readFile.js
@@ -44,7 +44,6 @@ var read = function(csvFile, countryGroup, saveCountriesDataCB, writeFileCB) {
  }
 
  module.exports = {
-     read,
      readPromise,
      getFileName,
      getFileDate,

diff --git a/integrate/saveCountriesData.js b/integrate/saveCountriesData.js
@@ -19,16 +19,6 @@ const dbCovid19 = function(countryFile, cases) {
    process.env.GLOBAL_COVID_19 = JSON.stringify(globalCovid19)
 }
 
-function saveCountriesData(countriesData, writeFileCB) {
-   const constries = Object.values(countriesData);
-   constries.forEach(function(value, key) {
-      var countryFile = Object.keys(countriesData)[key];
-      dbCovid19(countryFile, value)
-   })
-   process.env.COUNT = parseInt(process.env.COUNT) - 1
-   writeFileCB()
-}
-
 function saveCountriesDataPromise(countriesData) {
    return new Promise((resolve, reject) => {
       try {
@@ -46,6 +36,5 @@ function saveCountriesDataPromise(countriesData) {
 }
 
 module.exports = {
-   saveCountriesData,
    saveCountriesDataPromise
 }
diff --git a/integrate/writeFile.js b/integrate/writeFile.js
@@ -44,13 +44,6 @@ const writeIntegrateFile = function(countries) {
     })
 }
 
-const writeFile = function() {
-    if (parseInt(process.env.COUNT) == 0) {
-        const countriesData = JSON.parse(process.env.GLOBAL_COVID_19)
-        writeCountryFile(countriesData);
-    }
-}
-
 const writeFilePromise = function() {
     return new Promise((resolve, reject) => {
         try {
@@ -66,7 +59,6 @@ const writeFilePromise = function() {
 }
 
 module.exports = {
-    writeFile,
     writeFilePromise,
     writeIntegrateFile,
     writeCountryFilePromise