Feature/event validation

apps/backend/package.json

@@ -16,9 +16,16 @@
   "dependencies": {
     "@nestjs/common": "^10.3.8",
     "@nestjs/core": "^10.3.8",
-    "@nestjs/mapped-types": "*",
+    "@nestjs/mapped-types": "2.0.5",
     "@nestjs/platform-express": "^10.3.8",
+    "@nestjs/swagger": "^7.3.1",
     "@prisma/client": "^5.13.0",
+    "class-transformer": "^0.5.1",
+    "class-validator": "^0.14.1",
+<<<<<<< HEAD
+    "nestjs": "^0.0.1",
+=======
+>>>>>>> 76a675af0de806347ba6c27372be1633ba014b43
     "nestjs-prisma": "^0.23.0",
     "reflect-metadata": "^0.2.2",
     "rimraf": "^5.0.5",

apps/backend/src/event/dto/create-event.dto.ts

@@ -2,12 +2,4 @@ import { OmitType } from '@nestjs/swagger';
 
 import { Event } from '../entities/event.entity';
 
-export class CreateEventDto extends OmitType(Event, [
-  'id',
-  'categoryId',
-  'category',
-  'ownerUserId',
-  'ownerUser',
-  'ownerGroupId',
-  'ownerGroup',
-]) {}
+export class CreateEventDto extends OmitType(Event, ['id', 'category', 'ownerGroupId', 'ownerUserId']) {}

apps/backend/src/event/entities/event.entity.ts

@@ -1,35 +1,71 @@
-import { Category, Group, Priority, Status, User } from '@prisma/client';
-import { IsDate, IsInt, IsNotEmpty, IsString } from 'class-validator';
+import { Priority, Status } from '@prisma/client';
+import { IsDate, IsDateString, IsEnum, IsInt, IsNotEmpty, IsOptional, IsString } from 'class-validator';
 
+export class Category {
+  @IsInt()
+  id: number;
+
+  @IsString()
+  name: string;
+
+  @IsString()
+  @IsOptional()
+  color: string;
+
+  @IsString()
+  @IsOptional()
+  description: string;
+}
 export class Event {
   @IsInt()
+  @IsOptional()
   id: number;
+
   @IsString()
   @IsNotEmpty()
   name: string;
+
   @IsString()
-  @IsNotEmpty()
+  @IsOptional()
   description: string;
+
   @IsString()
-  @IsNotEmpty()
+  @IsOptional()
   location: string;
+
   @IsDate()
+  @IsOptional()
   startDate: Date;
+
   @IsDate()
+  @IsOptional()
   endDate: Date;
-  @IsDate()
+
+  @IsDateString()
+  @IsOptional()
   startTime: Date;
-  @IsDate()
+
+  @IsDateString()
+  @IsOptional()
   endTime: Date;
+
+  @IsEnum(Priority)
+  @IsOptional()
   priority: Priority;
+
+  @IsEnum(Priority)
+  @IsOptional()
   status: Status;
+
   @IsInt()
+  @IsOptional()
   categoryId: number;
+
   category: Category;
+
   @IsInt()
   ownerUserId: number;
-  ownerUser: User;
+
   @IsInt()
   ownerGroupId: number;
-  ownerGroup: Group;
 }

apps/backend/src/event/event.controller.ts

@@ -1,6 +1,5 @@
 import { Body, Controller, Delete, Get, Param, Patch, Post } from '@nestjs/common';
 
-//import { Prisma } from '@prisma/client';
 import { CreateEventDto } from './dto/create-event.dto';
 import { UpdateEventDto } from './dto/update-event.dto';
 import { EventService } from './event.service';
@@ -15,22 +14,22 @@ export class EventController {
   }
 
   @Get()
-  async findAll() {
-    return await this.eventService.findAll();
+  findAll() {
+    return this.eventService.findAll();
   }
 
   @Get(':id')
-  async findOne(@Param('id') id: string) {
-    return await this.eventService.findOne(Number(id));
+  findOne(@Param('id') id: string) {
+    return this.eventService.findOne(Number(id));
   }
 
   @Patch(':id')
-  async update(@Param('id') id: string, @Body() data: UpdateEventDto) {
-    return await this.eventService.update(Number(id), data);
+  update(@Param('id') id: string, @Body() data: UpdateEventDto) {
+    return this.eventService.update(Number(id), data);
   }
 
   @Delete(':id')
-  async remove(@Param('id') id: string) {
-    return await this.eventService.remove(Number(id));
+  remove(@Param('id') id: string) {
+    return this.eventService.remove(Number(id));
   }
 }