From 48748adfa7911fe4338581ddf115c82af9471d79 Mon Sep 17 00:00:00 2001 From: seohyun <61549796+seohyun-106@users.noreply.github.com> Date: Sun, 17 Dec 2023 20:24:17 +0900 Subject: [PATCH] Merge feature/32 into develop (#42) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Feat: 식물 카드 상세 조회 API (#33) * Docs: update PR template (add swagger) * Refactor: file name kebab-case 적용 * Feat: plant util 함수 * Feat: plant 상세 조회 API * Docs: update PR template (add checklist) * Feat: plant 상세 조회 service 로직 unit test * Feat: plant 상세 조회 controller unit test * Fix: plants service 로직 time mocking * Feat: env test 환경 설정 * Feat: e2e test 격리된 docker 환경 구축 * Feat: plants e2e test * Feat: 메인 식물 리스트 조회 응닶값 세팅 * Feat: 메인 화면 랜덤 description 함수 추가 * Chore: Gauge로 통일 * Feat: 메인 식물 리스트 전체 조회 API * Chore: getUserPlants로 함수 이름 변경 * Chore: class 대문자로 변경 * Chore: 프리티어 적용 --------- Co-authored-by: Chae Jeong Ah Co-authored-by: 장서현 --- src/plants/plants.service.spec.ts | 2 +- src/plants/plants.service.ts | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/plants/plants.service.spec.ts b/src/plants/plants.service.spec.ts index f37b542..76e8718 100644 --- a/src/plants/plants.service.spec.ts +++ b/src/plants/plants.service.spec.ts @@ -55,7 +55,7 @@ describe('PlantsService', () => { jest.useRealTimers(); }); - const mockUserPlantId = 1; + const mockUserPlantId: number = 1; it('존재하는 userPlantId 가 주어지면 식물 상세 정보를 반환한다.', async () => { const mockFindUnique = userPlantPrisma.findUnique.mockResolvedValueOnce( diff --git a/src/plants/plants.service.ts b/src/plants/plants.service.ts index ad473ec..2dae15f 100644 --- a/src/plants/plants.service.ts +++ b/src/plants/plants.service.ts @@ -108,7 +108,7 @@ export class PlantsService { }); } - async getPlantLevelNameByLoveGague( + async getPlantLevelNameByLoveGauge( plantId: number, loveGauge: number, ): Promise> {