Merge pull request #84 from TeamHSE/feat/orm

feat(backend): change orm
TeamHSE · Jun 23, 2024 · ed0c5a6 · ed0c5a6
2 parents 9d2dcc7 + 5716959
commit ed0c5a6
Show file tree

Hide file tree

Showing 7 changed files with 0 additions and 83 deletions.
diff --git a/backend/src/entity/Course.ts b/backend/src/entity/Course.ts
@@ -7,7 +7,6 @@ import {
   ManyToOne,
 } from "typeorm";
 import { CoursesModule } from "./CoursesModules";
-import { CoursesStep } from "./CoursesStep";
 import { CoursesViewer } from "./CoursesViewers";
 
 @Entity("courses")

diff --git a/backend/src/entity/CoursesModules.ts b/backend/src/entity/CoursesModules.ts
@@ -23,12 +23,6 @@ export class CoursesModule extends BaseEntity {
   @Column("text")
   description: string | undefined;
 
-  @Column({ default: false, type: "boolean" })
-  isVisible: boolean | undefined;
-
-  @Column({ type: "integer" })
-  moduleNumber: number | undefined;
-
   @ManyToOne(() => Course, (course) => course.modules)
   course: Course;
 

diff --git a/backend/src/entity/CoursesStep.ts b/backend/src/entity/CoursesStep.ts
@@ -7,7 +7,6 @@ import {
   PrimaryGeneratedColumn,
 } from "typeorm";
 import { CoursesModule } from "./CoursesModules";
-import { UsersActivity } from "./UsersActivity";
 
 @Entity("courses_steps")
 export class CoursesStep extends BaseEntity {
@@ -26,21 +25,12 @@ export class CoursesStep extends BaseEntity {
   @Column({ nullable: true, type: "text" })
   youtubeVideoLink: string | undefined;
 
-  @Column({ default: false, type: "boolean" })
-  isVisible: boolean | undefined;
-
-  @Column({ type: "integer" })
-  stepNumber: number | undefined;
-
   @Column({ default: -1, type: "integer" })
   deadline: number | undefined;
 
   @Column({ default: 1, type: "integer" })
   ratingAward: number | undefined;
 
-  @OneToMany(() => UsersActivity, (activity) => activity.step)
-  activities: UsersActivity[];
-
   @ManyToOne(() => CoursesModule, (module) => module.steps)
   module: CoursesModule;
 }
diff --git a/backend/src/entity/CoursesViewers.ts b/backend/src/entity/CoursesViewers.ts
@@ -5,7 +5,6 @@ import {
   OneToMany,
   PrimaryGeneratedColumn,
 } from "typeorm";
-import { UsersRole } from "./UsersRoles";
 import { Course } from "./Course";
 import { User } from "./User";
 
@@ -20,12 +19,6 @@ export class CoursesViewer extends BaseEntity {
   @Column({ type: "uuid" })
   courseId: "uuid" | undefined;
 
-  @Column({ type: "uuid" })
-  roleId: "uuid" | undefined;
-
-  @OneToMany(() => UsersRole, (role) => role.viewer)
-  roles: UsersRole[];
-
   @OneToMany(() => User, (user) => user.viewers)
   user: User[];
 

diff --git a/backend/src/entity/User.ts b/backend/src/entity/User.ts
@@ -2,13 +2,8 @@ import {
   Column,
   Entity,
   ManyToOne,
-  OneToMany,
   PrimaryGeneratedColumn,
 } from "typeorm";
-import { UUID } from "crypto";
-import { UsersActivity } from "./UsersActivity";
-import { UsersRole } from "./UsersRoles";
-import { Course } from "./Course";
 import { CoursesViewer } from "./CoursesViewers";
 
 @Entity("users")
@@ -49,9 +44,6 @@ export class User {
   @Column({ type: "text", nullable: true })
   healthIssues: string;
 
-  @OneToMany(() => UsersActivity, (activity) => activity.user)
-  activities: UsersActivity[];
-
   @ManyToOne(() => CoursesViewer, (viewer) => viewer.user)
   viewers: CoursesViewer;
 }
diff --git a/backend/src/entity/UsersActivity.ts b/backend/src/entity/UsersActivity.ts
diff --git a/backend/src/entity/UsersRoles.ts b/backend/src/entity/UsersRoles.ts