Merge pull request #89 from shimisnow/issue-88

Move TypeORM entities from shared to individual services

apps/auth-service/src/app/app.module.ts

@@ -4,7 +4,7 @@ import { CacheModule } from '@nestjs/cache-manager';
 import * as redisStore from 'cache-manager-redis-store';
 import { JwtModule } from '@nestjs/jwt';
 import { AuthModule } from './auth/auth.module';
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
+import { UserAuthEntity } from './database/entities/user-auth.entity';
 
 @Module({
   imports: [

apps/auth-service/src/app/auth/auth.controller.spec.ts

@@ -6,7 +6,7 @@ import { UserAuthsRepository } from './repositories/user-auths/user-auths.reposi
 import { UserAuthsRepositoryMock } from './mocks/user-auths-repository.mock';
 import { JwtService } from '@nestjs/jwt';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
+import { UserAuthEntity } from '../database/entities/user-auth.entity';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { Logger } from '@nestjs/common';
 

apps/auth-service/src/app/auth/auth.service.spec.ts

@@ -13,7 +13,7 @@ import {
 import { getRepositoryToken } from '@nestjs/typeorm';
 import jsonwebtoken, { JwtPayload } from 'jsonwebtoken';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
+import { UserAuthEntity } from '../database/entities/user-auth.entity';
 import { UserPayload } from '@shared/authentication/payloads/user.payload';
 import { AuthErrorNames } from '@shared/authentication/enums/auth-error-names.enum';
 import { AuthErrorMessages } from '@shared/authentication/enums/auth-error-messages.enum';

apps/auth-service/src/app/auth/auth.service.ts

@@ -17,9 +17,9 @@ import { UserPayload } from '@shared/authentication/payloads/user.payload';
 import { CacheKeyPrefix } from '@shared/cache/enums/cache-key-prefix.enum';
 import { UserAuthsRepository } from './repositories/user-auths/user-auths.repository';
 import { SignUpSerializer } from './serializers/signup.serializer';
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
+import { UserAuthEntity } from '../database/entities/user-auth.entity';
 import { LoginSerializer } from './serializers/login.serializer';
-import { UserAuthStatusEnum } from '@shared/database/authentication/enums/user-auth-status.enum';
+import { UserAuthStatusEnum } from '../database/enums/user-auth-status.enum';
 import { RefreshSerializer } from './serializers/refresh.serializer';
 import { LogoutSerializer } from './serializers/logout.serializer';
 import { PasswordChangeSerializer } from './serializers/password-change.serializer';

apps/auth-service/src/app/auth/mocks/user-auths-repository.mock.ts

@@ -1,5 +1,5 @@
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
-import { UserAuthStatusEnum } from '@shared/database/authentication/enums/user-auth-status.enum';
+import { UserAuthEntity } from '../../database/entities/user-auth.entity';
+import { UserAuthStatusEnum } from '../../database/enums/user-auth-status.enum';
 import { InsertResult, QueryFailedError } from 'typeorm';
 
 export class UserAuthsRepositoryMock {

apps/auth-service/src/app/auth/repositories/user-auths/user-auths-repository.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
+import { UserAuthEntity } from '../../../database/entities/user-auth.entity';
 import { UserAuthsRepository } from './user-auths.repository';
 
 @Module({

apps/auth-service/src/app/auth/repositories/user-auths/user-auths.repository.ts

@@ -1,6 +1,6 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { UserAuthEntity } from '@shared/database/authentication/entities/user-auth.entity';
+import { UserAuthEntity } from '../../../database/entities/user-auth.entity';
 import { InsertResult, Repository } from 'typeorm';
 
 @Injectable()

shared/src/database/authentication/entities/user-auth.entity.ts → apps/auth-service/src/app/database/entities/user-auth.entity.ts

@@ -13,8 +13,6 @@ import * as bcrypt from 'bcrypt';
 
 /**
  * TypeORM Entity with the user authentication information.
- * WARNING: this entity is to be used only at the auth-service.
- * It is located at the @shared just to centralize the entities code.
  */
 @Entity({
   name: 'user_auths',

apps/financial-service-e2e/src/balance/balance.spec.ts

@@ -185,7 +185,8 @@ describe('GET /balance', () => {
         JWT_SECRET_KEY,
       );
 
-      // request with a random balance to guarantee that is retrieved from cache and not from database
+      // request with a random balance to guarantee
+      // that it was retrieved from cache and not from database
       await request(host)
         .get(endpoint)
         .query({

apps/financial-service-e2e/src/transaction/transaction.spec.ts

@@ -200,7 +200,8 @@ describe('POST /transaction', () => {
           JWT_SECRET_KEY,
         );
 
-        // request with a random balance to guarantee that is retrieved from cache and not from database
+        // request with a random balance to guarantee
+        // that it was retrieved from cache and not from database
         await request(host)
           .get('/balance')
           .query({
@@ -216,7 +217,8 @@ describe('POST /transaction', () => {
             expect(body.cached).toBeTruthy();
           });
 
-        // request with a random balance to guarantee that is retrieved from cache and not from database
+        // request with a random balance to guarantee
+        // that was retrieved from cache and not from database
         await request(host)
           .get('/balance')
           .query({

apps/financial-service/src/app/app.module.ts

@@ -3,9 +3,9 @@ import { TypeOrmModule } from '@nestjs/typeorm';
 import { CacheModule } from '@nestjs/cache-manager';
 import * as redisStore from 'cache-manager-redis-store';
 import { JwtModule } from '@nestjs/jwt';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
-import { BalanceEntity } from '@shared/database/financial/entities/balance.entity';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
+import { AccountEntity } from './database/entities/account.entity';
+import { BalanceEntity } from './database/entities/balance.entity';
+import { TransactionEntity } from './database/entities/transaction.entity';
 import { TransactionModule } from './transaction/transaction.module';
 import { BalanceModule } from './balance/balance.module';
 

apps/financial-service/src/app/balance/balance.service.spec.ts

@@ -6,8 +6,8 @@ import { BalanceService } from './balance.service';
 import { BalancesRepository } from './repositories/balances.repository';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { BalanceEntity } from '@shared/database/financial/entities/balance.entity';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
+import { BalanceEntity } from '../database/entities/balance.entity';
+import { TransactionEntity } from '../database/entities/transaction.entity';
 import { ForbiddenException } from '@nestjs/common';
 import { UserService } from '../user/user.service';
 

apps/financial-service/src/app/balance/repositories/balances-repository.module.ts

@@ -1,8 +1,8 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { BalanceEntity } from '@shared/database/financial/entities/balance.entity';
+import { BalanceEntity } from '../../database/entities/balance.entity';
 import { BalancesRepository } from './balances.repository';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
+import { TransactionEntity } from '../../database/entities/transaction.entity';
 
 @Module({
   imports: [TypeOrmModule.forFeature([BalanceEntity, TransactionEntity])],

apps/financial-service/src/app/balance/repositories/balances.repository.ts

@@ -1,10 +1,10 @@
 import { Injectable, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
-import { BalanceEntity } from '@shared/database/financial/entities/balance.entity';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
+import { BalanceEntity } from '../../database/entities/balance.entity';
+import { TransactionEntity } from '../../database/entities/transaction.entity';
 import { MoreThan, Repository } from 'typeorm';
 import { BalanceDifferenceSerializer } from '../serializers/balance-difference.serializer';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
+import { AccountEntity } from '../../database/entities/account.entity';
 
 @Injectable()
 export class BalancesRepository {

apps/financial-service/src/app/transaction/dtos/create-transaction-body.dto.ts

@@ -1,5 +1,5 @@
 import { ApiProperty } from '@nestjs/swagger';
-import { TransactionTypeEnum } from '@shared/database/financial/enums/transaction-type.enum';
+import { TransactionTypeEnum } from '../../database/enums/transaction-type.enum';
 import { IsEnum, IsNotEmpty, IsNumber, Min } from 'class-validator';
 
 export class CreateTransactionBodyDto {

apps/financial-service/src/app/transaction/repositories/accounts/accounts-repository.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
+import { AccountEntity } from '../../../database/entities/account.entity';
 import { AccountsRepository } from './accounts.repository';
 
 @Module({

apps/financial-service/src/app/transaction/repositories/accounts/accounts.repository.spec.ts

@@ -1,8 +1,8 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { AccountsRepository } from './accounts.repository';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
-import { AccountStatusEnum } from '@shared/database/financial/enums/account-status.enum';
+import { AccountEntity } from '../../../database/entities/account.entity';
+import { AccountStatusEnum } from '../../../database/enums/account-status.enum';
 
 describe('AccountsRepository', () => {
   let repository: AccountsRepository;

apps/financial-service/src/app/transaction/repositories/accounts/accounts.repository.ts

@@ -1,8 +1,8 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
-import { AccountStatusEnum } from '@shared/database/financial/enums/account-status.enum';
+import { AccountEntity } from '../../../database/entities/account.entity';
+import { AccountStatusEnum } from '../../../database/enums/account-status.enum';
 
 @Injectable()
 export class AccountsRepository {

apps/financial-service/src/app/transaction/repositories/transactions/create-pair-transaction.body.ts

@@ -1,4 +1,4 @@
-import { TransactionTypeEnum } from '@shared/database/financial/enums/transaction-type.enum';
+import { TransactionTypeEnum } from '../../../database/enums/transaction-type.enum';
 
 /** Defines the information needed to create a pair transaction */
 export class CreatePairTransactionBody {

apps/financial-service/src/app/transaction/repositories/transactions/transactions-repository.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
+import { TransactionEntity } from '../../../database/entities/transaction.entity';
 import { TransactionsRepository } from './transactions.repository';
 
 @Module({

apps/financial-service/src/app/transaction/repositories/transactions/transactions.repository.ts

@@ -1,9 +1,9 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { QueryRunner, Repository } from 'typeorm';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
-import { TransactionTypeEnum } from '@shared/database/financial/enums/transaction-type.enum';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
+import { TransactionEntity } from '../../../database/entities/transaction.entity';
+import { TransactionTypeEnum } from '../../../database/enums/transaction-type.enum';
+import { AccountEntity } from '../../../database/entities/account.entity';
 import { CreatePairTransactionBody } from './create-pair-transaction.body';
 import { CreatePairTransactionResult } from './create-pair-transaction.result';
 

apps/financial-service/src/app/transaction/transaction.controller.spec.ts

@@ -3,7 +3,7 @@ import { Test, TestingModule } from '@nestjs/testing';
 import { TransactionController } from './transaction.controller';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { TransactionEntity } from '@shared/database/financial/entities/transaction.entity';
+import { TransactionEntity } from '../database/entities/transaction.entity';
 import { TransactionsRepository } from './repositories/transactions/transactions.repository';
 import { TransactionService } from './transaction.service';
 import { BalanceService } from '../balance/balance.service';

apps/financial-service/src/app/transaction/transaction.service.spec.ts

@@ -7,7 +7,7 @@ import { TransactionService } from './transaction.service';
 import { TransactionsRepository } from './repositories/transactions/transactions.repository';
 import { BalanceService } from '../balance/balance.service';
 import { AccountsRepository } from './repositories/accounts/accounts.repository';
-import { TransactionTypeEnum } from '@shared/database/financial/enums/transaction-type.enum';
+import { TransactionTypeEnum } from '../database/enums/transaction-type.enum';
 import {
   ForbiddenException,
   PreconditionFailedException,

apps/financial-service/src/app/transaction/transaction.service.ts

@@ -11,7 +11,7 @@ import { AccountsRepository } from './repositories/accounts/accounts.repository'
 import { Cache } from 'cache-manager';
 import { CACHE_MANAGER } from '@nestjs/cache-manager';
 import { BalanceService } from '../balance/balance.service';
-import { TransactionTypeEnum } from '@shared/database/financial/enums/transaction-type.enum';
+import { TransactionTypeEnum } from '../database/enums/transaction-type.enum';
 import { CacheKeyPrefix } from '@shared/cache/enums/cache-key-prefix.enum';
 import { CreatePairTransactionResult } from './repositories/transactions/create-pair-transaction.result';
 

apps/financial-service/src/app/user/repositories/accounts/accounts-repository.module.ts

@@ -1,6 +1,6 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
+import { AccountEntity } from '../../../database/entities/account.entity';
 import { AccountsRepository } from './accounts.repository';
 
 @Module({

apps/financial-service/src/app/user/repositories/accounts/accounts.repository.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
+import { AccountEntity } from '../../../database/entities/account.entity';
 
 @Injectable()
 export class AccountsRepository {

apps/financial-service/src/app/user/user.service.spec.ts

@@ -1,7 +1,7 @@
 import { Test, TestingModule } from '@nestjs/testing';
 import { UserService } from './user.service';
 import { getRepositoryToken } from '@nestjs/typeorm';
-import { AccountEntity } from '@shared/database/financial/entities/account.entity';
+import { AccountEntity } from '../database//entities/account.entity';
 import { AccountsRepository } from './repositories/accounts/accounts.repository';
 
 describe('user.service', () => {