Merge pull request #15 from DanielAraldi/fix/answer-id

Add id to identify each answers a survey answer

Author: DanielAraldi

.husky/pre-commit

@@ -1,4 +1,4 @@
 #!/bin/sh
 . "$(dirname "$0")/_/husky.sh"
 
-lint-staged
+node_modules/.bin/lint-staged

src/data/protocols/db/survey/add-survey-repository.ts

@@ -1,4 +1,4 @@
-import { AddSurveyModel } from "@/domain/usecases/survey/add-survey";
+import { AddSurveyModel } from "@/domain/models/survey";
 
 export interface AddSurveyRepository {
   add(surveyData: AddSurveyModel): Promise<void>;

src/data/usecases/survey-result/save-survey-result/db-save-survey-result.spec.ts

@@ -9,7 +9,7 @@ import MockDate from "mockdate";
 const makeFakeSurveyResultData = (): SaveSurveyResultModel => ({
   accountId: "any_account_id",
   surveyId: "any_survey_id",
-  answer: "any_answer",
+  answerId: "any_answer_id",
   date: new Date(),
 });
 

src/data/usecases/survey/add-survey/db-add-survey-protocols.ts

@@ -1,2 +1,3 @@
+export * from "@/domain/models/survey";
 export * from "@/domain/usecases/survey/add-survey";
 export * from "@/data/protocols/db/survey/add-survey-repository";

src/data/usecases/survey/load-survey-by-id/db-load-survey-by-id.spec.ts

@@ -5,11 +5,12 @@ import {
 } from "./db-load-survey-by-id-protocols";
 import MockDate from "mockdate";
 
-const makeFakeSurvey = (): SurveyModel => ({
+const makeFakeLoadedSurvey = (): SurveyModel => ({
   id: "any_id",
   question: "any_question",
   answers: [
     {
+      answerId: "any_answer_id",
       image: "any_image",
       answer: "any_answer",
     },
@@ -20,7 +21,7 @@ const makeFakeSurvey = (): SurveyModel => ({
 const makeLoadSurveyByIdRepository = (): LoadSurveyByIdRepository => {
   class LoadSurveyByIdRepositoryStub implements LoadSurveyByIdRepository {
     async loadById(id: string): Promise<SurveyModel | null> {
-      return new Promise((resolve) => resolve(makeFakeSurvey()));
+      return new Promise((resolve) => resolve(makeFakeLoadedSurvey()));
     }
   }
   return new LoadSurveyByIdRepositoryStub();
@@ -55,7 +56,7 @@ describe("DbLoadSurveyById Usecase", () => {
   test("Should return Survey on success", async () => {
     const { sut } = makeSut();
     const survey = await sut.loadById("any_id");
-    expect(survey).toEqual(makeFakeSurvey());
+    expect(survey).toEqual(makeFakeLoadedSurvey());
   });
 
   test("Should throw if LoadSurveyByIdRepository throws", async () => {

src/data/usecases/survey/load-surveys/db-load-surveys.spec.ts

@@ -5,12 +5,13 @@ import {
 import { DbLoadSurveys } from "./db-load-surveys";
 import MockDate from "mockdate";
 
-const makeFakeSurveys = (): SurveyModel[] => [
+const makeFakeLoadedSurveys = (): SurveyModel[] => [
   {
     id: "any_id",
     question: "any_question",
     answers: [
       {
+        answerId: "any_answer_id",
         image: "any_image",
         answer: "any_answer",
       },
@@ -22,6 +23,7 @@ const makeFakeSurveys = (): SurveyModel[] => [
     question: "other_question",
     answers: [
       {
+        answerId: "other_answer_id",
         image: "other_image",
         answer: "other_answer",
       },
@@ -33,7 +35,7 @@ const makeFakeSurveys = (): SurveyModel[] => [
 const makeLoadSurveysRepository = (): LoadSurveysRepository => {
   class LoadSurveysRepositoryStub implements LoadSurveysRepository {
     async loadAll(): Promise<SurveyModel[]> {
-      return new Promise((resolve) => resolve(makeFakeSurveys()));
+      return new Promise((resolve) => resolve(makeFakeLoadedSurveys()));
     }
   }
   return new LoadSurveysRepositoryStub();
@@ -68,7 +70,7 @@ describe("DbLoadSurveys Usecase", () => {
   test("Should return a list of survey on success", async () => {
     const { sut } = makeSut();
     const surveys = await sut.load();
-    expect(surveys).toEqual(makeFakeSurveys());
+    expect(surveys).toEqual(makeFakeLoadedSurveys());
   });
 
   test("Should throw if LoadSurveysRepository throws", async () => {

src/domain/models/survey-result.ts

@@ -2,6 +2,6 @@ export type SurveyResultModel = {
   id: string;
   surveyId: string;
   accountId: string;
-  answer: string;
+  answerId: string;
   date: Date;
 };

src/domain/models/survey.ts

@@ -6,6 +6,11 @@ export type SurveyModel = {
 };
 
 export type SurveyAnswerModel = {
-  image?: string;
+  answerId: string;
   answer: string;
+  image?: string;
+};
+
+export type AddSurveyModel = Omit<SurveyModel, "id" | "answers"> & {
+  answers: Array<Omit<SurveyAnswerModel, "answerId">>;
 };

src/domain/usecases/survey/add-survey.ts

@@ -1,6 +1,4 @@
-import { SurveyAnswerModel, SurveyModel } from "@/domain/models/survey";
-
-export type AddSurveyModel = Omit<SurveyModel, "id">;
+import { AddSurveyModel } from "@/domain/models/survey";
 
 export interface AddSurvey {
   add(data: AddSurveyModel): Promise<void>;

src/infra/db/mongodb/account/account-mongo-repository.ts

@@ -32,7 +32,7 @@ export class AccountMongoRepository
 
   async updateAccessToken(id: string, token: string): Promise<void> {
     const accountCollection = await MongoHelper.getCollection("accounts");
-    const accountId = MongoHelper.toObjectId(id);
+    const accountId = MongoHelper.objectId(id);
     await accountCollection.updateOne(
       { _id: accountId },
       { $set: { accessToken: token } }