Model rsc assessment and category tables; add OneToMany relation betw…

…een user and assessment; update question and resource column names.

backend/src/models/connection.ts

@@ -7,6 +7,8 @@ import {
   Organization,
   OrganizationTag,
   Role,
+  RscAssessment,
+  RscCategory,
   RscQuestion,
   RscResource,
   SavedSearch,
@@ -36,6 +38,8 @@ const connectDb = async (logging?: boolean) => {
       Organization,
       OrganizationTag,
       Role,
+      RscAssessment,
+      RscCategory,
       RscQuestion,
       RscResource,
       SavedSearch,

backend/src/models/index.ts

@@ -6,6 +6,8 @@ export * from './domain';
 export * from './organization';
 export * from './organization-tag';
 export * from './role';
+export * from './rsc_assessment';
+export * from './rsc_category';
 export * from './rsc_question';
 export * from './rsc_resource';
 export * from './saved-search';

backend/src/models/rsc_assessment.ts

@@ -0,0 +1,29 @@
+import {
+  BaseEntity,
+  CreateDateColumn,
+  Entity,
+  ManyToOne,
+  OneToMany,
+  PrimaryGeneratedColumn,
+  UpdateDateColumn
+} from 'typeorm';
+import { User } from './user';
+import { RscQuestion } from './rsc_question';
+
+@Entity()
+export class RscAssessment extends BaseEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @CreateDateColumn()
+  createdAt: Date;
+
+  @UpdateDateColumn()
+  updatedAt: Date;
+
+  @ManyToOne(() => User, (user) => user.assessments)
+  user: User;
+
+  @OneToMany(() => RscQuestion, (question) => question.assessment)
+  questions: RscQuestion[];
+}

backend/src/models/rsc_category.ts

@@ -0,0 +1,20 @@
+import {
+  BaseEntity,
+  Column,
+  Entity,
+  OneToMany,
+  PrimaryGeneratedColumn
+} from 'typeorm';
+import { RscQuestion } from './rsc_question';
+
+@Entity()
+export class RscCategory extends BaseEntity {
+  @PrimaryGeneratedColumn('uuid')
+  id: string;
+
+  @Column()
+  name: string;
+
+  @OneToMany(() => RscQuestion, (question) => question.category)
+  questions: RscQuestion[];
+}

backend/src/models/rsc_question.ts

@@ -2,9 +2,12 @@ import {
   BaseEntity,
   Column,
   Entity,
+  ManyToOne,
   OneToMany,
   PrimaryGeneratedColumn
 } from 'typeorm';
+import { RscAssessment } from './rsc_assessment';
+import { RscCategory } from './rsc_category';
 import { RscResource } from './rsc_resource';
 
 @Entity()
@@ -15,6 +18,18 @@ export class RscQuestion extends BaseEntity {
   @Column()
   name: string;
 
+  @Column()
+  longForm: string;
+
+  @Column()
+  number: number;
+
+  @ManyToOne(() => RscAssessment, (assessment) => assessment.questions)
+  assessment: RscAssessment;
+
+  @ManyToOne(() => RscCategory, (category) => category.questions)
+  category: RscCategory;
+
   @OneToMany(() => RscResource, (resource) => resource.question)
   resources: RscResource[];
 }

backend/src/models/rsc_resource.ts

@@ -13,10 +13,13 @@ export class RscResource extends BaseEntity {
   id: string;
 
   @Column()
-  title: string;
+  description: string;
 
   @Column()
-  text: string;
+  name: string;
+
+  @Column()
+  type: string;
 
   @Column()
   url: string;

backend/src/models/user.ts

@@ -12,6 +12,7 @@ import {
 } from 'typeorm';
 import { Role } from './';
 import { ApiKey } from './api-key';
+import { RscAssessment } from './rsc_assessment';
 
 export enum UserType {
   GLOBAL_VIEW = 'globalView',
@@ -116,4 +117,7 @@ export class User extends BaseEntity {
     nullable: true
   })
   state: string;
+
+  @OneToMany(() => RscAssessment, (assessment) => assessment.user)
+  assessments: RscAssessment[];
 }