Merge branch 'main' of https://codeberg.org/YamanQD/Labeeb

package.json

@@ -20,5 +20,10 @@
     "eslint": "^8.14.0",
     "prettier": "^2.6.2",
     "typescript": "^4.6.3"
+  },
+  "dependenciesMeta": {
+    "typeorm-seeding@1.6.1": {
+      "unplugged": true
+    }
   }
 }

packages/server/package.json

@@ -13,6 +13,7 @@
     "prebuild": "rimraf dist",
     "build": "nest build",
     "format": "prettier --write \"src/**/*.ts\" \"test/**/*.ts\"",
+    "seed": "ts-node ../../.yarn/unplugged/typeorm-seeding-virtual-a22ff67e2d/node_modules/typeorm-seeding/dist/cli.js seed",
     "start": "nest start",
     "start-dev": "nest start --watch",
     "start-debug": "nest start --debug --watch",
@@ -46,9 +47,11 @@
     "rimraf": "^3.0.2",
     "rxjs": "^7.2.0",
     "swagger-ui-express": "^4.3.0",
-    "typeorm": "^0.3.6"
+    "typeorm": "^0.3.6",
+    "typeorm-seeding": "^1.6.1"
   },
   "devDependencies": {
+    "@faker-js/faker": "^7.3.0",
     "@nestjs/cli": "^8.0.0",
     "@nestjs/schematics": "^8.0.0",
     "@types/express": "^4.17.13",
@@ -68,4 +71,4 @@
     "typescript": "^4.3.5"
   },
   "packageManager": "yarn@3.2.0"
-}
+}

packages/server/src/app.module.ts

@@ -13,6 +13,8 @@ import { TasksModule } from './tasks/tasks.module';
 import { Task } from './tasks/task.entity';
 import { ProjectsModule } from './projects/projects.module';
 import { Project } from './projects/project.entity';
+import { List } from './lists/list.entity';
+import { ListsModule } from './lists/lists.module';
 
 @Module({
   imports: [
@@ -29,14 +31,15 @@ import { Project } from './projects/project.entity';
           username: configService.get<string>('DATABASE_USERNAME'),
           password: configService.get<string>('DATABASE_PASSWORD'),
           database: configService.get<string>('DATABASE_NAME'),
-          entities: [User, Task, Project],
+          entities: [User, Task, Project, List],
           synchronize: true, //! DO NOT USE IN PRODUCTION
         };
       },
       inject: [ConfigService]
     }),
     TasksModule,
     ProjectsModule,
+    ListsModule
   ],
   controllers: [AppController],
   providers: [

packages/server/src/db/seeding/factories/task.factory.ts

@@ -0,0 +1,15 @@
+import { faker } from '@faker-js/faker';
+import { Priority } from 'src/enums/priority.enum';
+import { Task } from 'src/tasks/task.entity';
+import { define } from "typeorm-seeding";
+
+const priorities = [Priority.HIGH, Priority.MEDIUM, Priority.LOW, Priority.NONE];
+
+define(Task, () => {
+	const task = new Task();
+	task.title = faker.lorem.sentence();
+	task.description = faker.lorem.paragraph();
+	task.priority = priorities[Math.floor(Math.random() * 100) % priorities.length];
+	task.deadline = faker.date.future();
+	return task;
+});

packages/server/src/db/seeding/factories/user.factory.ts

@@ -0,0 +1,10 @@
+import { faker } from '@faker-js/faker';
+import { User } from "src/users/user.entity";
+import { define } from "typeorm-seeding";
+
+define(User, () => {
+	const user = new User();
+	user.username = faker.internet.userName();
+	user.password = faker.internet.password();
+	return user;
+});

packages/server/src/lists/dto/create-list-dto.ts

@@ -0,0 +1,11 @@
+import { Type } from 'class-transformer';
+import { IsNotEmpty } from 'class-validator';
+
+export class CreateListDto {
+	@IsNotEmpty()
+	@Type(() => String)
+	name: string;
+
+	@IsNotEmpty()
+	projectId: number;
+}

packages/server/src/lists/dto/update-list-dto.ts

@@ -0,0 +1,4 @@
+import { PartialType } from "@nestjs/mapped-types";
+import { CreateListDto } from "./create-list-dto";
+
+export class UpdateListDto extends PartialType(CreateListDto) { }

packages/server/src/lists/list.entity.ts

@@ -0,0 +1,18 @@
+import { Project } from 'src/projects/project.entity';
+import { Task } from 'src/tasks/task.entity';
+import { Entity, Column, PrimaryGeneratedColumn, OneToMany, ManyToOne } from 'typeorm';
+
+@Entity()
+export class List {
+	@PrimaryGeneratedColumn()
+	id: number;
+
+	@Column()
+	name: string;
+
+	@ManyToOne(() => Project, project => project.lists)
+	project: Project;
+
+	@OneToMany(() => Task, task => task.list)
+	tasks: Task[];
+}

packages/server/src/lists/lists.controller.ts

@@ -0,0 +1,20 @@
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { Task } from 'src/tasks/task.entity';
+import { CreateListDto } from './dto/create-list-dto';
+import { List } from './list.entity';
+import { ListsService } from './lists.service';
+
+@Controller('lists')
+export class ListsController {
+	constructor(private readonly listsService: ListsService) { }
+
+	@Get(':id')
+	async findListTasks(@Param('id') id: number): Promise<Task[]> {
+		return await this.listsService.findListTasks(id);
+	}
+
+	@Post()
+	async create(@Body() body: CreateListDto): Promise<List> {
+		return await this.listsService.create(body);
+	}
+}

packages/server/src/lists/lists.module.ts

@@ -0,0 +1,13 @@
+import { Module } from '@nestjs/common';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Project } from 'src/projects/project.entity';
+import { List } from './list.entity';
+import { ListsController } from './lists.controller';
+import { ListsService } from './lists.service';
+
+@Module({
+  imports: [TypeOrmModule.forFeature([List, Project])],
+  controllers: [ListsController],
+  providers: [ListsService]
+})
+export class ListsModule { }

packages/server/src/lists/lists.service.ts

@@ -0,0 +1,38 @@
+import { Injectable, NotFoundException } from '@nestjs/common';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Project } from 'src/projects/project.entity';
+import { Task } from 'src/tasks/task.entity';
+import { Repository } from 'typeorm';
+import { CreateListDto } from './dto/create-list-dto';
+import { List } from './list.entity';
+
+@Injectable()
+export class ListsService {
+	constructor(
+		@InjectRepository(List)
+		private readonly listRepository: Repository<List>,
+		@InjectRepository(Project)
+		private readonly projectRepository: Repository<Project>
+	) { }
+
+	async create(list: CreateListDto): Promise<List> {
+		const project = await this.projectRepository.findOne({ where: { id: list.projectId } });
+		if (!project) {
+			throw new NotFoundException('Project not found');
+		}
+
+		return await this.listRepository.save({ ...list, project });
+	}
+
+	async findListTasks(id: number): Promise<Task[]> {
+		const list = await this.listRepository.findOne({
+			where: { id },
+			relations: { tasks: true }
+		});
+		if (!list) {
+			throw new NotFoundException('List not found');
+		}
+
+		return list.tasks;
+	}
+}

packages/server/src/projects/dto/create-project-dto.ts

@@ -0,0 +1,8 @@
+import { Type } from 'class-transformer';
+import { IsNotEmpty } from 'class-validator';
+
+export class CreateProjectDto {
+	@IsNotEmpty()
+	@Type(() => String)
+	name: string;
+}

packages/server/src/projects/dto/update-project-dto.ts

@@ -0,0 +1,4 @@
+import { PartialType } from "@nestjs/mapped-types";
+import { CreateProjectDto } from "./create-project-dto";
+
+export class UpdateProjectDto extends PartialType(CreateProjectDto) { }

packages/server/src/projects/project.entity.ts

@@ -1,4 +1,4 @@
-import { Task } from 'src/tasks/task.entity';
+import { List } from 'src/lists/list.entity';
 import { Entity, Column, PrimaryGeneratedColumn, OneToMany } from 'typeorm';
 
 @Entity()
@@ -9,6 +9,6 @@ export class Project {
 	@Column()
 	name: string;
 
-	@OneToMany(() => Task, task => task.project)
-	tasks: Task[];
+	@OneToMany(() => List, list => list.project)
+	lists: List[];
 }

packages/server/src/projects/projects.controller.ts

@@ -1,22 +1,24 @@
-import { Body, Controller, Get, Param, Post, } from '@nestjs/common';
-import { Task } from 'src/tasks/task.entity';
+import { Body, Controller, Get, Param, Post } from '@nestjs/common';
+import { CreateProjectDto } from './dto/create-project-dto';
 import { Project } from './project.entity';
 import { ProjectsService } from './projects.service';
 
 @Controller('projects')
 export class ProjectsController {
 	constructor(private readonly projectsService: ProjectsService) { }
 
+	@Get()
+	async findAll(): Promise<Project[]> {
+		return await this.projectsService.findAll();
+	}
 
 	@Get(':id/tasks')
-	async findProjectTasks(@Param('id') id): Promise<Task[]> {
+	async findProjectTasks(@Param('id') id: number): Promise<any> {
 		return await this.projectsService.findProjectTasks(id);
 	}
 
 	@Post()
-	async create(@Body() body: any): Promise<Project> {
+	async create(@Body() body: CreateProjectDto): Promise<Project> {
 		return await this.projectsService.create(body);
 	}
-
-	// }
 }

packages/server/src/projects/projects.service.ts

@@ -1,7 +1,7 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Task } from 'src/tasks/task.entity';
 import { Repository } from 'typeorm';
+import { CreateProjectDto } from './dto/create-project-dto';
 import { Project } from './project.entity';
 
 @Injectable()
@@ -11,19 +11,23 @@ export class ProjectsService {
 		private readonly projectRepository: Repository<Project>
 	) { }
 
-	async findProjectTasks(id: number): Promise<Task[]> {
+	async findAll(): Promise<Project[]> {
+		return await this.projectRepository.find({ relations: { lists: true } });
+	}
+
+	async findProjectTasks(id: number): Promise<any> {
 		const project = await this.projectRepository.findOne({
 			where: { id },
-			relations: { tasks: true }
+			relations: ['lists', 'lists.tasks'],
 		});
 		if (!project) {
 			throw new NotFoundException('Project not found');
 		}
 
-		return project.tasks;
+		return project;
 	}
 
-	async create(project: Project): Promise<Project> {
+	async create(project: CreateProjectDto): Promise<Project> {
 		return await this.projectRepository.save(project);
 	}
 }

packages/server/src/tasks/dto/create-task.dto.ts

@@ -8,7 +8,7 @@ export class CreateTaskDto {
 	title: string;
 
 	@IsNotEmpty()
-	projectId: number;
+	listId: number;
 
 	@IsOptional()
 	description?: string;

packages/server/src/tasks/task.entity.ts

@@ -1,6 +1,6 @@
 import { Entity, Column, PrimaryGeneratedColumn, ManyToOne } from 'typeorm';
 import { Priority } from 'src/enums/priority.enum';
-import { Project } from 'src/projects/project.entity';
+import { List } from 'src/lists/list.entity';
 
 @Entity()
 export class Task {
@@ -19,8 +19,8 @@ export class Task {
 	@Column({ nullable: true })
 	deadline: Date;
 
-	@ManyToOne(() => Project, project => project.tasks)
-	project: Project;
+	@ManyToOne(() => List, list => list.tasks)
+	list: List;
 
 	@Column()
 	created_by: number;

packages/server/src/tasks/tasks.module.ts

@@ -1,12 +1,12 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Project } from 'src/projects/project.entity';
+import { List } from 'src/lists/list.entity';
 import { Task } from './task.entity';
 import { TasksController } from './tasks.controller';
 import { TasksService } from './tasks.service';
 
 @Module({
-  imports: [TypeOrmModule.forFeature([Project, Task])],
+  imports: [TypeOrmModule.forFeature([List, Task])],
   controllers: [TasksController],
   providers: [TasksService]
 })

packages/server/src/tasks/tasks.service.ts

@@ -1,6 +1,6 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { Project } from 'src/projects/project.entity';
+import { List } from 'src/lists/list.entity';
 import { Repository } from 'typeorm';
 import { CreateTaskDto } from './dto/create-task.dto';
 import { UpdateTaskDto } from './dto/update-task.dto';
@@ -11,8 +11,8 @@ export class TasksService {
 	constructor(
 		@InjectRepository(Task)
 		private readonly taskRepository: Repository<Task>,
-		@InjectRepository(Project)
-		private readonly projectRepository: Repository<Project>
+		@InjectRepository(List)
+		private readonly listRepository: Repository<List>
 	) { }
 
 	async findAll(): Promise<Task[]> {
@@ -28,12 +28,12 @@ export class TasksService {
 	}
 
 	async create(body: CreateTaskDto, userId: any): Promise<Task> {
-		const project = await this.projectRepository.findOne({ where: { id: body.projectId } });
+		const list = await this.listRepository.findOne({ where: { id: body.listId } });
 
 		const task = this.taskRepository.create({
 			created_by: userId,
 			createdAt: new Date(),
-			project: project,
+			list: list,
 			...body
 		});