refactor services to repository

package.json

@@ -32,8 +32,7 @@
     "rimraf": "^3.0.2",
     "rxjs": "^7.5.5",
     "tslib": "^2.4.0",
-    "typeorm": "^0.2.34",
-    "uuid": "^8.3.2"
+    "typeorm": "^0.2.34"
   },
   "devDependencies": {
     "@nestjs/cli": "^7.6.0",

src/tasks/dto/get-tasks.dto.ts

@@ -1,5 +1,5 @@
 import { IsEnum, IsNotEmpty, IsOptional, IsString } from 'class-validator';
-import { TasksStatusEnum } from 'src/tasks/task.model';
+import { TasksStatusEnum } from 'src/tasks/task-status.enum';
 
 export class GetTasksDto {
   @IsOptional()

src/tasks/dto/update-task.dto.ts

@@ -1,5 +1,5 @@
 import { IsEnum } from 'class-validator';
-import { TasksStatusEnum } from 'src/tasks/task.model';
+import { TasksStatusEnum } from 'src/tasks/task-status.enum';
 
 export class UpdateTaskDto {
   @IsEnum(TasksStatusEnum)

src/tasks/task-status.enum.ts

@@ -0,0 +1,5 @@
+export enum TasksStatusEnum {
+  OPEN = 'open',
+  IN_PROGRESS = 'in_progress',
+  DONE = 'done',
+}

src/tasks/task.entity.ts

@@ -1,4 +1,4 @@
-import { TasksStatusEnum } from 'src/tasks/task.model';
+import { TasksStatusEnum } from 'src/tasks/task-status.enum';
 import { Column, Entity, PrimaryGeneratedColumn } from 'typeorm';
 
 @Entity()

src/tasks/task.repository.ts

@@ -1,6 +1,37 @@
 import { CreateTaskDto } from 'src/tasks/dto/create-task.dto';
+import { GetTasksDto } from 'src/tasks/dto/get-tasks.dto';
+import { TasksStatusEnum } from 'src/tasks/task-status.enum';
 import { EntityRepository, Repository } from 'typeorm';
 import { Task } from './task.entity';
 
 @EntityRepository(Task)
-export class TaskRepository extends Repository<Task> {}
+export class TaskRepository extends Repository<Task> {
+  async getTasks(filterDto: GetTasksDto): Promise<Task[]> {
+    const { q, status } = filterDto;
+    const query = this.createQueryBuilder('task');
+    if (status) {
+      query.andWhere('task.status = :status', { status });
+    }
+    if (q) {
+      //   'LOWER(task.title) LIKE LOWER(:search) OR LOWER(task.description) LIKE LOWER(:search)', //case insensitive
+      query.andWhere(
+        'task.title LIKE :search OR task.description LIKE :search', //case sensitive
+        {
+          search: `%${q}%`,
+        },
+      );
+    }
+    const tasks = await query.getMany();
+    return tasks;
+  }
+  async createTask(createTaskDto: CreateTaskDto): Promise<Task> {
+    const { title, description } = createTaskDto;
+    const task = this.create({
+      title,
+      description,
+      status: TasksStatusEnum.OPEN,
+    });
+    await this.save(task);
+    return task;
+  }
+}

src/tasks/tasks.controller.ts

@@ -12,7 +12,7 @@ import {
 import { CreateTaskDto } from 'src/tasks/dto/create-task.dto';
 import { GetTasksDto } from 'src/tasks/dto/get-tasks.dto';
 import { UpdateTaskDto } from 'src/tasks/dto/update-task.dto';
-import { Task } from 'src/tasks/task.model';
+import { Task } from 'src/tasks/task.entity';
 import { TasksService } from 'src/tasks/tasks.service';
 
 @Controller('tasks')
@@ -23,22 +23,22 @@ export class TasksController {
     return this.tasksService.createTask(createTaskDto);
   }
   @Get()
-  getAllTasks(@Query() filterDto: GetTasksDto): Task[] {
+  getTasks(@Query() filterDto: GetTasksDto): Promise<Task[]> {
     return this.tasksService.getTasks(filterDto);
   }
-
   @Get(':id')
-  getTaskById(@Param('id') id: string): Task {
+  getTaskById(@Param('id') id: string): Promise<Task> {
     return this.tasksService.getTaskById(id);
   }
-
   @Delete(':id')
-  deleteTask(@Param('id') id: string): void {
+  deleteTask(@Param('id') id: string): Promise<void> {
     return this.tasksService.deleteTask(id);
   }
-
   @Patch(':id')
-  updateTask(@Param('id') id: string, @Body() updateTaskDto: UpdateTaskDto) {
+  updateTask(
+    @Param('id') id: string,
+    @Body() updateTaskDto: UpdateTaskDto,
+  ): Promise<Task> {
     return this.tasksService.updateTask(id, updateTaskDto);
   }
 }

src/tasks/tasks.service.ts

@@ -1,85 +1,47 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
 import { of } from 'rxjs';
 import { CreateTaskDto } from 'src/tasks/dto/create-task.dto';
 import { GetTasksDto } from 'src/tasks/dto/get-tasks.dto';
 import { UpdateTaskDto } from 'src/tasks/dto/update-task.dto';
-import { Task, TasksStatusEnum } from 'src/tasks/task.model';
-import { v4 as uuid } from 'uuid';
+import { TasksStatusEnum } from 'src/tasks/task-status.enum';
+import { Task } from 'src/tasks/task.entity';
+import { TaskRepository } from 'src/tasks/task.repository';
 @Injectable()
 export class TasksService {
-  private tasks: Task[] = [];
+  constructor(
+    @InjectRepository(TaskRepository)
+    private taskRepository: TaskRepository,
+  ) {}
 
-  getTasks(filterDto: GetTasksDto): Task[] {
-    const { status, q } = filterDto;
-    let tasks = this.tasks;
-
-    if (status) {
-      tasks = tasks.filter((task) => task.status === status);
-    }
-
-    if (q) {
-      tasks = tasks.filter(
-        (task) => task.title.includes(q) || task.description.includes(q),
-      );
-    }
-
-    return tasks;
+  async getTasks(filterDto: GetTasksDto): Promise<Task[]> {
+    return this.taskRepository.getTasks(filterDto);
   }
 
-  // getTasks(getTasksDto: GetTasksDto): Task[] {
-  //   const { q, status } = getTasksDto;
-
-  //   return this.tasks.filter(
-  //     (task) =>
-  //       (status !== undefined &&
-  //         task.status === status &&
-  //         q !== undefined &&
-  //         task.description.includes(q)) ||
-  //       task.title.includes(q),
-  //   );
-  // }
-
-  getTaskById(id: string): Task {
-    const task = this.tasks.find((task) => task.id === id);
-    if (!task) {
+  async getTaskById(id: string): Promise<Task> {
+    const found = await this.taskRepository.findOne(id);
+    if (!found) {
       throw new NotFoundException(`Task with ID ${id} not found`);
     }
-    return task;
-  }
 
-  updateTask(id: string, updateTaskDto: UpdateTaskDto) {
-    const { status } = updateTaskDto;
-    const tasks = [...this.tasks];
-    const updatedIndex = this.tasks.findIndex((task) => task.id === id);
-    if (!updatedIndex) {
-      throw new NotFoundException();
-    }
-    tasks[updatedIndex].status = status;
-    this.tasks = tasks;
-    return tasks[updatedIndex];
+    return found;
   }
 
-  createTask(createTaskDto: CreateTaskDto): Task {
-    const { title, description } = createTaskDto;
-    const task: Task = {
-      id: uuid(),
-      title,
-      description,
-      status: TasksStatusEnum.OPEN,
-    };
-    this.tasks.push(task);
+  async updateTask(id: string, updateTaskDto: UpdateTaskDto) {
+    const task = await this.getTaskById(id);
+    task.status = updateTaskDto?.status ?? task.status;
+    await this.taskRepository.save(task);
     return task;
   }
-  deleteTask(id: string): void {
-    const found = this.getTaskById(id);
-    if (!found) {
+  createTask(createTaskDto: CreateTaskDto): Promise<Task> {
+    return this.taskRepository.createTask(createTaskDto);
+  }
+  async deleteTask(id: string): Promise<void> {
+    const deletedTask = await this.taskRepository.delete(id);
+
+    if (deletedTask.affected !== 1) {
       throw new NotFoundException();
     }
-    this.tasks = this.tasks.filter((task) => task.id !== found.id);
-    // const deletedIndex = this.tasks.findIndex((task) => task.id === id);
-    // // if (deletedIndex === -1) {
-    // //   throw new Error('not found');
-    // // }
-    // this.tasks.splice(deletedIndex, 1);
+    return;
   }
 }