Implement the data models #46

kumuditha-udayanga · 2023-07-29T12:26:45Z

Purpose

The purpose of this PR is to fix #8

Goals

Approach

Screenshots

Checklist

This PR doesn't commit any keys, passwords, tokens, usernames, or other secrets.
I have read and understood the development best practices guidelines ( http://bit.ly/sef-best-practices )
My code follows the style guidelines of this project
I have performed a self-review of my own code
I have commented my code, particularly in hard-to-understand areas
I have made corresponding changes to the documentation

Related PRs

Test environment

Learning

anjula-sack · 2023-08-05T10:10:54Z

src/entity/email.entity.ts

+    content: string
+    // Should be ENUM
+    @Column()
+    state: string


Let's create an enum type

anjula-sack · 2023-08-05T10:14:41Z

src/entity/mentee.entity.ts

+
+    @UpdateDateColumn()
+    updated_at: Date | undefined
+


mente, mentor relationship

@ManyToOne(() => Mentor, mentor => mentor.mentees) mentor: Mentor;

anjula-sack · 2023-08-05T10:15:42Z

src/entity/mentor.entity.ts

+
+    @UpdateDateColumn()
+    updated_at: Date | undefined
+


@OneToMany(() => Mentee, mentee => mentee.mentor) mentees: Mentee[];

anjula-sack · 2023-08-05T10:17:11Z

src/entity/mentor.entity.ts

+    state: string
+    // Should be Enum
+    @Column()
+    category: string


This will be a string

Now this has a relationship. one to many with category

anjula-sack · 2023-08-05T10:17:42Z

can you add the program entity as well @kumuditha-udayanga

anjula-sack · 2023-08-05T17:48:00Z

src/entity/mentee.entity.ts


 @Entity('mentee')
 class Mentee {
    @PrimaryGeneratedColumn()
    id!: bigint

-    @Column({type: "enum"})
+    @Column()
    state: string


This is a enum. PENDING, REJECTED, ACCEPTED

anjula-sack · 2023-08-05T17:49:49Z

src/entity/mentor.entity.ts

+    state: string
+    // Should be Enum
+    @Column()
+    category: string


Now this has a relationship. one to many with category

src/entity/platform.entity.ts

src/enums/enums.ts

anjula-sack · 2023-08-06T03:37:35Z

src/entity/category.entity.ts

+        category: string,
+    ) {
+        this.category = category;
+    }


Suggested change

}

}

@BeforeInsert()

@BeforeUpdate()

updateTimestamps() {

this.updated_at = new Date();

if (!this.uuid) {

this.created_at = new Date();

}

}

@BeforeInsert()

async generateUuid() {

if (!this.uuid) {

this.uuid = uuidv4();

}

}

anjula-sack · 2023-08-06T03:38:05Z

src/entity/category.entity.ts

+@Entity("category")
+class Category {
+    @PrimaryGeneratedColumn('uuid')
+    id!: bigint


Suggested change

id!: bigint

uuid!: bigint

@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })

created_at: Date | undefined;

@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })

updated_at: Date | undefined;

anjula-sack · 2023-08-06T03:38:26Z

src/entity/email.entity.ts

+@Entity("email")
+class Email {
+    @PrimaryGeneratedColumn('uuid')
+    id!: bigint


Suggested change

id!: bigint

uuid!: bigint

anjula-sack · 2023-08-06T03:38:57Z

src/entity/email.entity.ts

+    @CreateDateColumn()
+    created_at: Date | undefined


Suggested change

@CreateDateColumn()

created_at: Date | undefined

@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })

created_at: Date | undefined;

@Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })

updated_at: Date | undefined;

anjula-sack · 2023-08-06T03:39:42Z

src/entity/email.entity.ts

+        this.subject = subject;
+        this.content = content;
+        this.state = state;
+    }


Suggested change

}

}

@BeforeInsert()

@BeforeUpdate()

updateTimestamps() {

this.updated_at = new Date();

if (!this.uuid) {

this.created_at = new Date();

}

}

@BeforeInsert()

async generateUuid() {

if (!this.uuid) {

this.uuid = uuidv4();

}

}

anjula-sack · 2023-08-06T03:40:43Z

src/entity/mentee.entity.ts

+@Entity('mentee')
+class Mentee {
+    @PrimaryGeneratedColumn()
+    id!: bigint


Suggested change

id!: bigint

uuid!: bigint

anjula-sack · 2023-08-06T03:41:00Z

src/entity/mentor.entity.ts

+@Entity("mentor")
+class Mentor {
+    @PrimaryGeneratedColumn('uuid')
+    id!: bigint


Suggested change

id!: bigint

uuid!: bigint

anjula-sack · 2023-08-06T03:41:44Z

src/entity/mentor.entity.ts

+    @CreateDateColumn()
+    created_at: Date | undefined
+
+    @UpdateDateColumn()
+    updated_at: Date | undefined


Update this just like above,

refer to the existing profile entity

anjula-sack · 2023-08-06T03:41:57Z

src/entity/platform.entity.ts

+@Entity("platform")
+class Platform {
+    @PrimaryGeneratedColumn('uuid')
+    id!: bigint


Suggested change

id!: bigint

uuid!: bigint

anjula-sack · 2023-08-06T03:42:35Z

src/types.ts

@@ -0,0 +1,16 @@
+interface Option {
+// todo: To be determined
+}


Suggested change

}

}

anjula-sack · 2023-08-06T13:25:36Z

@kumuditha-udayanga can you fix the conflicts?

kumuditha-udayanga · 2023-08-06T16:18:29Z

Sure @anjula-sack, I'll resolve them as well.

anjula-sack · 2023-08-11T04:52:28Z

Hi @kumuditha-udayanga, any updates on this?

anjula-sack

Thank you! @kumuditha-udayanga

anjula-sack requested changes Aug 5, 2023

View reviewed changes

kumuditha-udayanga requested a review from anjula-sack August 5, 2023 17:46

anjula-sack requested changes Aug 5, 2023

View reviewed changes

kumuditha-udayanga requested a review from anjula-sack August 5, 2023 19:08

kumuditha-udayanga marked this pull request as ready for review August 5, 2023 19:09

kumuditha-udayanga force-pushed the issue-08 branch from 716eb4d to 2ca05fe Compare August 5, 2023 19:12

anjula-sack requested changes Aug 6, 2023

View reviewed changes

kumuditha-udayanga added 8 commits August 11, 2023 20:14

Add .idea to gitignore

9b5c27b

Create initial models

0eb06f7

Create email entity

4b8c9a3

Create platform and category

3d92d25

Create relationship with mentor and category entities

7295066

Remove category from platform entity

cd05e44

Update platform model

969595a

Update created_at and updated_at columns

ff80da0

kumuditha-udayanga force-pushed the issue-08 branch from 2ca05fe to ff80da0 Compare August 11, 2023 14:52

Resolve eslint errors

5092834

anjula-sack approved these changes Aug 11, 2023

View reviewed changes

anjula-sack merged commit 21127a7 into sef-global:main Aug 11, 2023
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Implement the data models #46

Implement the data models #46

kumuditha-udayanga commented Jul 29, 2023

anjula-sack Aug 5, 2023

anjula-sack Aug 5, 2023

anjula-sack Aug 5, 2023

anjula-sack Aug 5, 2023

anjula-sack Aug 5, 2023

anjula-sack commented Aug 5, 2023

anjula-sack Aug 5, 2023

anjula-sack Aug 5, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack Aug 6, 2023

anjula-sack commented Aug 6, 2023

kumuditha-udayanga commented Aug 6, 2023

anjula-sack commented Aug 11, 2023

anjula-sack left a comment

-    }
+    }
+     @BeforeInsert()
+  @BeforeUpdate()
+  updateTimestamps() {
+    this.updated_at = new Date();
+    if (!this.uuid) {
+      this.created_at = new Date();
+    }
+  }
+  @BeforeInsert()
+  async generateUuid() {
+    if (!this.uuid) {
+      this.uuid = uuidv4();
+    }
+  }

-    id!: bigint
+    uuid!: bigint
+     @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+     created_at: Date | undefined;
+     @Column({ type: 'timestamp', default: () => 'CURRENT_TIMESTAMP' })
+     updated_at: Date | undefined;

Implement the data models #46

Implement the data models #46

Conversation

kumuditha-udayanga commented Jul 29, 2023

Purpose

Goals

Approach

Screenshots

Checklist

Related PRs

Test environment

Learning

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anjula-sack commented Aug 5, 2023

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

anjula-sack commented Aug 6, 2023

kumuditha-udayanga commented Aug 6, 2023

anjula-sack commented Aug 11, 2023

anjula-sack left a comment

Choose a reason for hiding this comment