Merge pull request #1 from Saamu192/develop

Develop

Author: Saamu192

.gitignore

@@ -1,2 +1,5 @@
 node_modules
-yarn.lock
+yarn.lock
+coverage
+.nyc_output
+.reify-cache

.nycrc.json

@@ -0,0 +1,8 @@
+{
+  "branches": 100,
+  "lines": 100,
+  "functions": 100,
+  "statements": 100,
+  "checkCoverage": true,
+  "reporter": ["html", "text"]
+}

database.json

@@ -1,9 +1,22 @@
 [
   {
     "id": 1,
-    "vehicles": ["Motocicleta", "Carro", "Caminhão"],
+    "vehicles": [
+      "Motocicleta",
+      "Carro",
+      "Caminhão"
+    ],
     "kmTraveled": 10000,
     "from": "2009-01-01",
     "to": "2020-11-26"
+  },
+  {
+    "id": "2",
+    "vehicles": [
+      "aviao"
+    ],
+    "kmTraveled": "2000",
+    "from": "2022-02-02",
+    "to": "2022-06-06"
   }
-]
+]

package.json

@@ -6,14 +6,21 @@
   "author": "Saamu192 <samuelpr192@gmail.com>",
   "license": "MIT",
   "scripts": {
-    "dev": "npx nodemon --ignore database.json --exec node --experimental-json-modules src/index.js"
+    "dev": "npx nodemon --ignore database.json --exec node --experimental-json-modules --experimental-top-level-await  src/index.js",
+    "test": "npx mocha -w --parallel test/*.test.js",
+    "test:cov": "npx nyc npx mocha -r reify --parallel test/*.test.js"
   },
   "dependencies": {
     "chalk": "^5.1.2",
     "chalk-table": "^1.0.2",
     "draftlog": "^1.0.13"
   },
   "devDependencies": {
-    "nodemon": "^2.0.20"
+    "chai": "^4.2.0",
+    "mocha": "^8.2.1",
+    "nodemon": "^2.0.6",
+    "nyc": "^15.1.0",
+    "reify": "^0.20.12",
+    "sinon": "^9.2.1"
   }
 }

src/index.js

@@ -1,34 +1,31 @@
-import DraftLog from "draftlog";
-import chalk from "chalk";
-import chalkTable from "chalk-table";
-import readline from "readline";
 import database from "./../database.json" assert { type: "json" };
 import Person from "./persons.js";
+import { save } from "./repository.js";
+import TerminalController from "./terminal.controller.js";
 
-DraftLog(console).addLineListener(process.stdin);
+const DEFAULT_LANG = "pt-BR";
+const STOP_TERM = ":q";
 
-const options = {
-  leftPad: 2,
-  columns: [
-    { field: "id", name: chalk.cyan("ID") },
-    { field: "vehicles", name: chalk.magenta("vehicles") },
-    { field: "kmTraveled", name: chalk.green("km Traveled") },
-    { field: "from", name: chalk.cyan("From") },
-    { field: "to", name: chalk.cyan("To") },
-  ],
-};
+const terminalController = new TerminalController();
+terminalController.initializeTerminal(database, DEFAULT_LANG);
 
-const table = chalkTable(
-  options,
-  database.map((element) => new Person(element).formatted())
-);
-const print = console.draft(table);
+async function mainLoop() {
+  try {
+    const answer = await terminalController.question();
+    if (answer === STOP_TERM) {
+      terminalController.closeTerminal();
+      console.log("process finished!");
+      return;
+    }
+    const person = Person.generateInstanceFromString(answer);
+    terminalController.updateTable(person.formatted(DEFAULT_LANG));
+    await save(person);
 
-const terminal = readline.createInterface({
-  input: process.stdin,
-  output: process.stdout,
-});
+    return mainLoop();
+  } catch (error) {
+    console.error("DEU RUIM**", error);
+    return mainLoop();
+  }
+}
 
-// terminal.question("Qual é o seu nome?", (msg) => {
-//   console.log("msg", msg.toString());
-// });
+await mainLoop();

src/persons.js

@@ -34,4 +34,17 @@ export default class Person {
       }).format(mapDate(this.to)),
     };
   }
+
+  static generateInstanceFromString(text) {
+    const EMPTY_SPACE = " ";
+    const [id, vehicles, kmTraveled, from, to] = text.split(EMPTY_SPACE);
+    const person = new Person({
+      id,
+      from,
+      kmTraveled,
+      to,
+      vehicles: vehicles.split(","),
+    });
+    return person;
+  }
 }

src/repository.js

@@ -0,0 +1,8 @@
+import { writeFile, readFile } from "fs/promises";
+
+export const save = async (data) => {
+  const currentData = JSON.parse(await readFile("./database.json"));
+  currentData.push(data);
+
+  await writeFile("./database.json", JSON.stringify(currentData, null, 2));
+};

src/terminal.controller.js

@@ -0,0 +1,57 @@
+import DraftLog from "draftlog";
+import chalk from "chalk";
+import chalkTable from "chalk-table";
+import readline from "readline";
+import Person from "./persons.js";
+
+export default class TerminalController {
+  constructor() {
+    this.print = {};
+    this.data = {};
+  }
+
+  initializeTerminal(database, language) {
+    DraftLog(console).addLineListener(process.stdin);
+    this.terminal = readline.createInterface({
+      input: process.stdin,
+      output: process.stdout,
+    });
+
+    this.initializeTable(database, language);
+  }
+
+  initializeTable(database, language) {
+    const data = database.map((element) =>
+      new Person(element).formatted(language)
+    );
+    const table = chalkTable(this.getTableOptions(), data);
+    this.print = console.draft(table);
+    this.data = data;
+  }
+
+  updateTable(item) {
+    this.data.push(item);
+    this.print(chalkTable(this.getTableOptions(), this.data));
+  }
+
+  question(msg = "") {
+    return new Promise((resolve) => this.terminal.question(msg, resolve));
+  }
+
+  closeTerminal() {
+    this.terminal.close();
+  }
+
+  getTableOptions() {
+    return {
+      leftPad: 2,
+      columns: [
+        { field: "id", name: chalk.cyan("ID") },
+        { field: "vehicles", name: chalk.magenta("vehicles") },
+        { field: "kmTraveled", name: chalk.green("km Traveled") },
+        { field: "from", name: chalk.cyan("From") },
+        { field: "to", name: chalk.cyan("To") },
+      ],
+    };
+  }
+}

test/person.test.js

@@ -0,0 +1,42 @@
+import mocha from "mocha";
+const { describe, it } = mocha;
+import chai from "chai";
+const { expect } = chai;
+import Person from "../src/persons.js";
+
+describe("Person", () => {
+  it("should return a person instance from a string", () => {
+    const person = Person.generateInstanceFromString(
+      "1 Bike,Carro 20000 2020-01-01 2020-02-01"
+    );
+    const expected = {
+      from: "2020-01-01",
+      to: "2020-02-01",
+      vehicles: ["Bike", "Carro"],
+      kmTraveled: "20000",
+      id: "1",
+    };
+
+    expect(person).to.be.deep.equal(expected);
+  });
+
+  it("should format values", () => {
+    const person = new Person({
+      from: "2020-01-01",
+      to: "2020-02-01",
+      vehicles: ["Bike", "Carro"],
+      kmTraveled: "20000",
+      id: "1",
+    });
+
+    const result = person.formatted("pt-BR");
+    const expected = {
+      id: 1,
+      vehicles: "Bike e Carro",
+      kmTraveled: "20.000 km",
+      from: "01 de janeiro de 2020",
+      to: "01 de fevereiro de 2020",
+    };
+    expect(result).to.be.deep.equal(expected);
+  });
+});