Skip to content

Commit

Permalink
Merge feature/32 into develop (#42)
Browse files Browse the repository at this point in the history
* 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 <[email protected]>
Co-authored-by: ์žฅ์„œํ˜„ <[email protected]>
  • Loading branch information
3 people authored Dec 17, 2023
1 parent 480c4ff commit 48748ad
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/plants/plants.service.spec.ts
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ describe('PlantsService', () => {
jest.useRealTimers();
});

const mockUserPlantId = 1;
const mockUserPlantId: number = 1;

it('์กด์žฌํ•˜๋Š” userPlantId ๊ฐ€ ์ฃผ์–ด์ง€๋ฉด ์‹๋ฌผ ์ƒ์„ธ ์ •๋ณด๋ฅผ ๋ฐ˜ํ™˜ํ•œ๋‹ค.', async () => {
const mockFindUnique = userPlantPrisma.findUnique.mockResolvedValueOnce(
Expand Down
2 changes: 1 addition & 1 deletion src/plants/plants.service.ts
Original file line number Diff line number Diff line change
Expand Up @@ -108,7 +108,7 @@ export class PlantsService {
});
}

async getPlantLevelNameByLoveGague(
async getPlantLevelNameByLoveGauge(
plantId: number,
loveGauge: number,
): Promise<Pick<PlantLevel, 'levelName'>> {
Expand Down

0 comments on commit 48748ad

Please sign in to comment.