Add linkedEvent column to OrderPickupEvent Table

api/validators/MerchStoreRequests.ts

@@ -11,6 +11,7 @@ import {
   ArrayNotEmpty,
   IsNumber,
   IsNumberString,
+  IsOptional,
 } from 'class-validator';
 import { Type } from 'class-transformer';
 import {
@@ -41,6 +42,7 @@ import {
   MerchOrderEdit as IMerchOrderEdit,
   OrderPickupEvent as IOrderPickupEvent,
   OrderPickupEventEdit as IOrderPickupEventEdit,
+  Uuid,
 } from '../../types';
 
 export class MerchCollection implements IMerchCollection {
@@ -258,6 +260,10 @@ export class OrderPickupEvent implements IOrderPickupEvent {
   @IsDefined()
   @Min(1)
   orderLimit: number;
+
+  @IsOptional()
+  @IsUUID()
+  linkedEventUuid?: Uuid;
 }
 
 export class OrderPickupEventEdit implements IOrderPickupEventEdit {
@@ -275,6 +281,9 @@ export class OrderPickupEventEdit implements IOrderPickupEventEdit {
 
   @Min(1)
   orderLimit?: number;
+
+  @IsUUID()
+  linkedEventUuid?: Uuid;
 }
 
 export class MerchOrderEdit implements IMerchOrderEdit {

migrations/0039-add-linkedEvent-column-to-orderPickupEvent-table.ts

@@ -0,0 +1,18 @@
+import { MigrationInterface, QueryRunner, TableColumn } from 'typeorm';
+
+const TABLE_NAME = 'OrderPickupEvents';
+const COLUMN_NAME = 'linkedEvent';
+
+export class AddLinkedEventColumnToOrderPickupEventTable1704352457840 implements MigrationInterface {
+  public async up(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.addColumn(TABLE_NAME, new TableColumn({
+      name: COLUMN_NAME,
+      type: 'uuid',
+      isNullable: true,
+    }));
+  }
+
+  public async down(queryRunner: QueryRunner): Promise<void> {
+    await queryRunner.dropColumn(TABLE_NAME, COLUMN_NAME);
+  }
+}

models/OrderPickupEventModel.ts

@@ -1,6 +1,7 @@
-import { Entity, BaseEntity, Column, PrimaryGeneratedColumn, JoinColumn, OneToMany } from 'typeorm';
+import { Entity, BaseEntity, Column, PrimaryGeneratedColumn, JoinColumn, OneToMany, OneToOne } from 'typeorm';
 import { Uuid, PublicOrderPickupEvent, OrderPickupEventStatus } from '../types';
 import { OrderModel } from './OrderModel';
+import { EventModel } from './EventModel';
 
 @Entity('OrderPickupEvents')
 export class OrderPickupEventModel extends BaseEntity {
@@ -29,6 +30,10 @@ export class OrderPickupEventModel extends BaseEntity {
   @JoinColumn({ name: 'order' })
   orders: OrderModel[];
 
+  @OneToOne((type) => EventModel, { nullable: true })
+  @JoinColumn({ name: 'linkedEvent' })
+  linkedEvent: EventModel;
+
   public getPublicOrderPickupEvent(canSeeOrders = false): PublicOrderPickupEvent {
     const pickupEvent: PublicOrderPickupEvent = {
       uuid: this.uuid,
@@ -38,6 +43,7 @@ export class OrderPickupEventModel extends BaseEntity {
       description: this.description,
       orderLimit: this.orderLimit,
       status: this.status,
+      linkedEvent: this.linkedEvent ? this.linkedEvent.getPublicEvent() : null,
     };
 
     if (canSeeOrders) pickupEvent.orders = this.orders.map((order) => order.getPublicOrderWithItems());

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@acmucsd/membership-portal",
-  "version": "3.0.0",
+  "version": "3.1.0",
   "description": "REST API for ACM UCSD's membership portal.",
   "main": "index.d.ts",
   "files": [

repositories/MerchOrderRepository.ts

@@ -130,7 +130,7 @@ export class OrderPickupEventRepository extends BaseRepository<OrderPickupEventM
    */
   public async getPastPickupEvents(): Promise<OrderPickupEventModel[]> {
     return this.getBaseFindManyQuery()
-      .where('"end" < :now')
+      .where('"orderPickupEvent"."end" < :now')
       .setParameter('now', new Date())
       .getMany();
   }
@@ -140,7 +140,7 @@ export class OrderPickupEventRepository extends BaseRepository<OrderPickupEventM
    */
   public async getFuturePickupEvents(): Promise<OrderPickupEventModel[]> {
     return this.getBaseFindManyQuery()
-      .where('"end" >= :now')
+      .where('"orderPickupEvent"."end" >= :now')
       .setParameter('now', new Date())
       .getMany();
   }
@@ -157,7 +157,7 @@ export class OrderPickupEventRepository extends BaseRepository<OrderPickupEventM
   }
 
   /**
-   * Make changes to a singke pickup event. Returns the pickup event edited.
+   * Make changes to a single pickup event. Returns the pickup event edited.
    */
   public async upsertPickupEvent(pickupEvent: OrderPickupEventModel, changes?: Partial<OrderPickupEventModel>):
   Promise<OrderPickupEventModel> {
@@ -177,13 +177,15 @@ export class OrderPickupEventRepository extends BaseRepository<OrderPickupEventM
       .leftJoinAndSelect('order.user', 'user')
       .leftJoinAndSelect('item.option', 'option')
       .leftJoinAndSelect('option.item', 'merchItem')
+      .leftJoinAndSelect('orderPickupEvent.linkedEvent', 'linkedEvent')
       .leftJoinAndSelect('merchItem.merchPhotos', 'merchPhotos');
   }
 
   private getBaseFindManyQuery(): SelectQueryBuilder<OrderPickupEventModel> {
     return this.repository
       .createQueryBuilder('orderPickupEvent')
       .leftJoinAndSelect('orderPickupEvent.orders', 'order')
-      .leftJoinAndSelect('order.user', 'user');
+      .leftJoinAndSelect('order.user', 'user')
+      .leftJoinAndSelect('orderPickupEvent.linkedEvent', 'linkedEvent');
   }
 }

services/MerchStoreService.ts

@@ -29,6 +29,7 @@ import {
 import { MerchandiseItemModel } from '../models/MerchandiseItemModel';
 import { OrderModel } from '../models/OrderModel';
 import { UserModel } from '../models/UserModel';
+import { EventModel } from '../models/EventModel';
 import Repositories, { TransactionsManager } from '../repositories';
 import { MerchandiseCollectionModel } from '../models/MerchandiseCollectionModel';
 import EmailService, { OrderInfo, OrderPickupEventInfo } from './EmailService';
@@ -1033,23 +1034,38 @@ export default class MerchStoreService {
   }
 
   public async createPickupEvent(pickupEvent: OrderPickupEvent): Promise<OrderPickupEventModel> {
-    if (pickupEvent.start >= pickupEvent.end) {
-      throw new UserError('Order pickup event start time must come before the end time');
-    }
-    const pickupEventModel = OrderPickupEventModel.create(pickupEvent);
-    if (MerchStoreService.isLessThanTwoDaysBeforePickupEvent(pickupEventModel)) {
-      throw new UserError('Cannot create a pickup event that starts in less than 2 days');
-    }
-    return this.transactions.readWrite(async (txn) => Repositories
-      .merchOrderPickupEvent(txn)
-      .upsertPickupEvent(pickupEventModel));
+    return this.transactions.readWrite(async (txn) => {
+      const orderPickupEventRepository = Repositories.merchOrderPickupEvent(txn);
+      if (pickupEvent.start >= pickupEvent.end) {
+        throw new UserError('Order pickup event start time must come before the end time');
+      }
+
+      const pickupEventModel = OrderPickupEventModel.create(pickupEvent);
+
+      if (pickupEvent.linkedEventUuid) {
+        const linkedRegularEvent = await this.getLinkedRegularEvent(pickupEvent.linkedEventUuid);
+        pickupEventModel.linkedEvent = linkedRegularEvent;
+      }
+
+      if (MerchStoreService.isLessThanTwoDaysBeforePickupEvent(pickupEventModel)) {
+        throw new UserError('Cannot create a pickup event that starts in less than 2 days');
+      }
+
+      return orderPickupEventRepository.upsertPickupEvent(pickupEventModel);
+    });
   }
 
   public async editPickupEvent(uuid: Uuid, changes: OrderPickupEventEdit): Promise<OrderPickupEventModel> {
     return this.transactions.readWrite(async (txn) => {
       const orderPickupEventRepository = Repositories.merchOrderPickupEvent(txn);
       const pickupEvent = await orderPickupEventRepository.findByUuid(uuid);
       const updatedPickupEvent = OrderPickupEventModel.merge(pickupEvent, changes);
+
+      if (changes.linkedEventUuid) {
+        const linkedRegularEvent = await this.getLinkedRegularEvent(changes.linkedEventUuid);
+        updatedPickupEvent.linkedEvent = linkedRegularEvent;
+      }
+
       if (updatedPickupEvent.start >= updatedPickupEvent.end) {
         throw new UserError('Order pickup event start time must come before the end time');
       }
@@ -1140,6 +1156,14 @@ export default class MerchStoreService {
     return pickupEvent.status === OrderPickupEventStatus.ACTIVE;
   }
 
+  private async getLinkedRegularEvent(uuid: Uuid): Promise<EventModel> {
+    return this.transactions.readOnly(async (txn) => {
+      const linkedEvent = await Repositories.event(txn).findByUuid(uuid);
+      if (!linkedEvent) throw new NotFoundError('Linked event not found!');
+      return linkedEvent;
+    });
+  }
+
   private isUnfulfilledOrder(order: OrderModel): boolean {
     return order.status !== OrderStatus.FULFILLED
     && order.status !== OrderStatus.PARTIALLY_FULFILLED

tests/data/EventFactory.ts

@@ -36,6 +36,11 @@ export class EventFactory {
       pointValue: EventFactory.randomPointValue(),
       requiresStaff: FactoryUtils.getRandomBoolean(),
       staffPointBonus: EventFactory.randomPointValue(),
+      committee: 'ACM',
+      cover: faker.internet.url(),
+      deleted: false,
+      eventLink: faker.internet.url(),
+      thumbnail: faker.internet.url(),
     });
     return EventModel.merge(fake, substitute);
   }

tests/data/MerchFactory.ts

@@ -110,6 +110,7 @@ export class MerchFactory {
       orderLimit: FactoryUtils.getRandomNumber(1, 5),
       status: OrderPickupEventStatus.ACTIVE,
       orders: [],
+      linkedEvent: null,
     });
     return OrderPickupEventModel.merge(fake, substitute);
   }

tests/merchOrder.test.ts

@@ -7,7 +7,7 @@ import { OrderModel } from '../models/OrderModel';
 import { OrderPickupEventModel } from '../models/OrderPickupEventModel';
 import { UserAccessType, OrderStatus, ActivityType, OrderPickupEventStatus } from '../types';
 import { ControllerFactory } from './controllers';
-import { DatabaseConnection, MerchFactory, PortalState, UserFactory } from './data';
+import { DatabaseConnection, EventFactory, MerchFactory, PortalState, UserFactory } from './data';
 import { MerchStoreControllerWrapper } from './controllers/MerchStoreControllerWrapper';
 import { UserModel } from '../models/UserModel';
 
@@ -962,10 +962,52 @@ describe('merch order pickup events', () => {
     const merchController = ControllerFactory.merchStore(conn, instance(emailService));
     await merchController.createPickupEvent({ pickupEvent }, merchDistributor);
 
-    const persistedPickupEvent = await conn.manager.findOne(OrderPickupEventModel, { relations: ['orders'] });
+    const persistedPickupEvent = await conn.manager.findOne(OrderPickupEventModel,
+      { relations: ['orders', 'linkedEvent'] });
     expect(persistedPickupEvent).toStrictEqual(pickupEvent);
   });
 
+  test('pickup events can be linked to normal events & edited', async () => {
+    const conn = await DatabaseConnection.get();
+    const merchDistributor = UserFactory.fake({ accessType: UserAccessType.MERCH_STORE_DISTRIBUTOR });
+    const admin = UserFactory.fake({ accessType: UserAccessType.ADMIN });
+    const linkedEvent = EventFactory.fake();
+    const eventController = ControllerFactory.event(conn);
+    await eventController.createEvent({ event: linkedEvent }, admin);
+
+    const pickupEvent = MerchFactory.fakeFutureOrderPickupEvent({ linkedEvent });
+
+    await new PortalState()
+      .createUsers(merchDistributor)
+      .write();
+
+    const emailService = mock(EmailService);
+    when(emailService.sendOrderConfirmation(anything(), anything(), anything()))
+      .thenResolve();
+
+    const createPickupEventRequest = { pickupEvent: { ...pickupEvent, linkedEventUuid: linkedEvent.uuid } };
+    const merchController = ControllerFactory.merchStore(conn, instance(emailService));
+    await merchController.createPickupEvent(createPickupEventRequest, merchDistributor);
+
+    const persistedPickupEvent = await conn.manager.findOne(OrderPickupEventModel,
+      { relations: ['orders', 'linkedEvent'] });
+    expect(persistedPickupEvent).toStrictEqual(pickupEvent);
+
+    // edit a linked event
+
+    const newLinkedEvent = EventFactory.fake();
+    await eventController.createEvent({ event: newLinkedEvent }, admin);
+
+    const editPickupEventRequest = { pickupEvent: { linkedEventUuid: newLinkedEvent.uuid } };
+    const params = { uuid: pickupEvent.uuid };
+    await merchController.editPickupEvent(params, editPickupEventRequest, merchDistributor);
+
+    const editedPersistedPickupEvent = await conn.manager.findOne(OrderPickupEventModel,
+      { relations: ['orders', 'linkedEvent'] });
+    expect(editedPersistedPickupEvent.uuid).toEqual(pickupEvent.uuid);
+    expect(editedPersistedPickupEvent.linkedEvent.uuid).toEqual(editPickupEventRequest.pickupEvent.linkedEventUuid);
+  });
+
   test('pickup event creation fails if start date is later than end date', async () => {
     const conn = await DatabaseConnection.get();
     const merchDistributor = UserFactory.fake({ accessType: UserAccessType.MERCH_STORE_DISTRIBUTOR });

types/ApiRequests.ts

@@ -308,6 +308,7 @@ export interface OrderPickupEvent {
   end: Date;
   description: string;
   orderLimit: number;
+  linkedEventUuid?: Uuid;
 }
 
 export interface OrderPickupEventEdit extends Partial<OrderPickupEvent> {}

types/ApiResponses.ts

@@ -410,6 +410,7 @@ export interface PublicOrderPickupEvent {
   orders?: PublicOrderWithItems[];
   orderLimit?: number;
   status: OrderPickupEventStatus;
+  linkedEvent?: PublicEvent;
 }
 
 export interface GetOrderPickupEventsResponse extends ApiResponse {