From 0041201f8a6ee02bfeee5f33ddf04175be2fc7fc Mon Sep 17 00:00:00 2001
From: navaneeth <navaneethpk@outlook.com>
Date: Fri, 9 Jul 2021 16:22:03 +0530
Subject: [PATCH] Improvements for migrations

---
 server/migrations/1625814801417-CreateUsers.ts |  6 ++++--
 server/{ormconfig.ts => ormconfig.js}          |  2 --
 server/package.json                            |  2 +-
 server/src/app.controller.ts                   |  2 +-
 server/src/app.module.ts                       | 14 ++++++++++++--
 server/src/main.ts                             |  5 ++++-
 server/src/users/user.entity.ts                | 10 +++++-----
 7 files changed, 27 insertions(+), 14 deletions(-)
 rename server/{ormconfig.ts => ormconfig.js} (83%)

diff --git a/server/migrations/1625814801417-CreateUsers.ts b/server/migrations/1625814801417-CreateUsers.ts
index 59fb029b0f..f78e72f938 100644
--- a/server/migrations/1625814801417-CreateUsers.ts
+++ b/server/migrations/1625814801417-CreateUsers.ts
@@ -47,12 +47,14 @@ export class CreateUsers1625814801417 implements MigrationInterface {
         {
           name: "created_at",
           type: "timestamp",
-          isNullable: true
+          isNullable: true,
+          default: "now()"
         },
         {
           name: "updated_at",
           type: "timestamp",
-          isNullable: true
+          isNullable: true,
+          default: "now()"
         }
       ]
     }), true)
diff --git a/server/ormconfig.ts b/server/ormconfig.js
similarity index 83%
rename from server/ormconfig.ts
rename to server/ormconfig.js
index b2c1d7aa9c..216f5f7ff2 100644
--- a/server/ormconfig.ts
+++ b/server/ormconfig.js
@@ -1,4 +1,3 @@
-import { User } from "./src/users/user.entity";
 
 module.exports = {
     type: 'postgres',
@@ -9,7 +8,6 @@ module.exports = {
     database: process.env.PG_DB,
     synchronize: false,
     logging: true,
-    entities: [User],
     migrations: ["migrations/*.ts"],
     cli: {
         migrationsDir: "migrations"
diff --git a/server/package.json b/server/package.json
index 7d30528dec..2e2174439d 100644
--- a/server/package.json
+++ b/server/package.json
@@ -19,7 +19,7 @@
     "test:cov": "jest --coverage",
     "test:debug": "node --inspect-brk -r tsconfig-paths/register -r ts-node/register node_modules/.bin/jest --runInBand",
     "test:e2e": "jest --config ./test/jest-e2e.json",
-    "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js"  
+    "typeorm": "node --require ts-node/register ./node_modules/typeorm/cli.js"
   },
   "dependencies": {
     "@nestjs/common": "^8.0.0",
diff --git a/server/src/app.controller.ts b/server/src/app.controller.ts
index d9d82e0b0b..acc72f42e3 100644
--- a/server/src/app.controller.ts
+++ b/server/src/app.controller.ts
@@ -6,7 +6,7 @@ import { AuthService } from './auth/auth.service';
 export class AppController {
   constructor(private authService: AuthService) {}
 
-  @Post('auth/login')
+  @Post('authenticate')
   async login(@Request() req) {
     return this.authService.login(req.body);
   }
diff --git a/server/src/app.module.ts b/server/src/app.module.ts
index 1b3d63e67b..7df08ef1e9 100644
--- a/server/src/app.module.ts
+++ b/server/src/app.module.ts
@@ -4,12 +4,22 @@ import { AppService } from './app.service';
 import { AuthModule } from './auth/auth.module';
 import { UsersModule } from './users/users.module';
 import { TypeOrmModule } from '@nestjs/typeorm';
-import { Connection } from 'typeorm';
+import { Connection, getConnectionOptions } from 'typeorm';
 import { User } from './users/user.entity';
 
 @Module({
   imports: [
-    TypeOrmModule.forRoot(),
+    TypeOrmModule.forRoot({
+      type: 'postgres',
+      host: process.env.PG_HOST,
+      port: parseInt(process.env.PG_PORT) || 5432,
+      username: process.env.PG_USER,
+      password: process.env.PG_PASS,
+      database: process.env.PG_DB,
+      entities: ["dist/**/*.entity{ .ts,.js}"],
+      synchronize: false,
+      logging: true
+    }),
     AuthModule, 
     UsersModule
   ],
diff --git a/server/src/main.ts b/server/src/main.ts
index 13cad38cff..18b76971dc 100644
--- a/server/src/main.ts
+++ b/server/src/main.ts
@@ -2,7 +2,10 @@ import { NestFactory } from '@nestjs/core';
 import { AppModule } from './app.module';
 
 async function bootstrap() {
-  const app = await NestFactory.create(AppModule);
+  const app = await NestFactory.create(AppModule, {
+    logger: ['error', 'log', 'verbose'],
+  });
+  app.enableCors();
   await app.listen(3000);
 }
 bootstrap();
diff --git a/server/src/users/user.entity.ts b/server/src/users/user.entity.ts
index b7412aa055..6a63aa29a5 100644
--- a/server/src/users/user.entity.ts
+++ b/server/src/users/user.entity.ts
@@ -1,4 +1,4 @@
-import { Entity, Column, PrimaryGeneratedColumn } from 'typeorm';
+import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn } from 'typeorm';
 
 @Entity({ name: "users" })
 export class User {
@@ -17,10 +17,10 @@ export class User {
   @Column({ name: 'password_digest' })
   passwordDigest: string
 
-  @Column({ type: 'timestamp', name: 'created_at', default: () => 'LOCALTIMESTAMP' })
-  createDate: string;
+  @CreateDateColumn({ default: () => 'now()', name: 'created_at' })
+  createAt: Date;
   
-  @Column({ type: 'timestamp', name: 'updated_at', default: () => 'LOCALTIMESTAMP' })
-  updateDate: string;
+  @UpdateDateColumn({ default: () => 'now()', name: 'updated_at' })
+  updateAt: Date;
 
 }