finamaze_schema 1.32.0 → 1.34.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "finamaze_schema",
-  "version": "1.32.0",
+  "version": "1.34.0",
   "description": "A package to connect two APIs with a single SQL database using TypeORM",
   "main": "dist/index.js",
   "types": "dist/index.d.ts",
@@ -8,14 +8,18 @@
     "build": "tsc",
     "migration:create": "ts-node node_modules/typeorm/cli.js migration:create ./src/migrations/$npm_config_name",
     "migrate": "ts-node node_modules/typeorm/cli.js migration:run -d ./src/data-source.ts",
-    "migration:genearate": "ts-node node_modules/typeorm/cli.js  migration:generate -d ./src/data-source.ts ./src/migrations/$npm_config_name",
-    "migration:revert": "ts-node node_modules/typeorm/cli.js migration:revert -d ./src/data-source.ts"
+    "migration:genearate": "ts-node node_modules/typeorm/cli.js  migration:generate -d ./src/data-source.ts ./src/migrations/$npm_config_name"
   },
   "keywords": [],
   "author": "",
   "license": "ISC",
   "dependencies": {
+    "@nestjs/common": "^10.4.1",
+    "@nestjs/config": "^3.2.3",
+    "@nestjs/core": "^10.4.1",
+    "@nestjs/typeorm": "^10.0.2",
     "dotenv": "^16.4.5",
+    "pg": "^8.12.0",
     "reflect-metadata": "^0.2.2",
     "typeorm": "^0.3.20"
   },

package/src/entity/email.entity.ts

@@ -0,0 +1,14 @@
+import { Entity, PrimaryGeneratedColumn, Column, ManyToOne } from 'typeorm';
+import { User } from './user.entity';
+
+@Entity()
+export class Email {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column( { nullable: false })
+  address: string;
+
+  @ManyToOne(() => User, (user) => user.emails, { nullable: false })
+  user: User;
+}

package/src/entity/goalPlan.entity.ts

@@ -0,0 +1,38 @@
+import { Entity, PrimaryGeneratedColumn, Column,ManyToOne } from 'typeorm';
+import { User } from './user.entity';
+
+@Entity()
+export class GoalPlan {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column()
+  objective: string;
+
+  @Column({
+    type: 'varchar',
+    length: 3,
+  })
+  currency: 'USD' | 'SAR';
+
+  @Column({nullable: true})
+  initial_amount: number;
+
+  @Column({nullable: true})
+  target_amount: number;
+
+  @Column({nullable: true})
+  contribution_amount: number;
+
+  @Column()
+  contribution_frequency: string;
+
+  @Column()
+  start_date: string;
+
+  @Column({nullable: true})
+  investment_duration: number;
+
+  @ManyToOne(() => User, (user) => user.goal_plans, { nullable: false })
+  user: User;
+}

package/src/entity/manager.entity.ts

@@ -1,56 +1,51 @@
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  CreateDateColumn,
-  Unique,
-} from "typeorm";
+import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, Unique } from 'typeorm';
 
 @Entity()
-@Unique(["email"])
+@Unique(['email'])
 export class Manager {
-  @PrimaryGeneratedColumn()
-  id: number;
-
-  @Column({ nullable: true })
-  username: string;
-
-  @Column()
-  email: string;
-
-  @Column()
-  password: string;
-
-  @Column({ nullable: true })
-  first_name: string;
-
-  @Column({ nullable: true })
-  last_name: string;
-
-  @Column({ nullable: true })
-  phone_number: string;
-
-  @Column({ nullable: true })
-  mobile_number: string;
-
-  @Column({ nullable: true })
-  department: string;
-
-  @Column({ nullable: true })
-  sub_department: string;
-
-  @Column({ nullable: true })
-  title: string;
-
-  @Column()
-  role: string;
-
-  @Column({ nullable: true })
-  is_deleted: boolean;
-
-  @CreateDateColumn()
-  created_at: Date;
-
-  @CreateDateColumn()
-  updated_at: Date;
-}
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({ nullable: true })
+    username: string;
+
+    @Column()
+    email: string;
+
+    @Column()
+    password: string;
+
+    @Column({ nullable: true })
+    first_name: string;
+    
+    @Column({ nullable: true })
+    last_name: string;
+    
+    @Column({ nullable: true })
+    phone_number: string;
+    
+    @Column({ nullable: true })
+    mobile_number: string;
+
+
+    @Column({ nullable: true })
+    department: string;
+    
+    @Column({ nullable: true })
+    sub_department: string;
+    
+    @Column({ nullable: true })
+    title: string;
+    
+    @Column()
+    role: string;
+
+    @Column({ nullable: true })
+    is_deleted: boolean;
+    
+    @CreateDateColumn()
+    created_at: Date;
+    
+    @CreateDateColumn()
+    updated_at: Date;
+}

package/src/entity/phone-number.entity.ts

@@ -0,0 +1,14 @@
+import { User } from './user.entity';
+import { Column, Entity, ManyToOne, OneToMany, PrimaryGeneratedColumn } from 'typeorm';
+
+@Entity()
+export class PhoneNumber {
+  @PrimaryGeneratedColumn()
+  id: number;
+
+  @Column({ nullable: false })
+  number: string;
+
+  @ManyToOne(() => User, (user) => user.phone_numbers,{ nullable: false })
+  user: User;
+}

package/src/entity/user.entity.ts

@@ -1,65 +1,74 @@
-import {
-  Entity,
-  Column,
-  PrimaryGeneratedColumn,
-  CreateDateColumn,
-  UpdateDateColumn,
-  Unique,
-  OneToMany,
-  Index,
-  DeleteDateColumn,
-} from "typeorm";
-
-export enum RegistrationStep {
-  INITIATED = "INITIATED",
-  COMPLETED = "COMPLETED",
-}
+import { Entity, Column, PrimaryGeneratedColumn, CreateDateColumn, UpdateDateColumn, Unique, OneToMany, Index } from 'typeorm';
+import { PhoneNumber } from './phone-number.entity';
+import { Email } from './email.entity';
+import { GoalPlan } from './goalPlan.entity';
 
 @Entity()
-@Unique(["username"])
+@Unique(['username'])
 export class User {
-  @PrimaryGeneratedColumn()
-  id: number;
+    @PrimaryGeneratedColumn()
+    id: number;
+
+    @Column({ nullable: false })
+    username: string;
+
+    @Column({ nullable: true })
+    email: string;
+
+    @OneToMany(() => Email, (email) => email.user, { cascade: true })
+    emails: Email[];
+
+    @Column({ nullable: true })
+    password: string;
+
+    @Column({ nullable: true })
+    phone_number: string;
+    
+    @OneToMany(() => PhoneNumber, (phoneNumber) => phoneNumber.user, { cascade: true })
+    phone_numbers: PhoneNumber[];
+
+    @Column({ nullable: true })
+    iqama_number: string;
 
-  @Column({ nullable: true })
-  username: string;
+    @Column({ nullable: true })
+    is_profile_complete: boolean;
 
-  @Column({ nullable: true })
-  email: string;
+    @Column({ nullable: true })
+    registration_step: string;
 
-  @Column({ nullable: true, select: false })
-  password: string;
+    @Column({ nullable: true })
+    smartcore_reference_id: number;
 
-  @Column({ nullable: true })
-  phone_number: string;
+    @Column({ nullable: true })
+    tcs_reference_id: string;
 
-  @Column({ nullable: true })
-  national_id: string;
+    @Column({ nullable: true })
+    name: string;
 
-  @Column({ default: false })
-  smartcore_sync_status: boolean;
+    @Column({ nullable: true })
+    type: string;
 
-  @Column({ type: "varchar2", default: RegistrationStep.INITIATED })
-  registration_step: RegistrationStep;
+    @Column({ nullable: true  })
+    status: string;
 
-  @Column({ nullable: true })
-  smartcore_reference_id: number;
+    @Column({nullable: true })
+    risk_profile: string;
 
-  @Column({ nullable: true })
-  cif: string;
+    @Column({default: false})
+    is_username_set: boolean;
 
-  @Column({ nullable: true })
-  full_name: string;
 
-  @Column({ type: "clob", nullable: true })
-  metadata: string;
+    @Column({nullable: true })
+    external_status: string;
 
-  @CreateDateColumn()
-  created_at: Date;
+    // Automatically set on entity creation
+    @CreateDateColumn()
+    created_at: Date;
 
-  @UpdateDateColumn()
-  updated_at: Date;
+    // Automatically updated when entity is updated
+    @UpdateDateColumn()
+    updated_at: Date;
 
-  @DeleteDateColumn()
-  deleted_at: Date | null;
+    @OneToMany(() => GoalPlan, (goalPlan) => goalPlan.user, { cascade: true })
+    goal_plans: GoalPlan[];
 }

package/src/index.ts

@@ -8,3 +8,6 @@
 
 export * from './entity/user.entity';
 export * from './entity/manager.entity';
+export * from './entity/phone-number.entity';
+export * from './entity/email.entity';
+export * from './entity/goalPlan.entity';

package/src/migrations/1733323133759-v1.ts

@@ -1,37 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class V11733323133759 implements MigrationInterface {
-    name = 'V11733323133759'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "iqama_number" TO "national_id"`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "is_profile_complete" TO "smartcore_sync_status"`);
-        await queryRunner.query(`UPDATE "user" SET "smartcore_sync_status" = 0 WHERE "smartcore_sync_status" IS NULL`);
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "smartcore_sync_status" DEFAULT 0`);
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "smartcore_sync_status" NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "status"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "risk_profile"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "is_username_set"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "external_status"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "meta_data" clob`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "deleted_at" timestamp`);
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "username" varchar2(255)  NULL`);
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "registration_step" varchar2(255) DEFAULT 'INITIATED' NOT NULL`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "registration_step" varchar2(255) NULL`);
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "username" varchar2(255)  NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "deleted_at"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "meta_data"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "external_status"  varchar2(255) NULL`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "is_username_set" number DEFAULT 0 NOT NULL`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "risk_profile"  varchar2(255) NULL`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "status" varchar2(255) NULL`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "smartcore_sync_status" To "is_profile_complete"`);
-        await queryRunner.query(`ALTER TABLE "user" MODIFY "is_profile_complete" NULL`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "national_id" TO "iqama_number"`);
-
-    }
-
-}

package/src/migrations/1734104865215-v2.ts

@@ -1,24 +0,0 @@
-import { MigrationInterface, QueryRunner } from "typeorm";
-
-export class V21734104865215 implements MigrationInterface {
-    name = 'V21734104865215'
-
-    public async up(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "name" TO "full_name"`);
-        await queryRunner.query(`ALTER TABLE "user" DROP COLUMN "type"`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "meta_data" TO "metadata"`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "tcs_reference_id" TO "cif"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD CONSTRAINT "UQ_78a916df40e02a9deb1c4b75edb" UNIQUE ("username")`);
-        await queryRunner.query(`DROP TABLE "goal_plan"`);
-        await queryRunner.query(`DROP TABLE "phone_number"`);
-        await queryRunner.query(`Drop TABLE "email"`);
-    }
-
-    public async down(queryRunner: QueryRunner): Promise<void> {
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "cif" TO "tcs_reference_id"`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "metadata" TO "meta_data"`);
-        await queryRunner.query(`ALTER TABLE "user" ADD "type" varchar2(255)`);
-        await queryRunner.query(`ALTER TABLE "user" RENAME COLUMN "full_name" TO "name"`);
-    }
-
-}