Write events test suite

api/validators/EventControllerRequests.ts

@@ -58,30 +58,30 @@ export class Event extends OptionalEventProperties implements IEvent {
   pointValue: number;
 }
 
-export class EventPatches extends OptionalEventProperties implements IEvent {
+export class EventPatches extends OptionalEventProperties implements Partial<IEvent> {
   @IsNotEmpty()
-  cover: string;
+  cover?: string;
 
   @IsNotEmpty()
-  title: string;
+  title?: string;
 
   @IsNotEmpty()
-  description: string;
+  description?: string;
 
   @IsNotEmpty()
-  location: string;
+  location?: string;
 
   @IsDateString()
-  start: Date;
+  start?: Date;
 
   @IsDateString()
-  end: Date;
+  end?: Date;
 
   @IsNotEmpty()
-  attendanceCode: string;
+  attendanceCode?: string;
 
   @Allow()
-  pointValue: number;
+  pointValue?: number;
 }
 
 export class EventSearchOptions implements IEventSearchOptions {

api/validators/FeedbackControllerRequests.ts

@@ -2,7 +2,6 @@ import { Type } from 'class-transformer';
 import { IsDefined, IsNotEmpty, MinLength, ValidateNested } from 'class-validator';
 import { IsValidFeedbackType, IsValidFeedbackStatus } from '../decorators/Validators';
 import {
-  SubmitEventFeedbackRequest as ISubmitEventFeedbackRequest,
   SubmitFeedbackRequest as ISubmitFeedbackRequest,
   UpdateFeedbackStatusRequest as IUpdateFeedbackStatusRequest,
   Feedback as IFeedback,
@@ -24,11 +23,6 @@ export class Feedback implements IFeedback {
   type: FeedbackType;
 }
 
-export class SubmitEventFeedbackRequest implements ISubmitEventFeedbackRequest {
-  @IsDefined()
-  feedback: string[];
-}
-
 export class SubmitFeedbackRequest implements ISubmitFeedbackRequest {
   @Type(() => Feedback)
   @ValidateNested()

package.json

@@ -56,6 +56,7 @@
     "pg": "^8.6.0",
     "reflect-metadata": "^0.1.13",
     "routing-controllers": "^0.9.0",
+    "ts-mockito": "^2.6.1",
     "ts-node": "^9.1.1",
     "tsconfig-paths": "^3.9.0",
     "typedi": "^0.8.0",

services/EventService.ts

@@ -18,7 +18,7 @@ export default class EventService {
   public async create(event: Event) {
     const eventCreated = await this.transactions.readWrite(async (txn) => {
       const eventRepository = Repositories.event(txn);
-      const isUnusedAttendanceCode = eventRepository.isUnusedAttendanceCode(event.attendanceCode);
+      const isUnusedAttendanceCode = await eventRepository.isUnusedAttendanceCode(event.attendanceCode);
       if (!isUnusedAttendanceCode) throw new UserError('Attendance code has already been used');
       return eventRepository.upsertEvent(EventModel.create(event));
     });
@@ -61,7 +61,7 @@ export default class EventService {
       const currentEvent = await eventRepository.findByUuid(uuid);
       if (!currentEvent) throw new NotFoundError('Event not found');
       if (changes.attendanceCode !== currentEvent.attendanceCode) {
-        const isUnusedAttendanceCode = eventRepository.isUnusedAttendanceCode(changes.attendanceCode);
+        const isUnusedAttendanceCode = await eventRepository.isUnusedAttendanceCode(changes.attendanceCode);
         if (!isUnusedAttendanceCode) throw new UserError('Attendance code has already been used');
       }
       return eventRepository.upsertEvent(currentEvent, changes);

services/StorageService.ts

@@ -4,9 +4,8 @@ import * as path from 'path';
 import * as multer from 'multer';
 import { InternalServerError } from 'routing-controllers';
 import { Config } from '../config';
-import { MediaType } from '../types';
+import { MediaType, File } from '../types';
 
-type File = Express.Multer.File;
 type FileOptions = multer.Options;
 
 interface MediaTypeConfig {

tests/admin.test.ts

@@ -75,11 +75,12 @@ describe('retroactive attendance submission', () => {
     );
 
     const userResponse = await userController.getUser({ uuid: user.uuid }, proxyUser);
-    const attendanceResponse = await attendanceController.getAttendancesForCurrentUser(user);
-    const activityResponse = await userController.getCurrentUserActivityStream(user);
-
     expect(userResponse.user.points).toEqual(user.points);
+
+    const attendanceResponse = await attendanceController.getAttendancesForCurrentUser(user);
     expect(attendanceResponse.attendances).toHaveLength(1);
+
+    const activityResponse = await userController.getCurrentUserActivityStream(user);
     expect(activityResponse.activity).toHaveLength(2);
     expect(activityResponse.activity[1].description).toBeNull();
   });
@@ -107,13 +108,15 @@ describe('retroactive attendance submission', () => {
     await adminController.submitAttendanceForUsers(request, proxyUser);
 
     const userResponse = await userController.getUser({ uuid: user.uuid }, proxyUser);
-    const staffUserResponse = await userController.getUser({ uuid: staffUser.uuid }, proxyUser);
-    const activityResponse = await userController.getCurrentUserActivityStream(user);
-    const staffActivityResponse = await userController.getCurrentUserActivityStream(staffUser);
-
     expect(userResponse.user.points).toEqual(event.pointValue);
+
+    const staffUserResponse = await userController.getUser({ uuid: staffUser.uuid }, proxyUser);
     expect(staffUserResponse.user.points).toEqual(event.pointValue + event.staffPointBonus);
+
+    const activityResponse = await userController.getCurrentUserActivityStream(user);
     expect(activityResponse.activity[1].type).toEqual(ActivityType.ATTEND_EVENT);
+
+    const staffActivityResponse = await userController.getCurrentUserActivityStream(staffUser);
     expect(staffActivityResponse.activity[1].type).toEqual(ActivityType.ATTEND_EVENT_AS_STAFF);
   });
 });