move achives tests to tests folder

globalConfig.json

@@ -1 +1 @@
-{"mongoUri":"mongodb://127.0.0.1:39683/","mongoDBName":"jest"}
+{"mongoUri":"mongodb://127.0.0.1:42033/","mongoDBName":"jest"}

jest.config.js

@@ -1,17 +1,16 @@
 module.exports = {
   collectCoverageFrom: [
     '<rootDir>/src/**/*.ts',
-    '!<rootDir>/src/main/**',
-    '!<rootDir>/src/**/index.ts',
-    '!**/test/**'
+    '!<rootDir>/src/main/**'
   ],
   coverageDirectory: 'coverage',
   coverageProvider: 'babel',
   moduleNameMapper: {
+    '@/tests/(.+)': '<rootDir>/tests/$1',
     '@/(.+)': '<rootDir>/src/$1'
   },
   roots: [
-    '<rootDir>/src'
+    '<rootDir>/tests'
   ],
   transform: {
     '\\.ts$': 'ts-jest'

package.json

@@ -9,6 +9,7 @@
     "postbuild": "copyfiles -u 1 public/**/* dist/static",
     "lint": "eslint .",
     "lint:fix": "npm run lint -- --fix",
+    "check": "npm-check -s -u",
     "test": "jest --passWithNoTests --silent --noStackTrace --no-cache --runInBand",
     "test:verbose": "jest --passWithNoTests --no-cache --runInBand",
     "test:watch": "npm test -- --watch -c jest-unit-config.js",

src/data/usecases/account/add-account/db-add-account.ts → src/data/usecases/db-add-account.ts

@@ -1,7 +1,7 @@
 import { Encrypter } from '@/data/protocols/criptography'
 import { AddAccountRepository, LoadAccountByEmailRepository } from '@/data/protocols/db/account'
 import { AccountModel } from '@/domain/models'
-import { AddAccount, AddAccountParams } from '@/domain/usecases/account'
+import { AddAccount, AddAccountParams } from '@/domain/usecases'
 
 export class DbAddAccount implements AddAccount {
   constructor (

src/data/usecases/survey/add-survey/db-add-survey.ts → src/data/usecases/db-add-survey.ts

@@ -1,5 +1,5 @@
 import { AddSurveyRepository } from '@/data/protocols/db/survey'
-import { AddSurvey, AddSurveyParams } from '@/domain/usecases/survey'
+import { AddSurvey, AddSurveyParams } from '@/domain/usecases'
 
 export class DbAddSurvey implements AddSurvey {
   constructor (private readonly addSurveyRepository: AddSurveyRepository) {}

src/data/usecases/account/authentication/db-authentication.ts → src/data/usecases/db-authentication.ts

@@ -1,7 +1,7 @@
 import { Encrypter, HashCompare } from '@/data/protocols/criptography'
 import { LoadAccountByEmailRepository, UpdateAccessTokenRepository } from '@/data/protocols/db/account'
 import { AuthenticationModel } from '@/domain/models'
-import { Authentication, AuthenticationParams } from '@/domain/usecases/account'
+import { Authentication, AuthenticationParams } from '@/domain/usecases'
 
 export class DbAuthentication implements Authentication {
   constructor (

src/data/usecases/account/load-account-by-token/db-load-account-by-token.ts → src/data/usecases/db-load-account-by-token.ts

@@ -1,7 +1,7 @@
 import { Decrypter } from '@/data/protocols/criptography'
 import { LoadAccountByTokenRepository } from '@/data/protocols/db/account'
 import { AccountModel } from '@/domain/models'
-import { LoadAccountByToken, LoadAccountByTokenParams } from '@/domain/usecases/account'
+import { LoadAccountByToken, LoadAccountByTokenParams } from '@/domain/usecases'
 
 export class DbLoadAccountByToken implements LoadAccountByToken {
   constructor (

src/data/usecases/survey/load-survey-by-id/db-load-survey-by-id.ts → src/data/usecases/db-load-survey-by-id.ts

@@ -1,6 +1,6 @@
 import { LoadSurveyByIdRepository } from '@/data/protocols/db/survey'
 import { SurveyModel } from '@/domain/models'
-import { LoadSurveyById } from '@/domain/usecases/survey'
+import { LoadSurveyById } from '@/domain/usecases'
 
 export class DbLoadSurveyById implements LoadSurveyById {
   constructor (

src/data/usecases/survey-result/load-survey-result/db-load-survey-result.ts → src/data/usecases/db-load-survey-result.ts

@@ -1,7 +1,7 @@
 import { LoadSurveyByIdRepository } from '@/data/protocols/db/survey'
 import { LoadSurveyResultRespository } from '@/data/protocols/db/survey-result'
 import { SurveyResultModel } from '@/domain/models'
-import { LoadSurveyResult } from '@/domain/usecases/survey-result/'
+import { LoadSurveyResult } from '@/domain/usecases'
 
 export class DbLoadSurveyResult implements LoadSurveyResult {
   constructor (

src/data/usecases/survey/load-surveys/db-load-surveys.ts → src/data/usecases/db-load-surveys.ts

@@ -1,6 +1,6 @@
 import { LoadSurveysRepository } from '@/data/protocols/db/survey'
 import { SurveyModel } from '@/domain/models'
-import { LoadSurveys } from '@/domain/usecases/survey'
+import { LoadSurveys } from '@/domain/usecases'
 
 export class DbLoadSurveys implements LoadSurveys {
   constructor (

src/data/usecases/survey-result/save-survey-result/db-save-survey-result.ts → src/data/usecases/db-save-survey-result.ts

@@ -1,6 +1,6 @@
 import { LoadSurveyResultRespository, SaveSurveyResultRespository } from '@/data/protocols/db/survey-result'
 import { SurveyResultModel } from '@/domain/models'
-import { SaveSurveyResult, SaveSurveyResultParams } from '@/domain/usecases/survey-result'
+import { SaveSurveyResult, SaveSurveyResultParams } from '@/domain/usecases'
 
 export class DbSaveSurveyResult implements SaveSurveyResult {
   constructor (

src/data/usecases/index.ts

@@ -0,0 +1,8 @@
+export * from './db-add-account'
+export * from './db-add-survey'
+export * from './db-authentication'
+export * from './db-load-account-by-token'
+export * from './db-load-survey-by-id'
+export * from './db-load-survey-result'
+export * from './db-load-surveys'
+export * from './db-save-survey-result'

src/domain/usecases/index.ts

@@ -0,0 +1,8 @@
+export * from './add-account'
+export * from './add-survey'
+export * from './authentication'
+export * from './load-account-by-token'
+export * from './load-survey-by-id'
+export * from './load-survey-result'
+export * from './load-surveys'
+export * from './save-survey-result'

src/infra/criptography/bcrypt-adapter/index.ts → src/infra/criptography/index.ts

@@ -1 +1,2 @@
 export * from './bcrypter-adapter'
+export * from './jwt-adapter'

src/infra/db/mongodb/acount/account-mongo-repository.ts → src/infra/db/mongodb/account-mongo-repository.ts

@@ -1,7 +1,7 @@
 import { AddAccountRepository, LoadAccountByEmailRepository, LoadAccountByTokenRepository, UpdateAccessTokenRepository } from '@/data/protocols/db/account'
 import { AccountModel } from '@/domain/models'
-import { AddAccountParams } from '@/domain/usecases/account'
-import { MongoHelper } from '@/infra/db/mongodb/helpers'
+import { AddAccountParams } from '@/domain/usecases'
+import { MongoHelper } from '@/infra/db/mongodb'
 
 import { ObjectId } from 'mongodb'
 

src/infra/db/mongodb/index.ts

@@ -0,0 +1,6 @@
+export * from './account-mongo-repository'
+export * from './log-mongo-repository'
+export * from './mongo-helper'
+export * from './query-builder'
+export * from './survey-mongo-repository'
+export * from './survey-result-mongo-repository'

src/infra/db/mongodb/log/log-mongo-repository.ts → src/infra/db/mongodb/log-mongo-repository.ts

@@ -1,5 +1,5 @@
 import { LogErrorRepository } from '@/data/protocols/db/log'
-import { MongoHelper } from '@/infra/db/mongodb/helpers'
+import { MongoHelper } from '@/infra/db/mongodb'
 
 export class LogMongoRepository implements LogErrorRepository {
   async logError (stack: string): Promise<void> {

src/infra/db/mongodb/survey/survey-mongo-repository.ts → src/infra/db/mongodb/survey-mongo-repository.ts

@@ -1,6 +1,6 @@
-import { MongoHelper, QueryBuilder } from '@/infra/db/mongodb/helpers'
+import { MongoHelper, QueryBuilder } from '@/infra/db/mongodb'
 import { AddSurveyRepository, LoadSurveyByIdRepository, LoadSurveysRepository } from '@/data/protocols/db/survey'
-import { AddSurveyParams } from '@/domain/usecases/survey'
+import { AddSurveyParams } from '@/domain/usecases'
 import { SurveyModel } from '@/domain/models'
 import { ObjectId } from 'mongodb'
 

src/infra/db/mongodb/survey-result/survey-result-mongo-repository.ts → src/infra/db/mongodb/survey-result-mongo-repository.ts

@@ -1,6 +1,6 @@
-import { MongoHelper, QueryBuilder } from '@/infra/db/mongodb/helpers'
+import { MongoHelper, QueryBuilder } from '@/infra/db/mongodb'
 import { LoadSurveyResultRespository, SaveSurveyResultRespository } from '@/data/protocols/db/survey-result'
-import { SaveSurveyResultParams } from '@/domain/usecases/survey-result'
+import { SaveSurveyResultParams } from '@/domain/usecases'
 import { SurveyResultModel } from '@/domain/models'
 import { ObjectId } from 'mongodb'
 import round from 'mongo-round'

src/main/config/routes.ts

@@ -6,7 +6,7 @@ export default (app: Express): void => {
   const router = Router()
   app.use('/api', router)
   readdirSync(join(__dirname, '../routes'))
-    .filter(file => !file.includes('.test.') && !file.endsWith('.map'))
+    .filter(file => !file.endsWith('.map'))
     .map(async file => {
       (await import(`../routes/${file}`)).default(router)
     })

src/main/factories/controllers/survey/add-survey/add-survey-controller-factory.ts → src/main/factories/controllers/add-survey-controller-factory.ts

@@ -1,7 +1,7 @@
 import { makeAddSurveyValidation } from './add-survey-validation-factory'
 import { makeLogControllerDecorator } from '@/main/factories/decorators'
-import { makeDbAddSurvey } from '@/main/factories/usecases/survey/add-survey'
-import { AddSurveyController } from '@/presentation/controllers/survey/add-survey'
+import { makeDbAddSurvey } from '@/main/factories/usecases'
+import { AddSurveyController } from '@/presentation/controllers'
 import { Controller } from '@/presentation/protocols'
 
 export const makeAddSurveyController = (): Controller => {

src/main/factories/controllers/index.ts

@@ -0,0 +1,9 @@
+export * from './add-survey-controller-factory'
+export * from './add-survey-validation-factory'
+export * from './load-survey-result-controller-factory'
+export * from './load-surveys-controller-factory'
+export * from './login-controller-factory'
+export * from './login-validation-factory'
+export * from './save-survey-result-controller-factory'
+export * from './signup-controller-factory'
+export * from './signup-validation-factory'

src/main/factories/controllers/survey-result/load-survey-result/load-survey-result-controller-factory.ts → src/main/factories/controllers/load-survey-result-controller-factory.ts

@@ -1,7 +1,6 @@
 import { makeLogControllerDecorator } from '@/main/factories/decorators'
-import { makeDbLoadSurveyResult } from '@/main/factories/usecases/survey-result/load-survey-result'
-import { makeDbLoadSurveyById } from '@/main/factories/usecases/survey/load-survey-by-id'
-import { LoadSurveyResultController } from '@/presentation/controllers/survey-result/load-survey-result'
+import { makeDbLoadSurveyResult, makeDbLoadSurveyById } from '@/main/factories/usecases'
+import { LoadSurveyResultController } from '@/presentation/controllers'
 import { Controller } from '@/presentation/protocols'
 
 export const makeLoadSurveyResultController = (): Controller => {

src/main/factories/controllers/survey/loadSurveys/load-surveys-controller-factory.ts → src/main/factories/controllers/load-surveys-controller-factory.ts

@@ -1,7 +1,7 @@
 import { makeLogControllerDecorator } from '@/main/factories/decorators'
+import { makeDbLoadSurveys } from '@/main/factories/usecases'
 import { Controller } from '@/presentation/protocols'
-import { LoadSurveysController } from '@/presentation/controllers/survey/load-survey'
-import { makeDbLoadSurveys } from '@/main/factories/usecases/survey/load-surveys'
+import { LoadSurveysController } from '@/presentation/controllers'
 
 export const makeLoadSurveysController = (): Controller => {
   const controller = new LoadSurveysController(makeDbLoadSurveys())

src/main/factories/controllers/login/login/login-controller-factory.ts → src/main/factories/controllers/login-controller-factory.ts

@@ -1,7 +1,7 @@
 import { makeLoginValidation } from './login-validation-factory'
-import { makeDbAuthentication } from '@/main/factories/usecases/account/authentication'
+import { makeDbAuthentication } from '@/main/factories/usecases'
 import { makeLogControllerDecorator } from '@/main/factories/decorators'
-import { LoginController } from '@/presentation/controllers/login/login'
+import { LoginController } from '@/presentation/controllers'
 import { Controller } from '@/presentation/protocols'
 
 export const makeLoginController = (): Controller => {

src/main/factories/controllers/survey-result/save-survey-result/save-survey-result-controller-factory.ts → src/main/factories/controllers/save-survey-result-controller-factory.ts

@@ -1,7 +1,6 @@
 import { makeLogControllerDecorator } from '@/main/factories/decorators'
-import { makeDbSaveSurveyResult } from '@/main/factories/usecases/survey-result/save-survey-result'
-import { makeDbLoadSurveyById } from '@/main/factories/usecases/survey/load-survey-by-id'
-import { SaveSurveyResultController } from '@/presentation/controllers/survey-result/save-survey-result'
+import { makeDbSaveSurveyResult, makeDbLoadSurveyById } from '@/main/factories/usecases'
+import { SaveSurveyResultController } from '@/presentation/controllers'
 import { Controller } from '@/presentation/protocols'
 
 export const makeSaveSurveyResultController = (): Controller => {

src/main/factories/controllers/login/signup/signup-controller-factory.ts → src/main/factories/controllers/signup-controller-factory.ts

@@ -1,8 +1,7 @@
 import { makeSignUpValidation } from './signup-validation-factory'
-import { makeDbAuthentication } from '@/main/factories/usecases/account/authentication'
+import { makeDbAuthentication, makeDbAddACcount } from '@/main/factories/usecases'
 import { makeLogControllerDecorator } from '@/main/factories/decorators'
-import { makeDbAddACcount } from '@/main/factories/usecases/account/add-account'
-import { SignUpController } from '@/presentation/controllers/login/signup'
+import { SignUpController } from '@/presentation/controllers'
 import { Controller } from '@/presentation/protocols'
 
 export const makeSignUpController = (): Controller => {

src/main/factories/decorators/log-controller-decorator-factory.ts

@@ -1,6 +1,6 @@
 import { LogControllerDecorator } from '@/main/dacorators'
 import { Controller } from '@/presentation/protocols'
-import { LogMongoRepository } from '@/infra/db/mongodb/log'
+import { LogMongoRepository } from '@/infra/db/mongodb'
 
 export const makeLogControllerDecorator = (controller: Controller): Controller => {
   const logMongoRepository = new LogMongoRepository()

src/main/factories/middlewares/admin-auth.ts

@@ -1,4 +1,4 @@
-import { adaptMiddleware } from '@/main/adapters'
 import { makeAuthMiddleware } from './auth-middleware-factory'
+import { adaptMiddleware } from '@/main/adapters'
 
 export const adminAuth = adaptMiddleware(makeAuthMiddleware('admin'))

src/main/factories/middlewares/auth-middleware-factory.ts

@@ -1,6 +1,6 @@
+import { makeDbLoadAccountByToken } from '@/main/factories/usecases'
 import { Middleware } from '@/presentation/protocols'
 import { AuthMiddleware } from '@/presentation/middlewares'
-import { makeDbLoadAccountByToken } from '../usecases/account/load-account-by-token'
 
 export const makeAuthMiddleware = (role?: string): Middleware => {
   return new AuthMiddleware(makeDbLoadAccountByToken(), role)

src/main/factories/usecases/account/add-account/db-add-account-factory.ts → src/main/factories/usecases/db-add-account-factory.ts

@@ -1,7 +1,7 @@
-import { AddAccount } from '@/domain/usecases/account'
-import { DbAddAccount } from '@/data/usecases/account/add-account'
-import { BcryptAdapter } from '@/infra/criptography/bcrypt-adapter'
-import { AccountMongoRepository } from '@/infra/db/mongodb/acount'
+import { AddAccount } from '@/domain/usecases'
+import { DbAddAccount } from '@/data/usecases'
+import { BcryptAdapter } from '@/infra/criptography'
+import { AccountMongoRepository } from '@/infra/db/mongodb'
 
 export const makeDbAddACcount = (): AddAccount => {
   const salt = 12

src/main/factories/usecases/db-add-survey-factory.ts

@@ -0,0 +1,8 @@
+import { DbAddSurvey } from '@/data/usecases'
+import { AddSurvey } from '@/domain/usecases'
+import { SurveyMongoRepository } from '@/infra/db/mongodb'
+
+export const makeDbAddSurvey = (): AddSurvey => {
+  const surveyMongoRepository = new SurveyMongoRepository()
+  return new DbAddSurvey(surveyMongoRepository)
+}

src/main/factories/usecases/account/authentication/db-authentication-factory.ts → src/main/factories/usecases/db-authentication-factory.ts

@@ -1,9 +1,8 @@
 import env from '@/main/config/env'
-import { Authentication } from '@/domain/usecases/account'
-import { DbAuthentication } from '@/data/usecases/account/authentication'
-import { AccountMongoRepository } from '@/infra/db/mongodb/acount'
-import { BcryptAdapter } from '@/infra/criptography/bcrypt-adapter'
-import { JwtAdapter } from '@/infra/criptography/jwt-adapter'
+import { Authentication } from '@/domain/usecases'
+import { DbAuthentication } from '@/data/usecases'
+import { AccountMongoRepository } from '@/infra/db/mongodb'
+import { BcryptAdapter, JwtAdapter } from '@/infra/criptography'
 
 export const makeDbAuthentication = (): Authentication => {
   const salt = 12

src/main/factories/usecases/db-load-account-by-token-factory.ts

@@ -0,0 +1,11 @@
+import env from '@/main/config/env'
+import { LoadAccountByToken } from '@/domain/usecases'
+import { AccountMongoRepository } from '@/infra/db/mongodb'
+import { DbLoadAccountByToken } from '@/data/usecases'
+import { JwtAdapter } from '@/infra/criptography'
+
+export const makeDbLoadAccountByToken = (): LoadAccountByToken => {
+  const jwtAdapter = new JwtAdapter(env.jwtSecret)
+  const accountMongoRepository = new AccountMongoRepository()
+  return new DbLoadAccountByToken(jwtAdapter, accountMongoRepository)
+}

src/main/factories/usecases/db-load-survey-by-id-factory.ts

@@ -0,0 +1,8 @@
+import { DbLoadSurveyById } from '@/data/usecases'
+import { LoadSurveyById } from '@/domain/usecases'
+import { SurveyMongoRepository } from '@/infra/db/mongodb'
+
+export const makeDbLoadSurveyById = (): LoadSurveyById => {
+  const surveyMongoRepository = new SurveyMongoRepository()
+  return new DbLoadSurveyById(surveyMongoRepository)
+}