diff --git a/src/api/controllers/form.ts b/src/api/controllers/form.ts index 85191272989648c0fd0960010670499f86689744..bbfa7ffe8b2901cbce2c4d8c1c7c3b7aa08372e8 100644 --- a/src/api/controllers/form.ts +++ b/src/api/controllers/form.ts @@ -178,13 +178,8 @@ export class FormCtrl { return; } - let sum: number = 0; - for (const forms of resultAnswer) { - sum += Object.keys(forms.inputAnswers).length - } - res.status(200).json({ - answerNumber: sum + answerNumber: resultAnswer.length }); }); } diff --git a/src/api/controllers/formAnswer.spec.ts b/src/api/controllers/formAnswer.spec.ts index cf065c0964cd7a68e1a06ab2d63661871eaaa1b2..5e5dfd481e2b55902c83c93a9cfb498d8ef77ee9 100644 --- a/src/api/controllers/formAnswer.spec.ts +++ b/src/api/controllers/formAnswer.spec.ts @@ -23,7 +23,7 @@ import * as request from "supertest"; import { expect } from "chai"; import { formAnswerScenario, dbHandlerScenario } from "../../../test/scenario"; import * as server from "../../main"; -import { EnumHandler,InputType, ValidationType } from "../../utils/enumHandler"; +import { EnumHandler, InputType, ValidationType } from "../../utils/enumHandler"; import { TestHandler } from "../../utils/testHandler"; import { OptHandler } from "../../utils/optHandler"; import { Form, FormOptions } from "../../core/form"; @@ -80,7 +80,7 @@ describe("API data controller", () => { .end(done); }); - it("Should respond 200 when reading a form answer", (done) => { + it("Should respond 200 when reading a form answer", (done) => { request(server) .get("/answer/1") @@ -92,10 +92,10 @@ describe("API data controller", () => { TestHandler.testFormAnswer(res.body[i], formAnswerScenario.formAnswerRead[i]); } }) - .end(done); + .end(done); }); - it("Should respond 500 when failing to read a form answer", (done) => { + it("Should respond 500 when failing to read a form answer", (done) => { request(server) .get("/answer/500") @@ -105,20 +105,20 @@ describe("API data controller", () => { .expect((res: any) => { expect(res.body.error).to.be.equal("User dont own this form."); }) - .end(done); + .end(done); }); - it ("Should respond 200 when reading the number of answers from a form", (done) => { + it("Should respond 200 when reading the number of answers from a form", (done) => { request(server) - .get("/answerNumber/1") - .expect(200) - + .get("/answerNumber/1") + .expect(200) + .expect((res: any) => { expect(res.body).to.be.an("object"); expect(res.body.answerNumber).to.be.an("number"); - expect(res.body.answerNumber).to.be.equal(9); + expect(res.body.answerNumber).to.be.equal(3); }) - .end(done); + .end(done); }) }); diff --git a/src/api/controllers/user.ts b/src/api/controllers/user.ts index e9e1778c1cf4e877ed3a11d5c66780774c308427..5559ef859c00803a8ba8403de2c5e1dc53168f2a 100644 --- a/src/api/controllers/user.ts +++ b/src/api/controllers/user.ts @@ -261,12 +261,8 @@ export class UserCtrl { innerCallback(err); return; } - let sum: number = 0; - for (const forms of resultAnswer) { - sum += Object.keys(forms.inputAnswers).length - } - form.answersNumber = sum; + form.answersNumber = resultAnswer.length; innerCallback(null); }); diff --git a/src/utils/answerQueryBuilder.ts b/src/utils/answerQueryBuilder.ts index 56e7a8f26af5458ddf0eec51dd33472cbb75eb98..9c7b9fe193aff56d50a4293d24756087181901aa 100644 --- a/src/utils/answerQueryBuilder.ts +++ b/src/utils/answerQueryBuilder.ts @@ -410,11 +410,6 @@ export class AnswerQueryBuilder extends QueryBuilder { return; } - if (result.rowCount === 0) { - cb(ErrorHandler.notFound("Form Answer")); - return; - } - const inputAnswersOpts: InputAnswerOptions[] = result.rows.map((inputsAnswerResult) => { let subForm: FormAnswerOptions = null; if (inputsAnswerResult["id_sub_form"]) {