[add] Evaluation Score test cases

Author: TechQuery

source/controller/Evaluation.ts

@@ -25,7 +25,6 @@ import {
 } from '../model';
 import { searchConditionOf } from '../utility';
 import { ActivityLogController } from './ActivityLog';
-import { HackathonController } from './Hackathon';
 
 const store = dataSource.getRepository(Evaluation),
     teamStore = dataSource.getRepository(Team);
@@ -53,18 +52,20 @@ export class EvaluationController {
         if (now < +new Date(hackathon.judgeStartedAt) || now > +new Date(hackathon.judgeEndedAt))
             throw new ForbiddenError('Not in evaluation period');
 
-        await HackathonController.ensureJudge(createdBy.id, name);
-
         const saved = await store.save({
             ...evaluation,
             team,
             hackathon: team.hackathon,
             createdBy
         });
         await ActivityLogController.logCreate(createdBy, 'Evaluation', saved.id);
-        const dimensions = groupBy(evaluation.scores, 'dimension');
 
-        const scores = Object.values(dimensions).map(
+        const allScores = (await store.findBy({ team: { id: tid } }))
+            .map(({ scores }) => scores)
+            .flat();
+        const dimensionGroup = groupBy(allScores, 'dimension');
+
+        const scores = Object.values(dimensionGroup).map(
             (scores): Score => ({
                 dimension: scores[0].dimension,
                 score: sum(...scores.map(({ score }) => score)) / scores.length

source/controller/PlatformAdmin.ts

@@ -20,7 +20,8 @@ import {
     PlatformAdmin,
     PlatformAdminListChunk,
     Role,
-    User} from '../model';
+    User
+} from '../model';
 import { searchConditionOf } from '../utility';
 import { ActivityLogController } from './ActivityLog';
 

source/model/Survey.ts

@@ -12,7 +12,7 @@ import { Column, Entity } from 'typeorm';
 
 import { ListChunk } from './Base';
 import { HackathonBase } from './Hackathon';
-import { TeamBase } from './Team';
+import { Score, TeamBase } from './Team';
 
 export enum QuestionType {
     Text = 'text',
@@ -82,19 +82,6 @@ export class Standard extends HackathonBase {
     dimensions: Dimension[];
 }
 
-export class Score {
-    @IsString()
-    dimension: string;
-
-    @IsInt()
-    @Min(0)
-    score: number;
-
-    @IsString()
-    @IsOptional()
-    reason?: string;
-}
-
 @Entity()
 export class Evaluation extends TeamBase {
     @Type(() => Score)

source/model/Team.ts

@@ -2,8 +2,8 @@ import { Transform, Type } from 'class-transformer';
 import {
     IsBoolean,
     IsInt,
+    IsNumber,
     IsOptional,
-    IsPositive,
     IsString,
     Min,
     ValidateNested
@@ -12,7 +12,6 @@ import { Column, Entity, ManyToOne, VirtualColumn } from 'typeorm';
 
 import { ListChunk } from './Base';
 import { HackathonBase } from './Hackathon';
-import { Score } from './Survey';
 
 @Entity()
 export class Team extends HackathonBase {
@@ -41,10 +40,11 @@ export class Team extends HackathonBase {
     @Type(() => Score)
     @ValidateNested({ each: true })
     @IsOptional()
-    @Column('simple-json', { default: [] })
+    @Column('simple-json', { nullable: true })
     scores?: Score[] = [];
 
-    @IsPositive()
+    @IsNumber()
+    @Min(0)
     @IsOptional()
     @Column('float', { default: 0 })
     score?: number = 0;
@@ -68,3 +68,16 @@ export class TeamListChunk implements ListChunk<Team> {
     @ValidateNested({ each: true })
     list: Team[];
 }
+
+export class Score {
+    @IsString()
+    dimension: string;
+
+    @IsInt()
+    @Min(0)
+    score: number;
+
+    @IsString()
+    @IsOptional()
+    reason?: string;
+}