Merge pull request #92 from boostcampwm2023/feat/90-diaries-list-api

[Feat] 전체 일기 목록 API 구현 및 e2e 테스트 작성

BE/src/diaries/diaries.controller.ts

@@ -15,11 +15,14 @@ import {
   DeleteDiaryDto,
   DiaryUuidDto,
   ReadDiaryDto,
+  ReadDiariesResponseDto,
   UpdateDiaryDto,
 } from "./diaries.dto";
 import { Diary } from "./diaries.entity";
 import { AuthGuard } from "@nestjs/passport";
 import { IdGuard } from "src/auth/guard/auth.id-guard";
+import { GetUser } from "src/auth/get-user.decorator";
+import { User } from "src/users/users.entity";
 
 @Controller("diaries")
 @UseGuards(AuthGuard())
@@ -59,12 +62,48 @@ export class DiariesController {
         y: parseFloat(coordinateArray[1]),
         z: parseFloat(coordinateArray[2]),
       },
-      shape_uuid: diary.shape.uuid,
+      shapeUuid: diary.shape.uuid,
     };
 
     return response;
   }
 
+  @Get()
+  async readDiariesByUser(
+    @GetUser() user: User,
+  ): Promise<ReadDiariesResponseDto[]> {
+    const diaryList = await this.diariesService.readDiariesByUser(user);
+    let readDiaryResponseDtoList: ReadDiariesResponseDto[] = [];
+    diaryList.map((diary) => {
+      const coordinateArray = diary.point.split(",");
+      const response = {
+        userId: diary.user.userId,
+        uuid: diary.uuid,
+        title: diary.title,
+        content: diary.content,
+        date: diary.date,
+        tags: [],
+        emotion: {
+          positive: diary.positiveRatio,
+          neutral: diary.neutralRatio,
+          negative: diary.negativeRatio,
+          sentiment: diary.sentiment,
+        },
+        coordinate: {
+          x: parseFloat(coordinateArray[0]),
+          y: parseFloat(coordinateArray[1]),
+          z: parseFloat(coordinateArray[2]),
+        },
+        shapeUuid: diary.shape.uuid,
+      };
+
+      const readDiaryResponseDto: ReadDiariesResponseDto = response;
+      readDiaryResponseDtoList.push(readDiaryResponseDto);
+    });
+
+    return readDiaryResponseDtoList;
+  }
+
   @Put()
   @UseGuards(IdGuard)
   modifyDiary(@Body() updateDiaryDto: UpdateDiaryDto): Promise<Diary> {

BE/src/diaries/diaries.dto.ts

@@ -76,14 +76,15 @@ export class DiaryUuidDto {
   uuid: string;
 }
 
-export class ReadDiaryResponseDto {
+export class ReadDiariesResponseDto {
   userId: string;
+  uuid: string;
   title: string;
   content: string;
   date: Date;
   tags: string[];
   emotion: {
-    position: number;
+    positive: number;
     neutral: number;
     negative: number;
     sentiment: sentimentStatus;
@@ -93,5 +94,5 @@ export class ReadDiaryResponseDto {
     y: number;
     z: number;
   };
-  shape_uuid: string;
+  shapeUuid: string;
 }

BE/src/diaries/diaries.repository.ts

@@ -55,6 +55,14 @@ export class DiariesRepository {
     return diary;
   }
 
+  async readDiariesByUser(user): Promise<Diary[]> {
+    const diaryList = await Diary.find({
+      where: { user: user.id },
+    });
+
+    return diaryList;
+  }
+
   async updateDiary(
     updateDiaryDto: UpdateDiaryDto,
     encodedContent: string,

BE/src/diaries/diaries.service.ts

@@ -47,6 +47,19 @@ export class DiariesService {
     return diary;
   }
 
+  async readDiariesByUser(user): Promise<Diary[]> {
+    let diaryList: Diary[] =
+      await this.diariesRepository.readDiariesByUser(user);
+
+    diaryList.map((diary) => {
+      diary.content = atob(diary.content);
+      // Mysql DB에서 가져온 UST 날짜 데이터를 KST로 변경
+      diary.date.setHours(diary.date.getHours() + 9);
+    });
+
+    return diaryList;
+  }
+
   async modifyDiary(updateDiaryDto: UpdateDiaryDto): Promise<Diary> {
     const encodedContent = btoa(updateDiaryDto.content);
     return this.diariesRepository.updateDiary(updateDiaryDto, encodedContent);

BE/test/diaries.read-list.e2e-spec.ts

@@ -0,0 +1,55 @@
+import { Test, TestingModule } from "@nestjs/testing";
+import { INestApplication } from "@nestjs/common";
+import * as request from "supertest";
+import { AppModule } from "../src/app.module";
+import { ValidationPipe } from "@nestjs/common";
+
+describe("AppController (e2e)", () => {
+  let app: INestApplication;
+  let accessToken: string;
+
+  beforeEach(async () => {
+    const moduleFixture: TestingModule = await Test.createTestingModule({
+      imports: [AppModule],
+    }).compile();
+
+    app = moduleFixture.createNestApplication();
+    app.enableCors();
+    app.useGlobalPipes(new ValidationPipe());
+
+    await app.init();
+
+    const signInPost = await request(app.getHttpServer())
+      .post("/auth/signin")
+      .send({
+        userId: "commonUser",
+        password: process.env.COMMON_USER_PASS,
+      });
+
+    accessToken = signInPost.body.accessToken;
+  });
+
+  afterEach(async () => {
+    await app.close();
+  });
+
+  it("정상 요청 시 200 OK 응답", async () => {
+    const postResponse = await request(app.getHttpServer())
+      .get("/diaries")
+      .set("Authorization", `Bearer ${accessToken}`)
+      .expect(200);
+  });
+
+  it("정상 요청 시 200 OK 응답", async () => {
+    const postResponse = await request(app.getHttpServer())
+      .get("/diaries")
+      .set("Authorization", `Bearer ${accessToken}`)
+      .expect(200);
+  });
+
+  it("액세스 토큰 없이 요청 시 401 Unauthorized 응답", async () => {
+    const postResponse = await request(app.getHttpServer())
+      .get("/diaries")
+      .expect(401);
+  });
+});