fixed version, changed food to foodItems

acmucsd · Oct 23, 2024 · 7722948 · 7722948
1 parent 8ab35b4
commit 7722948
Show file tree

Hide file tree

Showing 9 changed files with 19 additions and 19 deletions.
diff --git a/api/validators/EventControllerRequests.ts b/api/validators/EventControllerRequests.ts
@@ -37,7 +37,7 @@ export class OptionalEventProperties implements IOptionalEventProperties {
   googleCalendarEvent?: Uuid;
 
   @Allow()
-  food?: string;
+  foodItems?: string;
 }
 
 export class Event extends OptionalEventProperties implements IEvent {

diff --git a/migrations/0046-add-food-column.ts → migrations/0046-add-food-items-column.ts b/migrations/0046-add-food-column.ts → migrations/0046-add-food-items-column.ts
@@ -2,23 +2,23 @@ import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
 
 const TABLE_NAME = 'Events';
 
-export class AddFoodColumn1728959627663 implements MigrationInterface {
+export class AddFoodItemsColumn1728959627663 implements MigrationInterface {
   public async up(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.addColumns(TABLE_NAME, [
+    await queryRunner.addColumn(TABLE_NAME,
       new TableColumn({
-        name: 'food',
+        name: 'foodItems',
         type: 'varchar(255)',
         isNullable: true,
       }),
-    ]);
+    );
   }
 
   public async down(queryRunner: QueryRunner): Promise<void> {
-    await queryRunner.dropColumns(TABLE_NAME, [
+    await queryRunner.dropColumn(TABLE_NAME,
       new TableColumn({
-        name: 'food',
+        name: 'foodItems',
         type: 'varchar(255)',
       }),
-    ]);
+    );
   }
 }
diff --git a/models/EventModel.ts b/models/EventModel.ts
@@ -74,7 +74,7 @@ export class EventModel extends BaseEntity {
   googleCalendarEvent: Uuid;
 
   @Column('varchar', { nullable: true })
-  food: string;
+  foodItems: string;
 
   public getPublicEvent(canSeeAttendanceCode = false): PublicEvent {
     const publicEvent: PublicEvent = {
@@ -94,7 +94,7 @@ export class EventModel extends BaseEntity {
       staffPointBonus: this.staffPointBonus,
       discordEvent: this.discordEvent,
       googleCalendarEvent: this.googleCalendarEvent,
-      food: this.food,
+      foodItems: this.foodItems,
     };
     if (canSeeAttendanceCode) publicEvent.attendanceCode = this.attendanceCode;
     return publicEvent;

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@acmucsd/membership-portal",
-  "version": "3.6.3",
+  "version": "3.7.0",
   "description": "REST API for ACM UCSD's membership portal.",
   "main": "index.d.ts",
   "files": [

diff --git a/tests/Seeds.ts b/tests/Seeds.ts
@@ -209,7 +209,7 @@ async function seed(): Promise<void> {
     ...EventFactory.daysBefore(6),
     attendanceCode: 'galaxybrain',
     ...staffed,
-    food: 'Boba',
+    foodItems: 'Boba',
   });
   const PAST_HACK_WORKSHOP = EventFactory.fake({
     title: 'Hack: Intro to Rust',

diff --git a/tests/data/EventFactory.ts b/tests/data/EventFactory.ts
@@ -43,7 +43,7 @@ export class EventFactory {
       thumbnail: FactoryUtils.getRandomImageUrl(),
       discordEvent: faker.datatype.hexaDecimal(10),
       googleCalendarEvent: faker.datatype.hexaDecimal(10),
-      food: null,
+      foodItems: null,
     });
     return EventModel.merge(fake, substitute);
   }

diff --git a/tests/event.test.ts b/tests/event.test.ts
@@ -39,7 +39,7 @@ describe('event creation', () => {
       start: moment().subtract(2, 'hour').toDate(),
       end: moment().subtract(1, 'hour').toDate(),
       attendanceCode: 'p4rty',
-      food: 'Boba',
+      foodItems: 'Boba',
       pointValue: 10,
     };
 
@@ -58,7 +58,7 @@ describe('event creation', () => {
     expect(eventResponse.event.committee).toEqual(event.committee);
     expect(eventResponse.event.start).toEqual(event.start);
     expect(eventResponse.event.end).toEqual(event.end);
-    expect(eventResponse.event.food).toEqual(event.food);
+    expect(eventResponse.event.foodItems).toEqual(event.foodItems);
     expect(eventResponse.event.pointValue).toEqual(event.pointValue);
 
     // verifying response from event lookup
@@ -85,7 +85,7 @@ describe('event creation', () => {
       start: moment().subtract(2, 'hour').toDate(),
       end: moment().subtract(1, 'hour').toDate(),
       attendanceCode: 'p4rty',
-      food: '',
+      foodItems: '',
       pointValue: 10,
     };
 
@@ -117,7 +117,7 @@ describe('event creation', () => {
       start: moment().subtract(1, 'hour').toDate(),
       end: moment().subtract(2, 'hour').toDate(),
       attendanceCode: 'p4rty',
-      food: null,
+      foodItems: null,
       pointValue: 10,
     };
 

diff --git a/types/ApiRequests.ts b/types/ApiRequests.ts
@@ -157,7 +157,7 @@ export interface OptionalEventProperties {
   staffPointBonus?: number;
   discordEvent?: Uuid;
   googleCalendarEvent?: Uuid;
-  food?: string;
+  foodItems?: string;
 }
 
 export interface Event extends OptionalEventProperties {

diff --git a/types/ApiResponses.ts b/types/ApiResponses.ts
@@ -118,7 +118,7 @@ export interface PublicEvent {
   staffPointBonus: number;
   discordEvent: Uuid;
   googleCalendarEvent: Uuid;
-  food: string;
+  foodItems: string;
 }
 
 export interface GetPastEventsResponse extends ApiResponse {