feat: move all models to models folder (#62)

Jozwiaczek · Feb 18, 2021 · 2358f2f · 2358f2f
1 parent f209d2e
commit 2358f2f
Show file tree

Hide file tree

Showing 30 changed files with 22 additions and 21 deletions.
diff --git a/packages/api/nest-cli.json b/packages/api/nest-cli.json
@@ -1,4 +1,5 @@
 {
   "collection": "@nestjs/schematics",
-  "sourceRoot": "src"
+  "sourceRoot": "src/modules",
+  "entryFile": "src/main"
 }
diff --git a/packages/api/src/interfaces/cookie-types.d.ts b/packages/api/src/interfaces/cookie-types.d.ts
@@ -1,7 +1,7 @@
 import { Request } from '@nestjs/common';
 import { CookieOptions } from 'express';
 
-import { UserEntity } from '../database/entities/user.entity';
+import { UserEntity } from '../modules/database/entities/user.entity';
 
 type Modify<T, R> = Omit<T, keyof R> & R;
 export interface LoginRequest

diff --git a/packages/api/src/main.ts b/packages/api/src/main.ts
@@ -3,7 +3,7 @@ import 'dotenv/config';
 import { NestFactory } from '@nestjs/core';
 import cookieParser from 'cookie-parser';
 
-import { AppModule } from './app.module';
+import { AppModule } from './modules/app.module';
 
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);

diff --git a/packages/api/src/app.module.ts → packages/api/src/modules/app.module.ts b/packages/api/src/app.module.ts → packages/api/src/modules/app.module.ts
diff --git a/packages/api/src/auth/auth.controller.ts → ...s/api/src/modules/auth/auth.controller.ts b/packages/api/src/auth/auth.controller.ts → ...s/api/src/modules/auth/auth.controller.ts
@@ -9,10 +9,10 @@ import {
   UseGuards,
 } from '@nestjs/common';
 
-import { CookieRequest, CookieResponse, LoginRequest } from '../interfaces/cookie-types';
-import { TokenPayload } from '../interfaces/token-types';
+import { CookieRequest, CookieResponse, LoginRequest } from '../../interfaces/cookie-types';
+import { TokenPayload } from '../../interfaces/token-types';
+import { constants, cookiesUtils } from '../../utils';
 import { CreateUserDto } from '../users/dto/create-user.dto';
-import { constants, cookiesUtils } from '../utils';
 import { AuthService } from './auth.service';
 import { CookiePayload } from './decorators/cookiePayload.decorator';
 import { LocalAuthGuard } from './strategies/local/local-auth.guard';

diff --git a/packages/api/src/auth/auth.module.ts → packages/api/src/modules/auth/auth.module.ts b/packages/api/src/auth/auth.module.ts → packages/api/src/modules/auth/auth.module.ts
diff --git a/packages/api/src/auth/auth.service.ts → ...ages/api/src/modules/auth/auth.service.ts b/packages/api/src/auth/auth.service.ts → ...ages/api/src/modules/auth/auth.service.ts
@@ -2,16 +2,16 @@ import { forwardRef, Inject, NotFoundException, UnauthorizedException } from '@n
 import * as bcrypt from 'bcrypt';
 import jsonwebtoken from 'jsonwebtoken';
 
-import { UserEntity } from '../database/entities/user.entity';
 import {
   GeneratedTokens,
   TokenPayload,
   TokenPayloadCreate,
   Tokens,
-} from '../interfaces/token-types';
+} from '../../interfaces/token-types';
+import { constants } from '../../utils';
+import { UserEntity } from '../database/entities/user.entity';
 import { CreateUserDto } from '../users/dto/create-user.dto';
 import { UsersService } from '../users/users.service';
-import { constants } from '../utils';
 import { RefreshTokenService } from './refresh-token.service';
 
 export class AuthService {

diff --git a/...api/src/auth/decorators/auth.decorator.ts → ...modules/auth/decorators/auth.decorator.ts b/...api/src/auth/decorators/auth.decorator.ts → ...modules/auth/decorators/auth.decorator.ts
diff --git a/...uth/decorators/cookiePayload.decorator.ts → ...uth/decorators/cookiePayload.decorator.ts b/...uth/decorators/cookiePayload.decorator.ts → ...uth/decorators/cookiePayload.decorator.ts
@@ -1,8 +1,8 @@
 import { createParamDecorator, ExecutionContext, UnauthorizedException } from '@nestjs/common';
 import jsonwebtoken from 'jsonwebtoken';
 
-import { TokenPayload } from '../../interfaces/token-types';
-import { constants, cookiesUtils } from '../../utils';
+import { TokenPayload } from '../../../interfaces/token-types';
+import { constants, cookiesUtils } from '../../../utils';
 
 export const CookiePayload = createParamDecorator(
   (data: unknown, context: ExecutionContext): TokenPayload => {

diff --git a/...pi/src/auth/decorators/roles.decorator.ts → ...odules/auth/decorators/roles.decorator.ts b/...pi/src/auth/decorators/roles.decorator.ts → ...odules/auth/decorators/roles.decorator.ts
diff --git a/...c/auth/guards/only-authenticated.guard.ts → ...s/auth/guards/only-authenticated.guard.ts b/...c/auth/guards/only-authenticated.guard.ts → ...s/auth/guards/only-authenticated.guard.ts
@@ -1,8 +1,8 @@
 import { CanActivate, ExecutionContext, Injectable, UnauthorizedException } from '@nestjs/common';
 
-import { CookieResponse } from '../../interfaces/cookie-types';
-import { TokenPayloadCreate, Tokens } from '../../interfaces/token-types';
-import { constants, cookiesUtils } from '../../utils';
+import { CookieResponse } from '../../../interfaces/cookie-types';
+import { TokenPayloadCreate, Tokens } from '../../../interfaces/token-types';
+import { constants, cookiesUtils } from '../../../utils';
 import { AuthService } from '../auth.service';
 
 @Injectable()

diff --git a/packages/api/src/auth/guards/roles.guard.ts → ...pi/src/modules/auth/guards/roles.guard.ts b/packages/api/src/auth/guards/roles.guard.ts → ...pi/src/modules/auth/guards/roles.guard.ts
diff --git a/...ges/api/src/auth/refresh-token.service.ts → ...src/modules/auth/refresh-token.service.ts b/...ges/api/src/auth/refresh-token.service.ts → ...src/modules/auth/refresh-token.service.ts
@@ -3,9 +3,9 @@ import * as bcrypt from 'bcrypt';
 import jsonwebtoken from 'jsonwebtoken';
 import { Connection, LessThan } from 'typeorm';
 
+import { TokenPayload } from '../../interfaces/token-types';
 import { RefreshTokenEntity } from '../database/entities/refreshToken.entity';
 import { UserEntity } from '../database/entities/user.entity';
-import { TokenPayload } from '../interfaces/token-types';
 
 @Injectable()
 export class RefreshTokenService {

diff --git a/packages/api/src/auth/role.enum.ts → packages/api/src/modules/auth/role.enum.ts b/packages/api/src/auth/role.enum.ts → packages/api/src/modules/auth/role.enum.ts
diff --git a/...auth/strategies/local/local-auth.guard.ts → ...auth/strategies/local/local-auth.guard.ts b/...auth/strategies/local/local-auth.guard.ts → ...auth/strategies/local/local-auth.guard.ts
diff --git a/...c/auth/strategies/local/local.strategy.ts → ...s/auth/strategies/local/local.strategy.ts b/...c/auth/strategies/local/local.strategy.ts → ...s/auth/strategies/local/local.strategy.ts
diff --git a/...database/config/database-config.module.ts → ...database/config/database-config.module.ts b/...database/config/database-config.module.ts → ...database/config/database-config.module.ts
diff --git a/...atabase/config/database-config.service.ts → ...atabase/config/database-config.service.ts b/...atabase/config/database-config.service.ts → ...atabase/config/database-config.service.ts
diff --git a/packages/api/src/database/database.module.ts → ...i/src/modules/database/database.module.ts b/packages/api/src/database/database.module.ts → ...i/src/modules/database/database.module.ts
diff --git a/packages/api/src/database/entities/index.ts → ...pi/src/modules/database/entities/index.ts b/packages/api/src/database/entities/index.ts → ...pi/src/modules/database/entities/index.ts
diff --git a/.../database/entities/refreshToken.entity.ts → .../database/entities/refreshToken.entity.ts b/.../database/entities/refreshToken.entity.ts → .../database/entities/refreshToken.entity.ts
diff --git a/.../api/src/database/entities/user.entity.ts → .../modules/database/entities/user.entity.ts b/.../api/src/database/entities/user.entity.ts → .../modules/database/entities/user.entity.ts
diff --git a/...ages/api/src/users/dto/create-user.dto.ts → .../src/modules/users/dto/create-user.dto.ts b/...ages/api/src/users/dto/create-user.dto.ts → .../src/modules/users/dto/create-user.dto.ts
diff --git a/...ages/api/src/users/dto/update-user.dto.ts → .../src/modules/users/dto/update-user.dto.ts b/...ages/api/src/users/dto/update-user.dto.ts → .../src/modules/users/dto/update-user.dto.ts
diff --git a/packages/api/src/users/users.controller.ts → ...api/src/modules/users/users.controller.ts b/packages/api/src/users/users.controller.ts → ...api/src/modules/users/users.controller.ts
diff --git a/packages/api/src/users/users.module.ts → ...ges/api/src/modules/users/users.module.ts b/packages/api/src/users/users.module.ts → ...ges/api/src/modules/users/users.module.ts
diff --git a/packages/api/src/users/users.service.spec.ts → ...i/src/modules/users/users.service.spec.ts b/packages/api/src/users/users.service.spec.ts → ...i/src/modules/users/users.service.spec.ts
@@ -2,9 +2,9 @@ import { NotFoundException } from '@nestjs/common';
 import { Test } from '@nestjs/testing';
 import { Connection, QueryFailedError } from 'typeorm';
 
-import { clearTestDatabase } from '../../test/utils/clearTestDatabase';
-import { testClearRepository } from '../../test/utils/testClearRepository';
-import { testCreateRandomUser } from '../../test/utils/testCreateRandomUser';
+import { clearTestDatabase } from '../../../test/utils/clearTestDatabase';
+import { testClearRepository } from '../../../test/utils/testClearRepository';
+import { testCreateRandomUser } from '../../../test/utils/testCreateRandomUser';
 import { Role } from '../auth/role.enum';
 import { DatabaseModule } from '../database/database.module';
 import { UserEntity } from '../database/entities/user.entity';

diff --git a/packages/api/src/users/users.service.ts → ...es/api/src/modules/users/users.service.ts b/packages/api/src/users/users.service.ts → ...es/api/src/modules/users/users.service.ts
@@ -1,8 +1,8 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { Connection } from 'typeorm';
 
+import { GetList } from '../../interfaces/react-admin-types';
 import { UserEntity } from '../database/entities/user.entity';
-import { GetList } from '../interfaces/react-admin-types';
 import { CreateUserDto } from './dto/create-user.dto';
 import { UpdateUserDto } from './dto/update-user.dto';
 

diff --git a/packages/api/test/utils/clearTestDatabase.ts b/packages/api/test/utils/clearTestDatabase.ts
@@ -1,7 +1,7 @@
 import { Test } from '@nestjs/testing';
 import { Connection } from 'typeorm';
 
-import { DatabaseModule } from '../../src/database/database.module';
+import { DatabaseModule } from '../../src/modules/database/database.module';
 
 export const clearTestDatabase = async (): Promise<void> => {
   const app = await Test.createTestingModule({

diff --git a/packages/api/test/utils/testCreateRandomUser.ts b/packages/api/test/utils/testCreateRandomUser.ts
@@ -1,6 +1,6 @@
 import { Connection } from 'typeorm';
 
-import { UserEntity } from '../../src/database/entities/user.entity';
+import { UserEntity } from '../../src/modules/database/entities/user.entity';
 
 export const testCreateRandomUser = async (connection: Connection): Promise<UserEntity> => {
   const userEntity = new UserEntity();