Merge pull request #299 from bounswe/be-287/one-to-many-user-and-polls

one to many relationship is added to user-poll.
bounswe · Nov 11, 2023 · 1477954 · 1477954
2 parents e9b1476 + a25ec42
commit 1477954
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/app/backend/src/poll/entities/poll.entity.ts b/app/backend/src/poll/entities/poll.entity.ts
@@ -1,8 +1,11 @@
+import { User } from '../../user/entities/user.entity';
 import {
   Entity,
   Column,
   PrimaryGeneratedColumn,
   CreateDateColumn,
+  ManyToOne,
+  JoinColumn,
 } from 'typeorm';
 
 // @Todo Some entities are not ready, therefore this is not the finalized version.
@@ -14,8 +17,8 @@ export class Poll {
   @Column({ nullable: false })
   question: string;
 
-  //@ManyToOne(() => User) // Establishing the many-to-one relationship
-  //@JoinColumn({ name: 'id' }) // Specifying the foreign key column
+  @ManyToOne(() => User, user => user.polls) // Establishing the many-to-one relationship
+  @JoinColumn({ name: 'creator_id' }) // Specifying the foreign key column
   @Column({ nullable: false })
   creator: string;
 

diff --git a/app/backend/src/user/entities/user.entity.ts b/app/backend/src/user/entities/user.entity.ts
@@ -1,10 +1,12 @@
 import * as bcrypt from 'bcrypt';
+import { Poll } from '../../poll/entities/poll.entity';
 import {
   Entity,
   Column,
   PrimaryGeneratedColumn,
   BeforeInsert,
   BeforeUpdate,
+  OneToMany,
 } from 'typeorm';
 
 const SALT_ROUNDS = 10;
@@ -32,6 +34,9 @@ export class User {
   @Column({ nullable: true })
   reset_password_token: number;
 
+  @OneToMany(() => Poll, poll => poll.creator)
+  polls: Poll[];
+
   @BeforeInsert()
   async hashPasswordBeforeInsert() {
     if (this.password) {

diff --git a/app/backend/src/user/user.service.ts b/app/backend/src/user/user.service.ts
@@ -18,7 +18,10 @@ export class UserService {
   }
 
   public async findUserById(id: string): Promise<User> {
-    return await this.userRepository.findOneBy({ id });
+    return await this.userRepository.findOne({ 
+      where: {id: id},
+      relations: ['polls'],
+    });
   }
 
   public async createUser(user: CreateUserDto): Promise<User> {
@@ -37,7 +40,9 @@ export class UserService {
   }
 
   public async findAll(): Promise<User[]> {
-    return await this.userRepository.find();
+    return await this.userRepository.find({
+      relations: ['polls'],
+    });
   }
 
   public async verifyUser(email: string): Promise<void> {