From 3d872c5d301dfb6de87f09b11fee950eb6141735 Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Thu, 19 Sep 2024 13:33:02 +0200 Subject: [PATCH 1/9] changed notes to note --- src/app.module.ts | 2 +- src/decorators/OpenAPI/index.ts | 2 +- .../OpenAPI/{notes.decorators.ts => note.decorators.ts} | 2 +- src/resource/{notes => note}/dto/editNote.dto.ts | 0 src/resource/{notes => note}/dto/index.ts | 2 +- src/resource/{notes/dto/notes.dto.ts => note/dto/note.dto.ts} | 0 .../{notes/notes.controller.ts => note/note.controller.ts} | 2 +- src/resource/{notes/notes.module.ts => note/note.module.ts} | 4 ++-- src/resource/{notes/notes.service.ts => note/note.service.ts} | 0 src/resource/search/dto/SearchResult.dto.ts | 2 +- 10 files changed, 8 insertions(+), 8 deletions(-) rename src/decorators/OpenAPI/{notes.decorators.ts => note.decorators.ts} (92%) rename src/resource/{notes => note}/dto/editNote.dto.ts (100%) rename src/resource/{notes => note}/dto/index.ts (52%) rename src/resource/{notes/dto/notes.dto.ts => note/dto/note.dto.ts} (100%) rename src/resource/{notes/notes.controller.ts => note/note.controller.ts} (96%) rename src/resource/{notes/notes.module.ts => note/note.module.ts} (79%) rename src/resource/{notes/notes.service.ts => note/note.service.ts} (100%) diff --git a/src/app.module.ts b/src/app.module.ts index 946201e..a3b3359 100644 --- a/src/app.module.ts +++ b/src/app.module.ts @@ -6,7 +6,7 @@ import { AppService } from './app.service'; import { AuthModule } from './auth/auth.module'; import { AppConfig, DatabaseConfig } from './config'; import { EventModule } from './resource/event/event.module'; -import { NoteModule } from './resource/notes/notes.module'; +import { NoteModule } from './resource/note/note.module'; import { SearchModule } from './resource/search/search.module'; import { TaskModule } from './resource/task/task.module'; import { UserModule } from './resource/user/user.module'; diff --git a/src/decorators/OpenAPI/index.ts b/src/decorators/OpenAPI/index.ts index 1c7ba26..a091918 100644 --- a/src/decorators/OpenAPI/index.ts +++ b/src/decorators/OpenAPI/index.ts @@ -1,6 +1,6 @@ export * from './auth.decorators'; export * from './event.decorators'; -export * from './notes.decorators'; +export * from './note.decorators'; export * from './search.decorators'; export * from './task.decorators'; export * from './user.decorators'; diff --git a/src/decorators/OpenAPI/notes.decorators.ts b/src/decorators/OpenAPI/note.decorators.ts similarity index 92% rename from src/decorators/OpenAPI/notes.decorators.ts rename to src/decorators/OpenAPI/note.decorators.ts index 63e7f85..e217628 100644 --- a/src/decorators/OpenAPI/notes.decorators.ts +++ b/src/decorators/OpenAPI/note.decorators.ts @@ -6,7 +6,7 @@ import { ApiNotFoundResponse, ApiOkResponse, } from '@nestjs/swagger'; -import { editNoteDTO, NoteDTO } from '../../resource/notes/dto'; +import { editNoteDTO, NoteDTO } from '../../resource/note/dto'; export function FetchUserNotesApi() { return applyDecorators(ApiOkResponse({ type: [NoteDTO] })); diff --git a/src/resource/notes/dto/editNote.dto.ts b/src/resource/note/dto/editNote.dto.ts similarity index 100% rename from src/resource/notes/dto/editNote.dto.ts rename to src/resource/note/dto/editNote.dto.ts diff --git a/src/resource/notes/dto/index.ts b/src/resource/note/dto/index.ts similarity index 52% rename from src/resource/notes/dto/index.ts rename to src/resource/note/dto/index.ts index 3e5c341..7601061 100644 --- a/src/resource/notes/dto/index.ts +++ b/src/resource/note/dto/index.ts @@ -1,2 +1,2 @@ -export * from './notes.dto'; +export * from './note.dto'; export * from './editNote.dto'; diff --git a/src/resource/notes/dto/notes.dto.ts b/src/resource/note/dto/note.dto.ts similarity index 100% rename from src/resource/notes/dto/notes.dto.ts rename to src/resource/note/dto/note.dto.ts diff --git a/src/resource/notes/notes.controller.ts b/src/resource/note/note.controller.ts similarity index 96% rename from src/resource/notes/notes.controller.ts rename to src/resource/note/note.controller.ts index b9a0428..64999b0 100644 --- a/src/resource/notes/notes.controller.ts +++ b/src/resource/note/note.controller.ts @@ -7,7 +7,7 @@ import { Post, UseGuards, } from '@nestjs/common'; -import { NoteService } from './notes.service'; +import { NoteService } from './note.service'; import { editNoteDTO, NoteDTO } from './dto'; import { JwtGuard } from '../../auth/guard'; import { GetUser } from '../../decorators'; diff --git a/src/resource/notes/notes.module.ts b/src/resource/note/note.module.ts similarity index 79% rename from src/resource/notes/notes.module.ts rename to src/resource/note/note.module.ts index 9c62f23..bfb25ae 100644 --- a/src/resource/notes/notes.module.ts +++ b/src/resource/note/note.module.ts @@ -1,8 +1,8 @@ import { Module } from '@nestjs/common'; import { TypeOrmModule } from '@nestjs/typeorm'; import { NoteEntity } from 'src/database/entities/notes.entity'; -import { NoteService } from './notes.service'; -import { NoteController } from './notes.controller'; +import { NoteService } from './note.service'; +import { NoteController } from './note.controller'; import { UserEntity } from 'src/database/entities/user.entity'; @Module({ diff --git a/src/resource/notes/notes.service.ts b/src/resource/note/note.service.ts similarity index 100% rename from src/resource/notes/notes.service.ts rename to src/resource/note/note.service.ts diff --git a/src/resource/search/dto/SearchResult.dto.ts b/src/resource/search/dto/SearchResult.dto.ts index fbd59bf..81616f4 100644 --- a/src/resource/search/dto/SearchResult.dto.ts +++ b/src/resource/search/dto/SearchResult.dto.ts @@ -1,5 +1,5 @@ import { ReturnEventDTO } from 'src/resource/event/dto'; -import { NoteDTO } from 'src/resource/notes/dto'; +import { NoteDTO } from 'src/resource/note/dto'; import { ReturnTaskDTO } from 'src/resource/task/dto'; import { ApiProperty } from '@nestjs/swagger'; From a9d954fe1e5ae013f770fbcbf3e4e80fcf543242 Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:09:43 +0200 Subject: [PATCH 2/9] unified controller naming --- src/decorators/OpenAPI/event.decorators.ts | 2 +- src/decorators/OpenAPI/note.decorators.ts | 4 ++-- src/decorators/OpenAPI/task.decorators.ts | 4 ++-- src/resource/event/event.controller.ts | 6 +++--- src/resource/note/note.controller.ts | 12 ++++++------ src/resource/task/task.controller.ts | 12 ++++++------ 6 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/decorators/OpenAPI/event.decorators.ts b/src/decorators/OpenAPI/event.decorators.ts index b9718a1..745ea07 100644 --- a/src/decorators/OpenAPI/event.decorators.ts +++ b/src/decorators/OpenAPI/event.decorators.ts @@ -39,7 +39,7 @@ export function GetEventExceptionByIdApi() { ); } -export function CreateEventByCurrentUserApi() { +export function AddEventApi() { return applyDecorators( ApiCreatedResponse({ type: ReturnEventDTO }), ApiNotFoundResponse({ description: 'Event not found' }), diff --git a/src/decorators/OpenAPI/note.decorators.ts b/src/decorators/OpenAPI/note.decorators.ts index e217628..709bae0 100644 --- a/src/decorators/OpenAPI/note.decorators.ts +++ b/src/decorators/OpenAPI/note.decorators.ts @@ -8,7 +8,7 @@ import { } from '@nestjs/swagger'; import { editNoteDTO, NoteDTO } from '../../resource/note/dto'; -export function FetchUserNotesApi() { +export function GetUserNotesApi() { return applyDecorators(ApiOkResponse({ type: [NoteDTO] })); } @@ -21,7 +21,7 @@ export function AddNoteApi() { ); } -export function EditNoteByIdApi() { +export function EditNoteApi() { return applyDecorators( ApiOkResponse(), ApiBadRequestResponse({ description: 'Invalid body' }), diff --git a/src/decorators/OpenAPI/task.decorators.ts b/src/decorators/OpenAPI/task.decorators.ts index 526c015..07ff1ca 100644 --- a/src/decorators/OpenAPI/task.decorators.ts +++ b/src/decorators/OpenAPI/task.decorators.ts @@ -13,11 +13,11 @@ import { ReturnTaskDTO, } from '../../resource/task/dto'; -export function GetAllUserTasksApi() { +export function GetUserTasksApi() { return applyDecorators(ApiOkResponse({ type: [ReturnTaskDTO] })); } -export function GetUserTaskApi() { +export function GetTaskByIdApi() { return applyDecorators( ApiOkResponse({ type: ReturnTaskDTO }), ApiNotFoundResponse({ description: 'Task not found' }), diff --git a/src/resource/event/event.controller.ts b/src/resource/event/event.controller.ts index ba3a0fb..7942c84 100644 --- a/src/resource/event/event.controller.ts +++ b/src/resource/event/event.controller.ts @@ -20,7 +20,7 @@ import { JwtGuard } from 'src/auth/guard'; import { GetUser } from 'src/decorators'; import { AddEventExceptionApi, - CreateEventByCurrentUserApi, + AddEventApi, DeleteEventApi, DeleteExceptionApi, EditEventApi, @@ -86,8 +86,8 @@ export class EventController { } @Post() - @CreateEventByCurrentUserApi() - async createEventByCurrentUser( + @AddEventApi() + async addEvent( @GetUser('id') userId: number, @Body() eventDto: CreateEventDTO, ): Promise { diff --git a/src/resource/note/note.controller.ts b/src/resource/note/note.controller.ts index 64999b0..a2f0513 100644 --- a/src/resource/note/note.controller.ts +++ b/src/resource/note/note.controller.ts @@ -15,8 +15,8 @@ import { UserEntity } from 'src/database/entities/user.entity'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { AddNoteApi, - EditNoteByIdApi, - FetchUserNotesApi, + EditNoteApi as EditNoteApi, + GetUserNotesApi as GetUserNotesApi, } from '../../decorators/OpenAPI'; @UseGuards(JwtGuard) @@ -27,8 +27,8 @@ export class NoteController { constructor(private notesService: NoteService) {} @Get() - @FetchUserNotesApi() - fetchUserNotes(@GetUser() user: UserEntity) { + @GetUserNotesApi() + getUserNotes(@GetUser() user: UserEntity) { return this.notesService.fetchUserNotes(user); } @@ -39,8 +39,8 @@ export class NoteController { } @Patch(':id') - @EditNoteByIdApi() - editNoteById(@Param('id') id: number, @Body() noteDto: editNoteDTO) { + @EditNoteApi() + editNote(@Param('id') id: number, @Body() noteDto: editNoteDTO) { return this.notesService.editNoteById(id, noteDto); } } diff --git a/src/resource/task/task.controller.ts b/src/resource/task/task.controller.ts index 5db4282..6d8cd05 100644 --- a/src/resource/task/task.controller.ts +++ b/src/resource/task/task.controller.ts @@ -23,8 +23,8 @@ import { AddTaskApi, DeleteTaskApi, EditTaskApi, - GetAllUserTasksApi, - GetUserTaskApi, + GetUserTasksApi as GetUserTasksApi, + GetTaskByIdApi as GetTaskbyIdApi, } from '../../decorators/OpenAPI'; @UseGuards(JwtGuard) @@ -35,16 +35,16 @@ export class TaskController { constructor(private readonly taskService: TaskService) {} @Get('/user/all') - @GetAllUserTasksApi() - async getAllUserTasks( + @GetUserTasksApi() + async getUserTasks( @GetUser() user: UserEntity, ): Promise { return await this.taskService.getAllUserTasks(user); } @Get('/user/:id') - @GetUserTaskApi() - async getUserTask( + @GetTaskbyIdApi() + async getTaskById( @GetUser() user: UserEntity, @Param('id', ParseIntPipe) taskId: number, ): Promise { From ce9cc3802393dc78bd55126200f13e03d37032fe Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:13:47 +0200 Subject: [PATCH 3/9] changed task endpoint naming --- src/resource/task/task.controller.ts | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/resource/task/task.controller.ts b/src/resource/task/task.controller.ts index 6d8cd05..d3f22c3 100644 --- a/src/resource/task/task.controller.ts +++ b/src/resource/task/task.controller.ts @@ -34,7 +34,7 @@ import { export class TaskController { constructor(private readonly taskService: TaskService) {} - @Get('/user/all') + @Get() @GetUserTasksApi() async getUserTasks( @GetUser() user: UserEntity, @@ -42,7 +42,7 @@ export class TaskController { return await this.taskService.getAllUserTasks(user); } - @Get('/user/:id') + @Get(':id') @GetTaskbyIdApi() async getTaskById( @GetUser() user: UserEntity, From 481c5da05262ea272a2714d5eed1b3fe4d41f909 Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Thu, 19 Sep 2024 14:23:55 +0200 Subject: [PATCH 4/9] added types to notes --- src/resource/note/note.controller.ts | 6 +++--- src/resource/note/note.service.ts | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/resource/note/note.controller.ts b/src/resource/note/note.controller.ts index a2f0513..9fb449c 100644 --- a/src/resource/note/note.controller.ts +++ b/src/resource/note/note.controller.ts @@ -28,19 +28,19 @@ export class NoteController { @Get() @GetUserNotesApi() - getUserNotes(@GetUser() user: UserEntity) { + getUserNotes(@GetUser() user: UserEntity): Promise { return this.notesService.fetchUserNotes(user); } @Post(':id') @AddNoteApi() - addNote(@GetUser() user: UserEntity, @Body() noteDto: NoteDTO) { + addNote(@GetUser() user: UserEntity, @Body() noteDto: NoteDTO): Promise { return this.notesService.addNote(user, noteDto); } @Patch(':id') @EditNoteApi() - editNote(@Param('id') id: number, @Body() noteDto: editNoteDTO) { + editNote(@Param('id') id: number, @Body() noteDto: editNoteDTO): Promise { return this.notesService.editNoteById(id, noteDto); } } diff --git a/src/resource/note/note.service.ts b/src/resource/note/note.service.ts index 4069ce4..4bda359 100644 --- a/src/resource/note/note.service.ts +++ b/src/resource/note/note.service.ts @@ -12,14 +12,14 @@ export class NoteService { private noteRepository: Repository, ) {} - async fetchUserNotes(user: UserEntity) { + async fetchUserNotes(user: UserEntity): Promise { return this.noteRepository.find({ relations: ['user'], where: { user }, }); } - async addNote(user: UserEntity, noteDto: NoteDTO) { + async addNote(user: UserEntity, noteDto: NoteDTO): Promise { if (!user) throw new HttpException('User not found', HttpStatus.NOT_FOUND); const newNote = this.noteRepository.create({ ...noteDto, user }); @@ -27,7 +27,7 @@ export class NoteService { return this.noteRepository.save(newNote); } - async editNoteById(id: number, noteDto: editNoteDTO) { - return this.noteRepository.update({ id }, { ...noteDto }); + async editNoteById(id: number, noteDto: editNoteDTO): Promise { + this.noteRepository.update({ id }, { ...noteDto }); } } From b0de70a90d3bd97ae7085b1956a5ca01457efd88 Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:47:19 +0200 Subject: [PATCH 5/9] changed service methods names --- src/resource/event/event.controller.ts | 16 ++++++++-------- src/resource/event/event.service.ts | 16 ++++++++-------- src/resource/note/note.controller.ts | 6 +++--- src/resource/note/note.service.ts | 6 +++--- src/resource/task/task.controller.ts | 10 +++++----- src/resource/task/task.service.ts | 10 +++++----- 6 files changed, 32 insertions(+), 32 deletions(-) diff --git a/src/resource/event/event.controller.ts b/src/resource/event/event.controller.ts index 7942c84..86bd91d 100644 --- a/src/resource/event/event.controller.ts +++ b/src/resource/event/event.controller.ts @@ -54,7 +54,7 @@ export class EventController { async getUserEvents( @GetUser('id') userId: number, ): Promise { - return await this.eventService.fetchUserEvents(userId); + return await this.eventService.fetchUser(userId); } @Get('dates') @@ -74,7 +74,7 @@ export class EventController { @Get(':id') @GetEventByIdApi() async getEventById(@Param('id') eventId: number): Promise { - return await this.eventService.fetchById(eventId); + return await this.eventService.fetch(eventId); } @Get('except/:id') @@ -91,7 +91,7 @@ export class EventController { @GetUser('id') userId: number, @Body() eventDto: CreateEventDTO, ): Promise { - return await this.eventService.createEvent(userId, eventDto); + return await this.eventService.add(userId, eventDto); } @Post('exceptions/:id') @@ -100,7 +100,7 @@ export class EventController { @Param('id') eventId: number, @Body() exceptionDto: CreateEventExceptionDTO, ): Promise { - return await this.eventService.createException(eventId, exceptionDto); + return await this.eventService.addException(eventId, exceptionDto); } @Patch(':id') @@ -109,7 +109,7 @@ export class EventController { @Param('id') eventId: number, @Body() editEventDto: EditEventDTO, ): Promise { - return await this.eventService.editById(eventId, editEventDto); + return await this.eventService.edit(eventId, editEventDto); } @Patch('exceptions/:id') @@ -118,7 +118,7 @@ export class EventController { @Param('id') exceptionId: number, @Body() editExceptionDto: EditEventExceptionDTO, ): Promise { - return await this.eventService.editExceptionById( + return await this.eventService.editException( exceptionId, editExceptionDto, ); @@ -128,13 +128,13 @@ export class EventController { @Delete(':id') @DeleteEventApi() async deleteEvent(@Param('id') eventId: number): Promise { - await this.eventService.deleteById(eventId); + await this.eventService.delete(eventId); } @HttpCode(HttpStatus.NO_CONTENT) @Delete('exceptions/:id') @DeleteExceptionApi() async deleteException(@Param('id') exceptionId: number): Promise { - await this.eventService.removeExceptionById(exceptionId); + await this.eventService.deleteException(exceptionId); } } diff --git a/src/resource/event/event.service.ts b/src/resource/event/event.service.ts index 51e4c80..67515a7 100644 --- a/src/resource/event/event.service.ts +++ b/src/resource/event/event.service.ts @@ -33,7 +33,7 @@ export class EventService { private readonly exceptionRepository: Repository, ) {} - async fetchById(eventId: number): Promise { + async fetch(eventId: number): Promise { const event = await this.eventRepository.findOne({ where: { id: eventId }, relations: { recurrencePattern: true }, @@ -42,7 +42,7 @@ export class EventService { return event; } - async fetchUserEvents(userId: number): Promise { + async fetchUser(userId: number): Promise { return this.eventRepository.find({ where: { createdById: userId }, relations: { recurrencePattern: true, eventExceptions: true }, @@ -182,7 +182,7 @@ export class EventService { return exception; } - async createEvent( + async add( userId: number, eventDto: CreateEventDTO, ): Promise { @@ -194,7 +194,7 @@ export class EventService { return event; } - async createException( + async addException( eventId: number, exceptionDto: CreateEventExceptionDTO, ): Promise { @@ -206,7 +206,7 @@ export class EventService { return exception; } - async editById( + async edit( eventId: number, editEventDto: EditEventDTO, ): Promise { @@ -228,7 +228,7 @@ export class EventService { return eventToUpdate; } - async editExceptionById( + async editException( exceptionId: number, editExceptionDto: EditEventExceptionDTO, ): Promise { @@ -245,11 +245,11 @@ export class EventService { return exceptionToUpdate; } - async deleteById(eventId: number): Promise { + async delete(eventId: number): Promise { await this.eventRepository.delete({ id: eventId }); } - async removeExceptionById(exceptionId: number): Promise { + async deleteException(exceptionId: number): Promise { await this.exceptionRepository.delete({ id: exceptionId }); } } diff --git a/src/resource/note/note.controller.ts b/src/resource/note/note.controller.ts index 9fb449c..66d7ae1 100644 --- a/src/resource/note/note.controller.ts +++ b/src/resource/note/note.controller.ts @@ -29,18 +29,18 @@ export class NoteController { @Get() @GetUserNotesApi() getUserNotes(@GetUser() user: UserEntity): Promise { - return this.notesService.fetchUserNotes(user); + return this.notesService.fetchUser(user); } @Post(':id') @AddNoteApi() addNote(@GetUser() user: UserEntity, @Body() noteDto: NoteDTO): Promise { - return this.notesService.addNote(user, noteDto); + return this.notesService.add(user, noteDto); } @Patch(':id') @EditNoteApi() editNote(@Param('id') id: number, @Body() noteDto: editNoteDTO): Promise { - return this.notesService.editNoteById(id, noteDto); + return this.notesService.edit(id, noteDto); } } diff --git a/src/resource/note/note.service.ts b/src/resource/note/note.service.ts index 4bda359..d726aab 100644 --- a/src/resource/note/note.service.ts +++ b/src/resource/note/note.service.ts @@ -12,14 +12,14 @@ export class NoteService { private noteRepository: Repository, ) {} - async fetchUserNotes(user: UserEntity): Promise { + async fetchUser(user: UserEntity): Promise { return this.noteRepository.find({ relations: ['user'], where: { user }, }); } - async addNote(user: UserEntity, noteDto: NoteDTO): Promise { + async add(user: UserEntity, noteDto: NoteDTO): Promise { if (!user) throw new HttpException('User not found', HttpStatus.NOT_FOUND); const newNote = this.noteRepository.create({ ...noteDto, user }); @@ -27,7 +27,7 @@ export class NoteService { return this.noteRepository.save(newNote); } - async editNoteById(id: number, noteDto: editNoteDTO): Promise { + async edit(id: number, noteDto: editNoteDTO): Promise { this.noteRepository.update({ id }, { ...noteDto }); } } diff --git a/src/resource/task/task.controller.ts b/src/resource/task/task.controller.ts index d3f22c3..f7ff11b 100644 --- a/src/resource/task/task.controller.ts +++ b/src/resource/task/task.controller.ts @@ -39,7 +39,7 @@ export class TaskController { async getUserTasks( @GetUser() user: UserEntity, ): Promise { - return await this.taskService.getAllUserTasks(user); + return await this.taskService.fetchUser(user); } @Get(':id') @@ -48,7 +48,7 @@ export class TaskController { @GetUser() user: UserEntity, @Param('id', ParseIntPipe) taskId: number, ): Promise { - const task = await this.taskService.getUserTask(user, taskId); + const task = await this.taskService.fetch(user, taskId); if (!task) { throw new NotFoundException('Task not found'); } @@ -62,7 +62,7 @@ export class TaskController { @GetUser() user: UserEntity, @Body() createTaskDTO: CreateTaskDTO, ): Promise { - return await this.taskService.addTask(user, createTaskDTO); + return await this.taskService.add(user, createTaskDTO); } @Patch(':id') @@ -76,7 +76,7 @@ export class TaskController { throw new BadRequestException('ID is not valid in URL and body'); } - const task = await this.taskService.editTask(user, editTask); + const task = await this.taskService.edit(user, editTask); if (!task) { throw new NotFoundException('Task not found'); } @@ -90,7 +90,7 @@ export class TaskController { @GetUser() user: UserEntity, @Param('id', ParseIntPipe) taskId: number, ): Promise { - const isTaskRemoved = await this.taskService.deleteTask(user, taskId); + const isTaskRemoved = await this.taskService.delete(user, taskId); if (!isTaskRemoved) throw new NotFoundException('Task not found'); return; } diff --git a/src/resource/task/task.service.ts b/src/resource/task/task.service.ts index 38d3dc5..a3b983f 100644 --- a/src/resource/task/task.service.ts +++ b/src/resource/task/task.service.ts @@ -12,19 +12,19 @@ export class TaskService { private readonly taskRepository: Repository, ) {} - async getUserTask(user: UserEntity, id: number): Promise { + async fetch(user: UserEntity, id: number): Promise { return await this.taskRepository.findOne({ where: { id, user }, }); } - async getAllUserTasks(user: UserEntity): Promise { + async fetchUser(user: UserEntity): Promise { return await this.taskRepository.find({ where: { user }, }); } - async addTask( + async add( user: UserEntity, createTaskDTO: CreateTaskDTO, ): Promise { @@ -32,7 +32,7 @@ export class TaskService { return await this.taskRepository.save({ ...newTask, user }); } - async editTask( + async edit( user: UserEntity, editTask: EditTaskDTO, ): Promise { @@ -46,7 +46,7 @@ export class TaskService { return await this.taskRepository.save({ ...editTask }); } - async deleteTask(user: UserEntity, id: number): Promise { + async delete(user: UserEntity, id: number): Promise { const task = await this.taskRepository.findOneBy({ id, user, From c4176cea4b90e0a972cd1ccb924e494753e2b371 Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Thu, 19 Sep 2024 16:48:00 +0200 Subject: [PATCH 6/9] fixed note post endpoint --- src/resource/note/note.controller.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/resource/note/note.controller.ts b/src/resource/note/note.controller.ts index 66d7ae1..ae1f6f6 100644 --- a/src/resource/note/note.controller.ts +++ b/src/resource/note/note.controller.ts @@ -32,7 +32,7 @@ export class NoteController { return this.notesService.fetchUser(user); } - @Post(':id') + @Post() @AddNoteApi() addNote(@GetUser() user: UserEntity, @Body() noteDto: NoteDTO): Promise { return this.notesService.add(user, noteDto); From 5c90e51dfbf79ed3de6e9665cb70053a86fe755d Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Fri, 20 Sep 2024 13:33:22 +0200 Subject: [PATCH 7/9] changed fetchUser in services to fetchByUser --- src/resource/event/event.controller.ts | 2 +- src/resource/event/event.service.ts | 2 +- src/resource/note/note.controller.ts | 2 +- src/resource/note/note.service.ts | 2 +- src/resource/task/task.controller.ts | 2 +- src/resource/task/task.service.ts | 2 +- 6 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/resource/event/event.controller.ts b/src/resource/event/event.controller.ts index 86bd91d..954284e 100644 --- a/src/resource/event/event.controller.ts +++ b/src/resource/event/event.controller.ts @@ -54,7 +54,7 @@ export class EventController { async getUserEvents( @GetUser('id') userId: number, ): Promise { - return await this.eventService.fetchUser(userId); + return await this.eventService.fetchByUser(userId); } @Get('dates') diff --git a/src/resource/event/event.service.ts b/src/resource/event/event.service.ts index 67515a7..bf71189 100644 --- a/src/resource/event/event.service.ts +++ b/src/resource/event/event.service.ts @@ -42,7 +42,7 @@ export class EventService { return event; } - async fetchUser(userId: number): Promise { + async fetchByUser(userId: number): Promise { return this.eventRepository.find({ where: { createdById: userId }, relations: { recurrencePattern: true, eventExceptions: true }, diff --git a/src/resource/note/note.controller.ts b/src/resource/note/note.controller.ts index ae1f6f6..db9ad72 100644 --- a/src/resource/note/note.controller.ts +++ b/src/resource/note/note.controller.ts @@ -29,7 +29,7 @@ export class NoteController { @Get() @GetUserNotesApi() getUserNotes(@GetUser() user: UserEntity): Promise { - return this.notesService.fetchUser(user); + return this.notesService.fetchByUser(user); } @Post() diff --git a/src/resource/note/note.service.ts b/src/resource/note/note.service.ts index d726aab..417a57f 100644 --- a/src/resource/note/note.service.ts +++ b/src/resource/note/note.service.ts @@ -12,7 +12,7 @@ export class NoteService { private noteRepository: Repository, ) {} - async fetchUser(user: UserEntity): Promise { + async fetchByUser(user: UserEntity): Promise { return this.noteRepository.find({ relations: ['user'], where: { user }, diff --git a/src/resource/task/task.controller.ts b/src/resource/task/task.controller.ts index f7ff11b..d074327 100644 --- a/src/resource/task/task.controller.ts +++ b/src/resource/task/task.controller.ts @@ -39,7 +39,7 @@ export class TaskController { async getUserTasks( @GetUser() user: UserEntity, ): Promise { - return await this.taskService.fetchUser(user); + return await this.taskService.fetchByUser(user); } @Get(':id') diff --git a/src/resource/task/task.service.ts b/src/resource/task/task.service.ts index a3b983f..078e4ac 100644 --- a/src/resource/task/task.service.ts +++ b/src/resource/task/task.service.ts @@ -18,7 +18,7 @@ export class TaskService { }); } - async fetchUser(user: UserEntity): Promise { + async fetchByUser(user: UserEntity): Promise { return await this.taskRepository.find({ where: { user }, }); From a2d989bc6a502c0ed175e1da0dc1a5fbb726aeba Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Fri, 20 Sep 2024 21:38:57 +0200 Subject: [PATCH 8/9] removed unnecessary as --- src/resource/note/note.controller.ts | 4 ++-- src/resource/task/task.controller.ts | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/src/resource/note/note.controller.ts b/src/resource/note/note.controller.ts index db9ad72..01221cd 100644 --- a/src/resource/note/note.controller.ts +++ b/src/resource/note/note.controller.ts @@ -15,8 +15,8 @@ import { UserEntity } from 'src/database/entities/user.entity'; import { ApiBearerAuth, ApiTags } from '@nestjs/swagger'; import { AddNoteApi, - EditNoteApi as EditNoteApi, - GetUserNotesApi as GetUserNotesApi, + EditNoteApi, + GetUserNotesApi } from '../../decorators/OpenAPI'; @UseGuards(JwtGuard) diff --git a/src/resource/task/task.controller.ts b/src/resource/task/task.controller.ts index d074327..ef45bf3 100644 --- a/src/resource/task/task.controller.ts +++ b/src/resource/task/task.controller.ts @@ -23,8 +23,8 @@ import { AddTaskApi, DeleteTaskApi, EditTaskApi, - GetUserTasksApi as GetUserTasksApi, - GetTaskByIdApi as GetTaskbyIdApi, + GetUserTasksApi, + GetTaskByIdApi } from '../../decorators/OpenAPI'; @UseGuards(JwtGuard) @@ -43,7 +43,7 @@ export class TaskController { } @Get(':id') - @GetTaskbyIdApi() + @GetTaskByIdApi() async getTaskById( @GetUser() user: UserEntity, @Param('id', ParseIntPipe) taskId: number, From edbd1197971a1985695131bc880dbffb3b44bb74 Mon Sep 17 00:00:00 2001 From: IK541 <116464253+IK541@users.noreply.github.com> Date: Fri, 20 Sep 2024 21:51:55 +0200 Subject: [PATCH 9/9] added ById to single fetches --- src/resource/event/event.controller.ts | 2 +- src/resource/event/event.service.ts | 2 +- src/resource/task/task.controller.ts | 2 +- src/resource/task/task.service.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/resource/event/event.controller.ts b/src/resource/event/event.controller.ts index 954284e..644a11e 100644 --- a/src/resource/event/event.controller.ts +++ b/src/resource/event/event.controller.ts @@ -74,7 +74,7 @@ export class EventController { @Get(':id') @GetEventByIdApi() async getEventById(@Param('id') eventId: number): Promise { - return await this.eventService.fetch(eventId); + return await this.eventService.fetchById(eventId); } @Get('except/:id') diff --git a/src/resource/event/event.service.ts b/src/resource/event/event.service.ts index bf71189..9439d57 100644 --- a/src/resource/event/event.service.ts +++ b/src/resource/event/event.service.ts @@ -33,7 +33,7 @@ export class EventService { private readonly exceptionRepository: Repository, ) {} - async fetch(eventId: number): Promise { + async fetchById(eventId: number): Promise { const event = await this.eventRepository.findOne({ where: { id: eventId }, relations: { recurrencePattern: true }, diff --git a/src/resource/task/task.controller.ts b/src/resource/task/task.controller.ts index ef45bf3..327634f 100644 --- a/src/resource/task/task.controller.ts +++ b/src/resource/task/task.controller.ts @@ -48,7 +48,7 @@ export class TaskController { @GetUser() user: UserEntity, @Param('id', ParseIntPipe) taskId: number, ): Promise { - const task = await this.taskService.fetch(user, taskId); + const task = await this.taskService.fetchById(user, taskId); if (!task) { throw new NotFoundException('Task not found'); } diff --git a/src/resource/task/task.service.ts b/src/resource/task/task.service.ts index 078e4ac..8e5b3d4 100644 --- a/src/resource/task/task.service.ts +++ b/src/resource/task/task.service.ts @@ -12,7 +12,7 @@ export class TaskService { private readonly taskRepository: Repository, ) {} - async fetch(user: UserEntity, id: number): Promise { + async fetchById(user: UserEntity, id: number): Promise { return await this.taskRepository.findOne({ where: { id, user }, });