modularized

unknowncoder05 · unknowncoder05 · commit 04a814340b17 · 2021-07-10T21:25:28.000-05:00
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -1,16 +1,14 @@
 import { Module } from '@nestjs/common';
 import { AppController } from './app.controller';
 import { AppService } from './app.service';
-import { ProjectsController } from './controllers/projects/projects.controller';
-import { LanguagesController } from './controllers/languages/languages.controller';
 
 
 import { DatabaseModule } from './modules/database/database.module';
 import { ConfigModule } from '@nestjs/config';
-import { ProjectService } from './services/project/project.service';
-import { LanguageService } from './services/language/language.service';
 import { AuthModule } from './modules/auth/auth.module';
 import { UsersModule } from './modules/users/users.module';
+//import { LanguagesModule } from './modules/languages/languages.module';
+import { ProjectsModule } from './modules/projects/projects.module';
 
 
 import config from './config';
@@ -25,8 +23,10 @@ import config from './config';
     DatabaseModule,
     AuthModule,
     UsersModule,
+    //LanguagesModule,
+    ProjectsModule,
   ],
-  controllers: [AppController, ProjectsController, LanguagesController],
-  providers: [AppService, ProjectService, LanguageService],
+  controllers: [AppController],
+  providers: [AppService],
 })
 export class AppModule { }
diff --git a/src/modules/auth/auth.module.ts b/src/modules/auth/auth.module.ts
@@ -8,6 +8,7 @@ import { JwtStrategy } from './strategies/jwt.strategy'
 import { UsersModule } from './../users/users.module';
 import { AuthService } from './services/auth/auth.service';
 import { AuthController } from './controllers/auth/auth.controller';
+import { RolesGuard } from './guards/roles.guard'
 import config from './../../config';
 
 //import {UserModule}
@@ -27,7 +28,8 @@ import config from './../../config';
                 }
             })
     ],
-    providers: [AuthService, LocalStrategy, JwtStrategy],
-    controllers: [AuthController]
+    providers: [AuthService, LocalStrategy, JwtStrategy, RolesGuard],
+    controllers: [AuthController],
+    exports: [ RolesGuard ]
 })
 export class AuthModule { }
diff --git a/src/modules/database/database.module.ts b/src/modules/database/database.module.ts
@@ -1,7 +1,5 @@
 import { Module } from '@nestjs/common';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Project } from '../../entities/project.entity';
-import { Language } from '../../entities/language.entity';
 import { ConfigType } from '@nestjs/config';
 import config from '../../config';
 /*const client = new Client(dbConfig);
@@ -24,8 +22,7 @@ client.connect();*/
                     autoLoadEntities: true,
                 }
             }
-        }),
-        TypeOrmModule.forFeature([Project, Language])
+        })
     ],
     providers: [
         /*{
diff --git a/src/modules/languages/controllers/languages.controller.spec.ts b/src/modules/languages/controllers/languages.controller.spec.ts
diff --git a/src/modules/languages/controllers/languages.controller.ts b/src/modules/languages/controllers/languages.controller.ts
@@ -1,7 +1,7 @@
 import { Controller, Get, Param, Query, Post, Put, Delete, HttpCode, HttpStatus, ParseIntPipe, UsePipes, Body } from '@nestjs/common';
-import { JoiValidationPipe } from '../../pipe/joi-validation.pipe'
-import { LanguageService } from './../../services/language/language.service';
-import { languageSchema } from './../../schemas/language.schema';
+import { JoiValidationPipe } from '../../../pipe/joi-validation.pipe'
+import { LanguageService } from '../services/language/language.service';
+import { languageSchema } from '../../../schemas/language.schema';
 @Controller('language')
 export class LanguagesController {
     constructor(private languageService: LanguageService) { }
diff --git a/src/modules/languages/languages.module.ts b/src/modules/languages/languages.module.ts
@@ -0,0 +1,15 @@
+import { Module } from '@nestjs/common';
+import { LanguagesController } from './controllers/languages.controller'
+import { LanguageService } from './services/language/language.service'
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Language } from './../../entities/language.entity';
+
+@Module({
+    imports: [
+        TypeOrmModule.forFeature([Language])
+    ],
+    providers: [LanguageService],
+    controllers: [LanguagesController],
+    exports: [LanguageService]
+})
+export class LanguagesModule {}
diff --git a/src/modules/languages/services/language/language.service.spec.ts b/src/modules/languages/services/language/language.service.spec.ts
diff --git a/src/modules/languages/services/language/language.service.ts b/src/modules/languages/services/language/language.service.ts
@@ -3,7 +3,7 @@ import { Injectable, Inject, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
-import { Language } from '../../entities/language.entity';
+import { Language } from '../../../../entities/language.entity';
 
 @Injectable()
 export class LanguageService {
diff --git a/src/modules/projects/controllers/projects.controller.spec.ts b/src/modules/projects/controllers/projects.controller.spec.ts
diff --git a/src/modules/projects/controllers/projects.controller.ts b/src/modules/projects/controllers/projects.controller.ts
@@ -4,14 +4,14 @@ import {
 } from '@nestjs/common';
 //import { Response } from "express"
 import {AuthGuard} from '@nestjs/passport'
-import { JoiValidationPipe } from '../../pipe/joi-validation.pipe'
-import { ProjectService } from './../../services/project/project.service';
-import { projectSchema } from './../../schemas/project.schema';
-import { JwtAuthGuard } from '../../modules/auth/guards/jwt-auth.guard'
-import { RolesGuard } from '../../modules/auth/guards/roles.guard'
-import { Public } from '../../modules/auth/decorators/public.decorator'
-import { Roles } from '../../modules/auth/decorators/roles.decorator'
-import { Role } from '../../entities/user.entity'
+import { JoiValidationPipe } from '../../../pipe/joi-validation.pipe'
+import { ProjectService } from './../services/project/project.service';
+import { projectSchema } from './../../../schemas/project.schema';
+import { JwtAuthGuard } from '../../../modules/auth/guards/jwt-auth.guard'
+import { RolesGuard } from '../../../modules/auth/guards/roles.guard'
+import { Public } from '../../../modules/auth/decorators/public.decorator'
+import { Roles } from '../../../modules/auth/decorators/roles.decorator'
+import { Role } from '../../../entities/user.entity'
 @UseGuards(JwtAuthGuard, RolesGuard)
 @Controller('project')
 export class ProjectsController {
diff --git a/src/modules/projects/projects.module.ts b/src/modules/projects/projects.module.ts
@@ -0,0 +1,19 @@
+import { Module } from '@nestjs/common';
+import { ProjectsController } from './controllers/projects.controller'
+import { ProjectService } from './services/project/project.service'
+import { UsersModule } from './../users/users.module';
+import { AuthModule } from './../auth/auth.module';
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Project } from './../../entities/project.entity';
+
+@Module({
+    imports: [
+        UsersModule,
+        AuthModule,
+        TypeOrmModule.forFeature([Project])
+    ],
+    providers: [ProjectService],
+    controllers: [ProjectsController],
+    exports: [ ProjectService ]
+})
+export class ProjectsModule {}
diff --git a/src/modules/projects/services/project/project.service.spec.ts b/src/modules/projects/services/project/project.service.spec.ts
diff --git a/src/modules/projects/services/project/project.service.ts b/src/modules/projects/services/project/project.service.ts
@@ -3,7 +3,7 @@ import { Injectable, Inject, NotFoundException } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { Repository } from 'typeorm';
 
-import { Project } from '../../entities/project.entity';
+import { Project } from '../../../../entities/project.entity';
 
 @Injectable()
 export class ProjectService {
