Merge pull request #18 from fga-eps-mds/fix_return_data_language

Fix : retorno de dados da lingua
fga-eps-mds · Oct 3, 2021 · 1e4cc83 · 1e4cc83
2 parents e6e00fd + d1435e0
commit 1e4cc83
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 5 deletions.
diff --git a/src/__tests__/units/Lingua/index.js b/src/__tests__/units/Lingua/index.js
@@ -35,20 +35,20 @@ describe("\n## TESTES LINGUA\n", () => {
       await modelLingua.editById({ nome: "Aikanã" }, 1);
       const lingua = await modelLingua.searchById(1);
       expect(lingua).toMatchObject({
-        id_conteudo: 3,
         id_lingua: 1,
-        id_tronco: null,
+        id_conteudo: 3,
         nome: "Aikanã",
+        tronco: null,
       });
     });
     it("Atualizando lingua, com o metodo editById(2) na tupla de ID = 2", async () => {
       await modelLingua.editById({ nome: "Aikewara" }, 2);
       const lingua = await modelLingua.searchById(2);
       expect(lingua).toMatchObject({
-        id_conteudo: 4,
         id_lingua: 2,
-        id_tronco: null,
+        id_conteudo: 4,
         nome: "Aikewara",
+        tronco: null,
       });
     });
   });

diff --git a/src/models/Lingua/index.js b/src/models/Lingua/index.js
@@ -1,4 +1,5 @@
 const LinguaModel = require("./Lingua");
+const TroncoModel = require("../Tronco/Tronco");
 const Conteudo = require("../Conteudo");
 
 exports.getAll = async () => {
@@ -19,7 +20,17 @@ exports.create = async (lingua) => {
   return LinguaModel.create(lingua);
 };
 exports.searchById = async (id) => {
-  return LinguaModel.findByPk(id);
+  return LinguaModel.findOne({
+    where: { id_lingua: id },
+    attributes: ["id_lingua", "id_conteudo", "nome"],
+    include: [
+      {
+        model: TroncoModel,
+        as: "tronco",
+        attributes: ["id_tronco", "nome"],
+      },
+    ],
+  });
 };
 exports.searchAll = async () => {
   return LinguaModel.findAll();