Database connection+Create+Read

unknowncoder05 · unknowncoder05 · commit f487c2a80828 · 2021-06-13T12:28:48.000-05:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -22,13 +22,16 @@
   },
   "dependencies": {
     "@nestjs/common": "^7.6.15",
+    "@nestjs/config": "^0.6.3",
     "@nestjs/core": "^7.6.15",
     "@nestjs/platform-express": "^7.6.15",
+    "@nestjs/typeorm": "^7.1.5",
     "dotenv": "^10.0.0",
     "pg": "^8.6.0",
     "reflect-metadata": "^0.1.13",
     "rimraf": "^3.0.2",
-    "rxjs": "^6.6.6"
+    "rxjs": "^6.6.6",
+    "typeorm": "^0.2.34"
   },
   "devDependencies": {
     "@nestjs/cli": "^7.6.0",
diff --git a/src/app.module.ts b/src/app.module.ts
@@ -4,9 +4,19 @@ import { AppService } from './app.service';
 import { ProjectsController } from './controllers/projects/projects.controller';
 import { LanguagesController } from './controllers/languages/languages.controller';
 import { DatabaseService } from './services/database/database.service';
-
+import { DatabaseModule } from './modules/database/database.module';
+import { ConfigModule } from '@nestjs/config';
+import config from './config';
 @Module({
-  imports: [],
+  imports: [
+    ConfigModule.forRoot({
+      envFilePath: '.stage.env',
+      load: [config],
+      isGlobal: true,
+
+    }),
+    DatabaseModule,
+  ],
   controllers: [AppController, ProjectsController, LanguagesController],
   providers: [AppService, DatabaseService],
 })
diff --git a/src/config.ts b/src/config.ts
@@ -0,0 +1,13 @@
+import { registerAs } from '@nestjs/config';
+
+export default registerAs('config', () => {
+    return {
+        postgres: {
+            database: process.env.DB_NAME,
+            port: parseInt(process.env.DB_PORT, 10),
+            password: process.env.DB_PASS,
+            username: process.env.DB_USER,
+            host: process.env.DB_HOST,
+        }
+    };
+});
diff --git a/src/controllers/projects/projects.controller.ts b/src/controllers/projects/projects.controller.ts
@@ -16,8 +16,11 @@ export class ProjectsController {
     }
     @Post()
     @HttpCode(HttpStatus.CREATED)
-    create(@Body() payload: any): object {
-        return this.databaseService.createProject(payload);
+    async create(@Body() payload: any) {
+        const { name, description, location } = payload
+        let newProduct = await this.databaseService.createProject(name, description, location)
+
+        return { msg: "created", data: newProduct };
     }
     @Put(":projectID")
     @HttpCode(HttpStatus.ACCEPTED)
diff --git a/src/entities/project.entity.ts b/src/entities/project.entity.ts
@@ -0,0 +1,16 @@
+import { PrimaryGeneratedColumn, Column, Entity } from 'typeorm';
+
+@Entity()
+export class Project {
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({ type: 'varchar', length: 255, unique: true })
+    name: string;
+
+    @Column({ type: 'text' })
+    description: string;
+
+    @Column({ type: 'varchar' })
+    location: string;
+}
diff --git a/src/main.ts b/src/main.ts
@@ -1,8 +1,6 @@
 import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
-require('dotenv').config({ path: '.stage.env' })
-
 async function bootstrap() {
   const app = await NestFactory.create(AppModule);
   await app.listen(3000);
diff --git a/src/modules/database/database.module.ts b/src/modules/database/database.module.ts
@@ -0,0 +1,38 @@
+import { Module } from '@nestjs/common';
+import { Client } from "pg";
+import { TypeOrmModule } from '@nestjs/typeorm';
+import { Project } from './../../entities/project.entity';
+import { ConfigType } from '@nestjs/config';
+import config from '../../config';
+/*const client = new Client(dbConfig);
+
+client.connect();*/
+@Module({
+    imports: [
+        TypeOrmModule.forRootAsync({
+            inject: [config.KEY],
+            useFactory: (configService: ConfigType<typeof config>) => {
+                const { username, host, database, password, port } = configService.postgres;
+                return {
+                    type: 'postgres',
+                    host,
+                    port,
+                    username,
+                    password,
+                    database,
+                    synchronize: true,
+                    autoLoadEntities: true,
+                }
+            }
+        }),
+        TypeOrmModule.forFeature([Project])
+    ],
+    providers: [
+        /*{
+            provide: 'PG',
+            useValue: client,
+        },*/
+    ],
+    exports: [/*'PG',*/ 'TypeOrmModule'],
+})
+export class DatabaseModule { }
diff --git a/src/services/database/database.service.ts b/src/services/database/database.service.ts
@@ -1,17 +1,17 @@
-import { Injectable } from '@nestjs/common';
-import { Client } from "pg";
-
-
-const client = new Client({
-    user: 'root',
-    host: process.env.DB_HOST,
-    database: process.env.DB_NAME,
-    password: process.env.DB_PASS,
-    port: parseInt(process.env.DB_PORT),
-});
+import { Injectable, Inject } from '@nestjs/common';
+import { Client } from 'pg';
+import { InjectRepository } from '@nestjs/typeorm';
+import { Repository } from 'typeorm'; // 👈 import
 
+import { Project } from './../../entities/project.entity';
 @Injectable()
 export class DatabaseService {
+    constructor(
+        //@Inject('PG') private clientPg: Client,
+        @InjectRepository(Project) private projectRepo: Repository<Project>,
+    ) {
+        //this.clientPg.query("SELECT * FROM projects")
+    }
     db = {
         projects: {
             "0": {
@@ -33,14 +33,21 @@ export class DatabaseService {
             "2": "rust"
         }
     }
-    createProject(params): object {
-        return { data: params };
+    async createProject(name: string, description: string, location: string) {
+        let poject = this.projectRepo.create({ name, description, location })
+        await this.projectRepo.save(poject)
+        return { id: poject.id };
     }
     getProject(id): object {
-        return { data: this.db.projects[id] };
+        return {
+            data: this.projectRepo.findOne(id)
+        };
     }
     getProjects(params): object {
-        return { data: params };
+        //this.clientPg.query("SELECT * FROM projects")
+        return {
+            data: this.projectRepo.find()
+        };
     }
     updateProject(id, payload): object {
         return { data: this.db.projects[id] };

Original file line number	Diff line number	Diff line change
`@@ -16,8 +16,11 @@ export class ProjectsController {`
`16`	`16`	`}`
`17`	`17`	`@Post()`
`18`	`18`	`@HttpCode(HttpStatus.CREATED)`
`19`		`- create(@Body() payload: any): object {`
`20`		`- return this.databaseService.createProject(payload);`
	`19`	`+ async create(@Body() payload: any) {`
	`20`	`+ const { name, description, location } = payload`
	`21`	`+ let newProduct = await this.databaseService.createProject(name, description, location)`
	`22`	`+`
	`23`	`+ return { msg: "created", data: newProduct };`
`21`	`24`	`}`
`22`	`25`	`@Put(":projectID")`
`23`	`26`	`@HttpCode(HttpStatus.ACCEPTED)`