[add] test cases of Hackathon controller

[fix] some detail bugs of User, Hackathon & Staff

Author: TechQuery

source/controller/Hackathon.ts

@@ -11,8 +11,8 @@ import {
     OnNull,
     OnUndefined,
     Param,
-    Patch,
     Post,
+    Put,
     QueryParams
 } from 'routing-controllers';
 import { ResponseSchema } from 'routing-controllers-openapi';
@@ -21,6 +21,7 @@ import {
     dataSource,
     Hackathon,
     HackathonFilter,
+    HackathonInput,
     HackathonListChunk,
     StaffType,
     User
@@ -37,7 +38,7 @@ const store = dataSource.getRepository(Hackathon);
 export class HackathonController {
     static async ensureAdmin(userId: number, hackathonName: string) {
         if (
-            !(await StaffController.isAdmin(userId, hackathonName)) ||
+            !(await StaffController.isAdmin(userId, hackathonName)) &&
             !(await PlatformAdminController.isAdmin(userId))
         )
             throw new ForbiddenError();
@@ -53,13 +54,13 @@ export class HackathonController {
             throw new ForbiddenError();
     }
 
-    @Patch('/:name')
+    @Put('/:name')
     @Authorized()
     @ResponseSchema(Hackathon)
     async updateOne(
         @CurrentUser() updatedBy: User,
         @Param('name') name: string,
-        @Body() newData: Hackathon
+        @Body() newData: HackathonInput
     ) {
         const old = await store.findOne({
             where: { name },
@@ -105,10 +106,8 @@ export class HackathonController {
         @CurrentUser() deletedBy: User,
         @Param('name') name: string
     ) {
-        const old = await store.findOne({
-            where: { name },
-            relations: ['createdBy']
-        });
+        const old = await store.findOneBy({ name });
+
         if (!old) throw new NotFoundError();
 
         await HackathonController.ensureAdmin(deletedBy.id, name);
@@ -125,7 +124,7 @@ export class HackathonController {
     @ResponseSchema(Hackathon)
     async createOne(
         @CurrentUser() createdBy: User,
-        @Body() hackathon: Hackathon
+        @Body() hackathon: HackathonInput
     ) {
         const saved = await store.save({ ...hackathon, createdBy });
 

source/controller/Staff.ts

@@ -161,7 +161,7 @@ export class StaffController {
         });
         const [list, count] = await store.findAndCount({
             where,
-            relations: ['user'],
+            relations: ['hackathon', 'user'],
             skip: pageSize * (pageIndex - 1),
             take: pageSize
         });

source/controller/User.ts

@@ -112,7 +112,7 @@ export class UserController {
         });
         await ActivityLogController.logUpdate(updatedBy, 'User', id);
 
-        return saved;
+        return UserController.sign(saved);
     }
 
     @Get('/:id')

source/model/Hackathon.ts

@@ -12,7 +12,7 @@ import {
 import { Column, Entity, Index, ManyToOne, VirtualColumn } from 'typeorm';
 
 import { BaseFilter, InputData, ListChunk, Media } from './Base';
-import { UserBase } from './User';
+import { UserBase, UserInputData } from './User';
 
 export enum HackathonStatus {
     Planning = 'planning',
@@ -23,94 +23,68 @@ export enum HackathonStatus {
 
 @Entity()
 export class Hackathon extends UserBase {
-    @IsString()
     @Column()
     @Index({ unique: true })
     name: string;
 
-    @IsString()
     @Column({ unique: true })
     displayName: string;
 
-    @IsString()
     @Column()
     ribbon: string;
 
-    @IsString({ each: true })
     @Column('simple-json')
     tags: string[];
 
-    @IsString()
     @Column()
     summary: string;
 
-    @IsString()
     @Column('text')
     detail: string;
 
-    @IsString()
     @Column()
     location: string;
 
-    @Type(() => Media)
-    @ValidateNested({ each: true })
     @Column('simple-json')
     banners: Media[];
 
-    @IsEnum(HackathonStatus)
-    @IsOptional()
     @Column({
         type: 'simple-enum',
         enum: HackathonStatus,
         default: HackathonStatus.Planning
     })
     status?: HackathonStatus = HackathonStatus.Planning;
 
-    @IsBoolean()
-    @IsOptional()
     @Column('boolean', { default: false })
     readOnly?: boolean = false;
 
-    @IsBoolean()
-    @IsOptional()
     @Column('boolean', { default: true })
     autoApprove?: boolean = true;
 
-    @IsInt()
-    @Min(0)
-    @IsOptional()
     @Column({ nullable: true })
     maxEnrollment?: number;
 
-    @IsInt()
-    @Min(0)
     @VirtualColumn({
         query: alias =>
             `SELECT COUNT(*) FROM "enrollment" WHERE "enrollment"."hackathonId" = ${alias}.id`
     })
     enrollment: number;
 
-    @IsDateString()
     @Column('date')
     eventStartedAt: string;
 
-    @IsDateString()
     @Column('date')
     eventEndedAt: string;
 
-    @IsDateString()
     @Column('date')
     enrollmentStartedAt: string;
 
-    @IsDateString()
     @Column('date')
     enrollmentEndedAt: string;
 
-    @IsDateString()
     @Column('date')
     judgeStartedAt: string;
 
-    @IsDateString()
     @Column('date')
     judgeEndedAt: string;
 
@@ -129,14 +103,77 @@ export abstract class HackathonBase extends UserBase {
     hackathon: Hackathon;
 }
 
+export class HackathonInput implements UserInputData<Hackathon> {
+    @IsString()
+    name: string;
+
+    @IsString()
+    displayName: string;
+
+    @IsString()
+    ribbon: string;
+
+    @IsString({ each: true })
+    tags: string[];
+
+    @IsString()
+    summary: string;
+
+    @IsString()
+    detail: string;
+
+    @IsString()
+    location: string;
+
+    @Type(() => Media)
+    @ValidateNested({ each: true })
+    banners: Media[];
+
+    @IsEnum(HackathonStatus)
+    @IsOptional()
+    status?: HackathonStatus = HackathonStatus.Planning;
+
+    @IsBoolean()
+    @IsOptional()
+    readOnly?: boolean = false;
+
+    @IsBoolean()
+    @IsOptional()
+    autoApprove?: boolean = true;
+
+    @IsInt()
+    @Min(0)
+    @IsOptional()
+    maxEnrollment?: number;
+
+    @IsInt()
+    @Min(0)
+    @IsOptional()
+    enrollment: number;
+
+    @IsDateString()
+    eventStartedAt: string;
+
+    @IsDateString()
+    eventEndedAt: string;
+
+    @IsDateString()
+    enrollmentStartedAt: string;
+
+    @IsDateString()
+    enrollmentEndedAt: string;
+
+    @IsDateString()
+    judgeStartedAt: string;
+
+    @IsDateString()
+    judgeEndedAt: string;
+}
+
 export class HackathonFilter
     extends BaseFilter
     implements Partial<InputData<Hackathon>>
 {
-    @IsString()
-    @IsOptional()
-    name?: string;
-
     @IsEnum(HackathonStatus)
     @IsOptional()
     status?: HackathonStatus;

source/utility.ts

@@ -1,4 +1,4 @@
-import { FindOptionsWhere, Like } from 'typeorm';
+import { FindOptionsWhere, ILike } from 'typeorm';
 
 import { Base } from './model';
 
@@ -18,5 +18,5 @@ export const searchConditionOf = <T extends Base>(
     filter?: FindOptionsWhere<T>
 ) =>
     keywords
-        ? keys.map(key => ({ [key]: Like(`%${keywords}%`), ...filter }))
+        ? keys.map(key => ({ [key]: ILike(`%${keywords}%`), ...filter }))
         : filter;