migration out of date fix, more unit tests

Author: chpy04

src/backend/src/prisma/migrations/20260201001906_calendar/migration.sql

@@ -111,21 +111,21 @@ CREATE TABLE "public"."Event_Type" (
     "dateDeleted" TIMESTAMP(3),
     "userCreatedId" TEXT NOT NULL,
     "userDeletedId" TEXT,
-    "optionalMembers" BOOLEAN NOT NULL DEFAULT FALSE,
-    "requiredMembers" BOOLEAN NOT NULL DEFAULT FALSE,
-    "teams" BOOLEAN NOT NULL DEFAULT FALSE,
-    "teamType" BOOLEAN NOT NULL DEFAULT FALSE,
-    "location" BOOLEAN NOT NULL DEFAULT FALSE,
-    "zoomLink" BOOLEAN NOT NULL DEFAULT FALSE,
-    "shop" BOOLEAN NOT NULL DEFAULT FALSE,
-    "machinery" BOOLEAN NOT NULL DEFAULT FALSE,
-    "workPackage" BOOLEAN NOT NULL DEFAULT FALSE,
-    "questionDocument" BOOLEAN NOT NULL DEFAULT FALSE,
-    "documents" BOOLEAN NOT NULL DEFAULT FALSE, 
-    "description" BOOLEAN NOT NULL DEFAULT FALSE,
-    "onlyHeadsOrAboveForEventCreation" BOOLEAN NOT NULL DEFAULT FALSE,
-    "requiresConfirmation" BOOLEAN NOT NULL DEFAULT FALSE,
-    "sendSlackNotifications" BOOLEAN NOT NULL DEFAULT FALSE,
+    "optionalMembers" BOOLEAN NOT NULL,
+    "requiredMembers" BOOLEAN NOT NULL,
+    "teams" BOOLEAN NOT NULL,
+    "teamType" BOOLEAN NOT NULL,
+    "location" BOOLEAN NOT NULL,
+    "zoomLink" BOOLEAN NOT NULL,
+    "shop" BOOLEAN NOT NULL,
+    "machinery" BOOLEAN NOT NULL,
+    "workPackage" BOOLEAN NOT NULL,
+    "questionDocument" BOOLEAN NOT NULL,
+    "documents" BOOLEAN NOT NULL, 
+    "description" BOOLEAN NOT NULL,
+    "onlyHeadsOrAboveForEventCreation" BOOLEAN NOT NULL,
+    "requiresConfirmation" BOOLEAN NOT NULL,
+    "sendSlackNotifications" BOOLEAN NOT NULL,
     "organizationId" TEXT NOT NULL,
 
     CONSTRAINT "Event_Type_pkey" PRIMARY KEY ("eventTypeId")
@@ -345,7 +345,7 @@ ALTER TABLE "public"."Event_Type" ADD CONSTRAINT "Event_Type_userDeletedId_fkey"
 ALTER TABLE "public"."Event_Type" ADD CONSTRAINT "Event_Type_organizationId_fkey" FOREIGN KEY ("organizationId") REFERENCES "public"."Organization"("organizationId") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
-ALTER TABLE "public"."Schedule_Slot" ADD CONSTRAINT "Schedule_Slot_EventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("eventId") ON DELETE RESTRICT ON UPDATE CASCADE;
+ALTER TABLE "public"."Schedule_Slot" ADD CONSTRAINT "Schedule_Slot_eventId_fkey" FOREIGN KEY ("eventId") REFERENCES "Event"("eventId") ON DELETE RESTRICT ON UPDATE CASCADE;
 
 -- AddForeignKey
 ALTER TABLE "public"."_affiliatedTeam" ADD CONSTRAINT "_affiliatedTeam_A_fkey" FOREIGN KEY ("A") REFERENCES "public"."Event"("eventId") ON DELETE CASCADE ON UPDATE CASCADE;

src/backend/src/prisma/schema.prisma

@@ -975,7 +975,7 @@ model Manufacturer {
 
 model Shop {
   shopId         String           @id @default(uuid())
-  name           String           @unique
+  name           String
   dateCreated    DateTime         @default(now())
   dateDeleted    DateTime?
   userCreatedId  String

src/backend/src/services/calendar.services.ts

@@ -759,8 +759,6 @@ export default class CalendarService {
     const updatedRequiredMembers = getPrismaQueryUserIds(await getUsers(requiredMemberIds));
     const updatedOptionalMembers = getPrismaQueryUserIds(await getUsers(optionalMemberIds));
 
-    let newStatus = status;
-
     // Update the event with new data (excluding schedule slots)
     const updatedEvent = await prisma.event.update({
       where: { eventId },
@@ -777,7 +775,7 @@ export default class CalendarService {
           set: teamIds.map((teamId) => ({ teamId }))
         },
         ...(teamTypeId !== undefined && { teamTypeId }),
-        status: newStatus,
+        status,
         shops: {
           set: shopIds.map((shopId) => ({ shopId }))
         },
@@ -2471,7 +2469,7 @@ export default class CalendarService {
       }
     }
 
-    // filters for members/teams
+    // filters for members/teams - event must match at least one of these if provided
     const memberOrTeamFilter: any[] = [];
 
     if (memberIds?.length) {
@@ -2515,6 +2513,19 @@ export default class CalendarService {
           }
         : undefined;
 
+    // Build the AND conditions - member/team filters AND time filters
+    const andConditions: any[] = [];
+
+    // If member/team filters are provided, require at least one to match
+    if (memberOrTeamFilter.length > 0) {
+      andConditions.push({ OR: memberOrTeamFilter });
+    }
+
+    // If time filters are provided, require at least one to match
+    if (startPeriod || endPeriod) {
+      andConditions.push({ OR: scheduleSlotsOrDateScheduled });
+    }
+
     // get event using filter args
     const events = await prisma.event.findMany({
       where: {
@@ -2523,7 +2534,7 @@ export default class CalendarService {
         eventTypeId: eventTypeIds?.length ? { in: eventTypeIds } : undefined,
         approvalRequiredFromUserId: approvalIds?.length ? { in: approvalIds } : undefined,
         approved: statuses?.length ? { in: statuses } : undefined,
-        OR: memberOrTeamFilter.concat(scheduleSlotsOrDateScheduled),
+        AND: andConditions.length > 0 ? andConditions : undefined,
         ...fromCalendar
       },
       ...getEventQueryArgs(organization.organizationId),

src/backend/tests/test-utils.ts

@@ -18,7 +18,7 @@ import prisma from '../src/prisma/prisma.js';
 import { dbSeedAllUsers } from '../src/prisma/seed-data/users.seed.js';
 import TeamsService from '../src/services/teams.services.js';
 import ReimbursementRequestService from '../src/services/reimbursement-requests.services.js';
-import { DayOfWeek, Permission, RoleEnum, TaskPriority, TaskStatus } from 'shared';
+import { Permission, RoleEnum, TaskPriority, TaskStatus } from 'shared';
 import {
   batmanAppAdmin,
   batmanScheduleSettings,
@@ -167,6 +167,8 @@ export const resetUsers = async () => {
   await prisma.account_Code.deleteMany();
   await prisma.refund_Source.deleteMany();
   await prisma.index_Code.deleteMany();
+  await prisma.document.deleteMany();
+  await prisma.schedule_Slot.deleteMany();
   await prisma.event.deleteMany();
   await prisma.event_Type.deleteMany();
   await prisma.calendar.deleteMany();
@@ -613,19 +615,8 @@ export const createTestDesignReviewEvent = async () => {
     [], // shopIds
     [], // machineryIds
     [testWorkPackage.workPackageId], // workPackageIds
-    [
-      {
-        startTime: new Date('2027-03-25T10:00:00'),
-        endTime: new Date('2027-03-25T11:00:00'),
-        allDay: false
-      },
-      {
-        startTime: new Date('2027-03-25T11:00:00'),
-        endTime: new Date('2027-03-25T12:00:00'),
-        allDay: false
-      }
-    ], // scheduleSlot - two 1-hour time slots
-    undefined,
+    [], // scheduleSlots - empty for confirmation events
+    new Date('2027-03-25T10:00:00'), // initialDateScheduled - required for requiresConfirmation events
     teamType.teamTypeId, // team type id
     'https://docs.google.com/document/d/test-design-review-questions', // questionDocument
     'Campus Center Room 101', // location