chore(api): fix naming convention and separation between modules

api/src/app.module.ts

@@ -7,10 +7,10 @@ import { AppService } from './app.service';
 import { PrismaService } from './prisma/prisma.service';
 import { JwtAuthGuard } from './users/guards/jwt-auth.guard';
 import { UsersModule } from './users/users.module';
-import { ListsModule } from './lists/lists.module';
+import { ListsModule } from './list/list.module';
 import { EmailModule } from './email/email.module';
 import { ImageModule } from './image/image.module';
-import { MoviesModule } from './movies/movies.module';
+import { MoviesModule } from './movie/movie.module';
 
 @Module({
   imports: [

api/src/lists/comments.service.spec.ts → api/src/list/comment.service.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { CommentsService } from './comments.service';
+import { CommentsService } from './comment.service';
 
 describe.skip('CommentsService', () => {
   let service: CommentsService;

api/src/lists/comments.service.ts → api/src/list/comment.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
-import { CommentDao } from './daos/comment.dao';
-import { CreateCommentDto } from './dtos/create-comment.dto';
-import { UpdateCommentDto } from './dtos/update-comment.dto';
+import { CommentDao } from './dao/comment.dao';
+import { CreateCommentDto } from './dto/create-comment.dto';
+import { UpdateCommentDto } from './dto/update-comment.dto';
 
 @Injectable()
 export class CommentsService {

api/src/lists/daos/list.dao.ts → api/src/list/dao/list.dao.ts

@@ -1,7 +1,7 @@
 import { BadRequestException, Injectable } from '@nestjs/common';
 import { v4 as uuidv4 } from 'uuid';
 import { PrismaService } from '../../prisma/prisma.service';
-import { UpdateListDto } from '../dtos/update-list.dto';
+import { UpdateListDto } from '../dto/update-list.dto';
 import { Role, User } from '@prisma/client';
 
 @Injectable()

api/src/lists/dtos/create-list-return.dto.ts → api/src/list/dto/create-list-return.dto.ts

@@ -1,7 +1,7 @@
 import { Expose, Type } from 'class-transformer';
 import { ValidateNested } from 'class-validator';
 import { UserDto } from '../../users/dtos/user.dto';
-import { CommentDto } from './comments.dto';
+import { CommentDto } from './comment.dto';
 
 export class List {
   @Expose()

api/src/lists/dtos/create-list.dto.ts → api/src/list/dto/create-list.dto.ts

@@ -1,5 +1,5 @@
 import { IsArray, IsOptional, IsString } from 'class-validator';
-import { MovieDto } from './movie.dto';
+import { MovieDto } from '../../movie/dto/movie.dto';
 
 export class CreateListDto {
   @IsString()

api/src/lists/dtos/update-list.dto.ts → api/src/list/dto/update-list.dto.ts

@@ -1,6 +1,6 @@
 import { Type } from 'class-transformer';
 import { IsString, IsOptional, IsArray, ValidateNested } from 'class-validator';
-import { MovieDto } from './movie.dto';
+import { MovieDto } from '../../movie/dto/movie.dto';
 
 export class UpdateListDto {
   @IsString()

api/src/lists/guards/list-private.guard.ts → api/src/list/guard/list-private.guard.ts

@@ -4,7 +4,7 @@ import {
   ExecutionContext,
   Injectable,
 } from '@nestjs/common';
-import { ListsService } from '../lists.service';
+import { ListsService } from '../list.service';
 import { UsersService } from '../../users/users.service';
 
 @Injectable()

api/src/lists/guards/share-list.guard.ts → api/src/list/guard/share-list.guard.ts

@@ -4,7 +4,7 @@ import {
   ExecutionContext,
   Injectable,
 } from '@nestjs/common';
-import { ListsService } from '../lists.service';
+import { ListsService } from '../list.service';
 import { UsersService } from '../../users/users.service';
 
 @Injectable()

api/src/lists/interceptors/remove-list-create-fields.interceptor.ts → api/src/list/interceptor/remove-list-create-fields.interceptor.ts

@@ -3,7 +3,7 @@ import { NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { plainToInstance } from 'class-transformer';
-import { CreateListReturn } from '../dtos/create-list-return.dto';
+import { CreateListReturn } from '../dto/create-list-return.dto';
 
 export class RemoveListCreateFieldsInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, handler: CallHandler): Observable<any> {

api/src/lists/interceptors/remove-list-fields.interceptor.ts → api/src/list/interceptor/remove-list-fields.interceptor.ts

@@ -3,7 +3,7 @@ import { NestInterceptor, ExecutionContext, CallHandler } from '@nestjs/common';
 import { Observable } from 'rxjs';
 import { map } from 'rxjs/operators';
 import { plainToInstance } from 'class-transformer';
-import { ListDto } from '../dtos/list.dto';
+import { ListDto } from '../dto/list.dto';
 
 export class RemoveListFieldsInterceptor implements NestInterceptor {
   intercept(context: ExecutionContext, handler: CallHandler): Observable<any> {

api/src/lists/lists.controller.spec.ts → api/src/list/list.controller.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { ListsController } from './lists.controller';
+import { ListsController } from './list.controller';
 
 describe.skip('ListsController', () => {
   let controller: ListsController;

api/src/lists/lists.controller.ts → api/src/list/list.controller.ts

@@ -14,20 +14,20 @@ import {
   Param,
 } from '@nestjs/common';
 import { Request } from 'express';
-import { ListsService } from './lists.service';
-import { CommentsService } from './comments.service';
-import { ListAuthGuard } from './guards/list.guard';
-import { RemoveListFieldsInterceptor } from './interceptors/remove-list-fields.interceptor';
-import { RemoveListCreateFieldsInterceptor } from './interceptors/remove-list-create-fields.interceptor';
-import { CreateListDto } from './dtos/create-list.dto';
-import { UpdateListDto } from './dtos/update-list.dto';
-import { CreateCommentDto } from './dtos/create-comment.dto';
-import { UpdateCommentDto } from './dtos/update-comment.dto';
+import { ListsService } from './list.service';
+import { CommentsService } from './comment.service';
+import { ListAuthGuard } from './guard/list.guard';
+import { RemoveListFieldsInterceptor } from './interceptor/remove-list-fields.interceptor';
+import { RemoveListCreateFieldsInterceptor } from './interceptor/remove-list-create-fields.interceptor';
+import { CreateListDto } from './dto/create-list.dto';
+import { UpdateListDto } from './dto/update-list.dto';
+import { CreateCommentDto } from './dto/create-comment.dto';
+import { UpdateCommentDto } from './dto/update-comment.dto';
 import { CommentAuthorizationGuard } from '../users/guards/comment-auth.guard';
-import { CloneListDto } from './dtos/clone-list.dto';
+import { CloneListDto } from './dto/clone-list.dto';
 import { Public } from '../users/decorators/public.decorator';
-import { ShareListAuthGuard } from './guards/share-list.guard';
-import { ListPrivacyAuthGuard } from './guards/list-private.guard';
+import { ShareListAuthGuard } from './guard/share-list.guard';
+import { ListPrivacyAuthGuard } from './guard/list-private.guard';
 import { UsersService } from '../users/users.service';
 import { EmailService } from '../email/email.service';
 

api/src/lists/lists.module.ts → api/src/list/list.module.ts

@@ -1,15 +1,15 @@
 import { Module } from '@nestjs/common';
-import { ListsController } from './lists.controller';
-import { ListsService } from './lists.service';
+import { ListsController } from './list.controller';
+import { ListsService } from './list.service';
 import { UsersService } from '../users/users.service';
 import { PrismaModule } from '../prisma/prisma.module';
 import { EmailModule } from '../email/email.module';
 import { UsersModule } from '../users/users.module';
-import { ListDao } from './daos/list.dao';
-import { CommentDao } from './daos/comment.dao';
+import { ListDao } from './dao/list.dao';
+import { CommentDao } from './dao/comment.dao';
 import { UsersDao } from '../users/daos/user.dao';
-import { CommentsService } from './comments.service';
-import { MoviesModule } from '../movies/movies.module';
+import { CommentsService } from './comment.service';
+import { MoviesModule } from '../movie/movie.module';
 
 @Module({
   imports: [PrismaModule, EmailModule, UsersModule, MoviesModule],

api/src/lists/lists.service.spec.ts → api/src/list/list.service.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { ListsService } from './lists.service';
+import { ListsService } from './list.service';
 
 describe.skip('ListsService', () => {
   let service: ListsService;

api/src/lists/lists.service.ts → api/src/list/list.service.ts

@@ -1,11 +1,11 @@
 import { Injectable } from '@nestjs/common';
-import { CreateListDto } from './dtos/create-list.dto';
-import { UpdateListDto } from './dtos/update-list.dto';
-import { ListDao } from './daos/list.dao';
+import { CreateListDto } from './dto/create-list.dto';
+import { UpdateListDto } from './dto/update-list.dto';
+import { ListDao } from './dao/list.dao';
 import { UsersService } from '../users/users.service';
 import { EmailService } from '../email/email.service';
-import { CloneListDto } from './dtos/clone-list.dto';
-import { MoviesService } from '../movies/movies.service';
+import { CloneListDto } from './dto/clone-list.dto';
+import { MoviesService } from '../movie/movie.service';
 
 interface Comment {
   id: string;

api/src/movies/dao/movies.dao.ts → api/src/movie/dao/movie.dao.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { v4 as uuidv4 } from 'uuid';
 import { PrismaService } from '../../prisma/prisma.service';
-import { MovieDto } from '../../lists/dtos/movie.dto';
+import { MovieDto } from '../dto/movie.dto';
 
 @Injectable()
 export class MoviesDao {

api/src/movies/movies.controller.spec.ts → api/src/movie/movie.controller.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { MoviesController } from './movies.controller';
+import { MoviesController } from './movie.controller';
 
 describe('MoviesController', () => {
   let controller: MoviesController;

api/src/movies/movies.controller.ts → api/src/movie/movie.controller.ts

@@ -13,9 +13,9 @@ import {
   Query,
 } from '@nestjs/common';
 import { Request } from 'express';
-import { ListAuthGuard } from '../lists/guards/list.guard';
-import { RemoveListFieldsInterceptor } from '../lists/interceptors/remove-list-fields.interceptor';
-import { MoviesService } from './movies.service';
+import { ListAuthGuard } from '../list/guard/list.guard';
+import { RemoveListFieldsInterceptor } from '../list/interceptor/remove-list-fields.interceptor';
+import { MoviesService } from './movie.service';
 
 @Controller('movies')
 export class MoviesController {
@@ -37,7 +37,7 @@ export class MoviesController {
 
   @UseInterceptors(RemoveListFieldsInterceptor)
   @UseGuards(ListAuthGuard)
-  @Delete('/:id/lists/:listId')
+  @Delete('/:id/list/:listId')
   @HttpCode(HttpStatus.NO_CONTENT)
   removeMovieFromList(
     @Param('listId') listId: string,

api/src/movies/movies.module.ts → api/src/movie/movie.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
-import { MoviesController } from './movies.controller';
+import { MoviesController } from './movie.controller';
 import { PrismaModule } from '../prisma/prisma.module';
-import { MoviesService } from './movies.service';
-import { MoviesDao } from './dao/movies.dao';
+import { MoviesService } from './movie.service';
+import { MoviesDao } from './dao/movie.dao';
 
 @Module({
   imports: [PrismaModule],

api/src/movies/movies.service.spec.ts → api/src/movie/movie.service.spec.ts

@@ -1,5 +1,5 @@
 import { Test, TestingModule } from '@nestjs/testing';
-import { MoviesService } from './movies.service';
+import { MoviesService } from './movie.service';
 
 describe('MoviesService', () => {
   let service: MoviesService;

api/src/movies/movies.service.ts → api/src/movie/movie.service.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
-import { MoviesDao } from './dao/movies.dao';
-import { MovieDto } from '../lists/dtos/movie.dto';
+import { MoviesDao } from './dao/movie.dao';
+import { MovieDto } from './dto/movie.dto';
 
 @Injectable()
 export class MoviesService {

api/src/users/guards/comment-auth.guard.ts

@@ -1,5 +1,5 @@
 import { CanActivate, ExecutionContext, Injectable } from '@nestjs/common';
-import { ListDao } from '../../lists/daos/list.dao';
+import { ListDao } from '../../list/dao/list.dao';
 
 @Injectable()
 export class CommentAuthorizationGuard implements CanActivate {

api/src/users/users.controller.spec.ts

@@ -8,8 +8,8 @@ import { AuthService } from './auth/auth.service';
 import { EmailService } from '../email/email.service';
 import { EmailModule } from '../email/email.module';
 import { CreateUserDto } from './dtos/create-user.dto';
-import { ListsService } from '../lists/lists.service';
-import { ListsModule } from '../lists/lists.module';
+import { ListsService } from '../list/list.service';
+import { ListsModule } from '../list/list.module';
 import { ImageModule } from '../image/image.module';
 import { ImageService } from '../image/image.service';
 

api/src/users/users.controller.ts

@@ -26,7 +26,7 @@ import { AuthService } from './auth/auth.service';
 import { AdminGuard } from './guards/admin.guard';
 import { CreateUserDto } from './dtos/create-user.dto';
 import { UpdateUserDto } from './dtos/update-user.dto';
-import { ListsService } from '../lists/lists.service';
+import { ListsService } from '../list/list.service';
 import { Request } from 'express';
 import { LocalAuthGuard } from './guards/local-auth.guard';
 import { RemoveFieldsInterceptor } from './interceptors/remove-fields.interceptor';

api/src/users/users.module.ts

@@ -7,18 +7,18 @@ import { UsersService } from './users.service';
 import { PrismaModule } from '../prisma/prisma.module';
 import { EmailModule } from '../email/email.module';
 import { UsersDao } from './daos/user.dao';
-import { ListsService } from '../lists/lists.service';
-import { ListDao } from '../lists/daos/list.dao';
+import { ListsService } from '../list/list.service';
+import { ListDao } from '../list/dao/list.dao';
 import { LocalStrategy } from './auth/passport/local.strategy';
 import { JwtStrategy } from './auth/passport/jwt.strategy';
-import { CommentDao } from '../lists/daos/comment.dao';
+import { CommentDao } from '../list/dao/comment.dao';
 import { AuthService } from './auth/auth.service';
 import { AuthModule } from './auth/auth.module';
 import { ExportModule } from './export/export.module';
 import { ImageModule } from '../image/image.module';
 import { ImageService } from '../image/image.service';
 import { ImageDao } from '../image/daos/image.dao';
-import { MoviesModule } from '../movies/movies.module';
+import { MoviesModule } from '../movie/movie.module';
 
 @Module({
   imports: [