#8 added set up working credentials for base

planner-api/src/app-data-source.ts

-import { DataSource } from "typeorm"
+import { DataSource } from "typeorm";
+import {User} from './models/User';
 
 export const myDataSource = new DataSource({
     type: "postgres",
     host: "localhost",
-    port: 3308,
-    username: "test",
-    password: "test",
+    port: 5432,
+    username: "pluser",
+    password: "pluser",
     database: "planner",
-    entities: ["./models/*.ts"],
+    // entities: ["./models/*.ts"],
+    entities: [User],
     logging: true,
     synchronize: true,
 })
\ No newline at end of file

planner-api/src/models/User.ts

@@ -44,17 +44,15 @@ export class User extends BaseEntity implements IUser {
   @Column({ name: 'last_name', type: 'varchar', length:30,nullable: false })
   surname!: string
 
-  @Column({ name: 'last_name', type: 'varchar', length:30,nullable: false })
+  @Column({ name: 'displayName', type: 'varchar', length:30,nullable: false })
   displayName!: string
 
   @Column({ type: 'varchar',length:20, unique: true, nullable: false })
   email!: string
 
-  @Column({ type: 'varchar',length:10, unique: true })
-  phone!: string
+  @Column({ type: 'varchar',length:10, unique: true, nullable: true})
+  phone?: string
 
-  @Column({ type: 'varchar', nullable: false })
-  password!: string
   
   @CreateDateColumn()
   
@@ -64,10 +62,13 @@ export class User extends BaseEntity implements IUser {
   @Column({
     type: "enum",
     enum: ["worker", "director"],
-    default: "ghost"
-})
+    default: "worker"
+  })
   role!: UserRoleType
   
+  @Exclude()
+  @Column({ type: 'varchar', nullable: false, select:false })
+  password!: string
 
 
 

planner-api/src/routers/users.ts

 import express,{Router, Request, Response} from 'express';
 import {User} from '../models/User';
-// import {DataSource} from 'typeorm';
+import {DataSource} from 'typeorm';
 import {myDataSource} from '../app-data-source';
 
 const router:Router = express.Router();
 const dataSource = myDataSource;
+// const dataSource = myDataSource;
 
 router.get('/', async (req : Request, res : Response):Promise<object> => {
 const users:any = await dataSource.manager.find(User)