fixed checkboxes

Author: walker-sean

src/backend/src/prisma/seed.ts

@@ -3053,10 +3053,10 @@ const performSeed: () => Promise<void> = async () => {
     thomasEmrax,
     ner,
     daysFromNow(30),
-    'notes...',
+    'Send Google mid-year impact report with project highlights',
     sponsor.sponsorId,
-    daysAgo(60),
-    thomasEmrax.userId
+    daysFromNow(20),
+    superman.userId
   );
 
   const altiumSponsor = await FinanceServices.createSponsor(
@@ -3242,7 +3242,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 14,
       status: 'IN_PROGRESS',
       firstContactMethod: 'OUTBOUND_EMAIL',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: lexLuther.userId,
       contactId: prospectiveContact1.sponsorContactId,
       notes: 'Reached out about potential parts sponsorship for battery systems'
     }
@@ -3256,7 +3256,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 10,
       status: 'NO_RESPONSE',
       firstContactMethod: 'OUTBOUND_EMAIL',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: wonderwoman.userId,
       contactId: prospectiveContact2.sponsorContactId,
       notes: 'Sent initial sponsorship proposal, no reply yet'
     }
@@ -3270,7 +3270,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 7,
       status: 'IN_PROGRESS',
       firstContactMethod: 'INBOUND_EMAIL',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: flash.userId,
       contactId: prospectiveContact3.sponsorContactId,
       notes: 'They reached out offering software licenses for the team'
     }
@@ -3284,7 +3284,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 10,
       status: 'IN_PROGRESS',
       firstContactMethod: 'INBOUND_FORM',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: aquaman.userId,
       contactId: prospectiveContact4.sponsorContactId,
       notes: 'Filled out our sponsorship interest form, interested in providing microcontrollers and dev boards'
     }
@@ -3312,7 +3312,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 10,
       status: 'IN_PROGRESS',
       firstContactMethod: 'OTHER',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: batman.userId,
       contactId: prospectiveContact6.sponsorContactId,
       notes: 'Met at local manufacturing expo, interested in providing machining services at reduced cost'
     }
@@ -3326,7 +3326,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 14,
       status: 'DECLINED',
       firstContactMethod: 'OUTBOUND_EMAIL',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: superman.userId,
       contactId: prospectiveContact7.sponsorContactId,
       notes: 'Declined for this year, suggested we reapply next fiscal year in September'
     }
@@ -3340,7 +3340,7 @@ const performSeed: () => Promise<void> = async () => {
       highlightThresholdDays: 7,
       status: 'IN_PROGRESS',
       firstContactMethod: 'INBOUND_EMAIL',
-      contactorUserId: thomasEmrax.userId,
+      contactorUserId: lexLuther.userId,
       contactId: prospectiveContact8.sponsorContactId,
       notes: 'Interested in providing MATLAB/Simulink licenses, scheduling a call next week'
     }
@@ -3363,7 +3363,8 @@ const performSeed: () => Promise<void> = async () => {
     daysFromNow(60),
     'Send McMaster-Carr updated parts list for spring semester',
     mcmasterSponsor.sponsorId,
-    daysFromNow(45)
+    daysFromNow(45),
+    lexLuther.userId
   );
 
   await FinanceServices.createSponsorTask(
@@ -3373,7 +3374,7 @@ const performSeed: () => Promise<void> = async () => {
     'Submit Bose quarterly progress report',
     boseSponsor.sponsorId,
     daysAgo(10),
-    thomasEmrax.userId
+    wonderwoman.userId
   );
 
   await FinanceServices.createSponsorTask(
@@ -3383,15 +3384,17 @@ const performSeed: () => Promise<void> = async () => {
     'Prepare annual sponsorship renewal presentation for NEU COE',
     neuSponsor.sponsorId,
     daysFromNow(60),
-    thomasEmrax.userId
+    batman.userId
   );
 
   await FinanceServices.createSponsorTask(
     thomasEmrax,
     ner,
     daysFromNow(7),
     'Send thank-you letter and team photo to Bose',
-    boseSponsor.sponsorId
+    boseSponsor.sponsorId,
+    undefined,
+    aquaman.userId
   );
 
   // Prospective sponsor tasks
@@ -3401,7 +3404,7 @@ const performSeed: () => Promise<void> = async () => {
       notes: 'Follow up email with Tesla partnership proposal PDF',
       prospectiveSponsorId: teslaProsSpons.prospectiveSponsorId,
       notifyDate: daysFromNow(1),
-      assigneeUserId: thomasEmrax.userId
+      assigneeUserId: lexLuther.userId
     }
   });
 
@@ -3410,7 +3413,7 @@ const performSeed: () => Promise<void> = async () => {
       dueDate: daysFromNow(10),
       notes: 'Schedule demo call with SolidWorks academic team',
       prospectiveSponsorId: solidworksProsSpons.prospectiveSponsorId,
-      assigneeUserId: thomasEmrax.userId
+      assigneeUserId: flash.userId
     }
   });
 
@@ -3420,7 +3423,7 @@ const performSeed: () => Promise<void> = async () => {
       notes: 'Send TI the team roster for university program enrollment',
       prospectiveSponsorId: tiProsSpons.prospectiveSponsorId,
       notifyDate: daysAgo(5),
-      assigneeUserId: thomasEmrax.userId,
+      assigneeUserId: aquaman.userId,
       done: true
     }
   });
@@ -3430,7 +3433,8 @@ const performSeed: () => Promise<void> = async () => {
       dueDate: daysFromNow(5),
       notes: 'Prepare MathWorks sponsorship tier options document',
       prospectiveSponsorId: mathworksProsSpons.prospectiveSponsorId,
-      notifyDate: daysFromNow(2)
+      notifyDate: daysFromNow(2),
+      assigneeUserId: lexLuther.userId
     }
   });
 
@@ -3439,7 +3443,7 @@ const performSeed: () => Promise<void> = async () => {
       dueDate: daysFromNow(14),
       notes: 'Draft MATLAB workshop proposal to show value of partnership',
       prospectiveSponsorId: mathworksProsSpons.prospectiveSponsorId,
-      assigneeUserId: thomasEmrax.userId
+      assigneeUserId: wonderwoman.userId
     }
   });
 

src/backend/src/services/prospective-sponsor.services.ts

@@ -407,17 +407,19 @@ export default class ProspectiveSponsorServices {
     stockDescription?: string,
     discountDescription?: string
   ): Promise<ProspectiveSponsor> {
-    if (!(await userHasPermission(submitter.userId, organization.organizationId, isHead))) {
-      throw new AccessDeniedException('Only heads can accept prospective sponsors');
-    }
-
     const prospectiveSponsor = await prisma.prospective_Sponsor.findUnique({
       where: { prospectiveSponsorId, organizationId: organization.organizationId },
       include: { contact: true }
     });
 
     if (!prospectiveSponsor) throw new NotFoundException('ProspectiveSponsor', prospectiveSponsorId);
     if (prospectiveSponsor.dateDeleted) throw new DeletedException('ProspectiveSponsor', prospectiveSponsorId);
+
+    const isContactor = prospectiveSponsor.contactorUserId === submitter.userId;
+    const isUserHead = await userHasPermission(submitter.userId, organization.organizationId, isHead);
+    if (!isUserHead && !isContactor) {
+      throw new AccessDeniedException('Only heads or the assigned contactor can accept prospective sponsors');
+    }
     if (prospectiveSponsor.status === Prospective_Sponsor_Status.ACCEPTED) {
       throw new HttpException(400, 'This prospective sponsor has already been accepted');
     }

src/backend/tests/unit/prospective-sponsor.test.ts

@@ -891,7 +891,7 @@ describe('Prospective Sponsor Tests', () => {
   });
 
   describe('Accept Prospective Sponsor', () => {
-    it('Fails if user is not a head', async () => {
+    it('Fails if user is not a head or contactor', async () => {
       const head = await createTestUser(batmanAppAdmin, orgId);
       const guest = await createTestUser(wonderwomanGuest, orgId);
 
@@ -920,7 +920,44 @@ describe('Prospective Sponsor Tests', () => {
           false,
           5000
         )
-      ).rejects.toThrow(new AccessDeniedException('Only heads can accept prospective sponsors'));
+      ).rejects.toThrow(new AccessDeniedException('Only heads or the assigned contactor can accept prospective sponsors'));
+    });
+
+    it('Succeeds when the contactor accepts', async () => {
+      const head = await createTestUser(batmanAppAdmin, orgId);
+      const contactor = await createTestUser(wonderwomanGuest, orgId);
+      const joinDate = new Date(2024, 6, 1);
+
+      const ps = await ProspectiveSponsorServices.createProspectiveSponsor(
+        head,
+        organization,
+        'Contactor Accept Corp',
+        ProspectiveSponsorStatus.IN_PROGRESS,
+        new Date(),
+        FirstContactMethod.INBOUND_EMAIL,
+        'Jane Smith',
+        contactor.userId,
+        undefined,
+        'jane@contactorcorp.com'
+      );
+
+      const result = await ProspectiveSponsorServices.acceptProspectiveSponsor(
+        contactor,
+        organization,
+        ps.prospectiveSponsorId,
+        undefined,
+        ['MONETARY'],
+        joinDate,
+        [2024],
+        false,
+        3000
+      );
+
+      expect(result.status).toBe(ProspectiveSponsorStatus.ACCEPTED);
+      const sponsors = await FinanceServices.getAllSponsors(organization);
+      const createdSponsor = sponsors.find((s) => s.name === 'Contactor Accept Corp');
+      expect(createdSponsor).toBeDefined();
+      expect(createdSponsor!.sponsorValue).toBe(3000);
     });
 
     it('Fails if prospective sponsor does not exist', async () => {

src/frontend/src/pages/FinancePage/FinanceComponents/SponsorTasksModal.tsx

@@ -22,7 +22,7 @@ const taskSchema = yup.object().shape({
   sponsorTaskId: yup.string().optional(),
   dueDate: yup.date().required('Due date is required'),
   notifyDate: yup.date().nullable().optional(),
-  assignee: yup.string().nullable().optional(),
+  assigneeUserId: yup.string().nullable().optional(),
   notes: yup.string().required('Notes is required'),
   done: yup.boolean().optional()
 });
@@ -57,7 +57,7 @@ const SponsorTasksModal: React.FC<SponsorTasksModalProps> = ({ onClose, tasks: s
         sponsorTaskId: task.sponsorTaskId,
         dueDate: task.dueDate ? new Date(task.dueDate) : new Date(),
         notifyDate: task.notifyDate ? new Date(task.notifyDate) : undefined,
-        assignee: task.assignee?.userId || '',
+        assigneeUserId: task.assignee?.userId || '',
         notes: task.notes || '',
         done: task.done || false
       }));
@@ -79,7 +79,7 @@ const SponsorTasksModal: React.FC<SponsorTasksModalProps> = ({ onClose, tasks: s
       const payload = {
         dueDate: task.dueDate,
         notifyDate: task.notifyDate || undefined,
-        assigneeUserId: task.assignee || undefined,
+        assigneeUserId: task.assigneeUserId || undefined,
         notes: task.notes,
         done: task.done ?? false
       };
@@ -134,7 +134,7 @@ const SponsorTasksModal: React.FC<SponsorTasksModalProps> = ({ onClose, tasks: s
           append({
             dueDate: new Date(),
             notifyDate: undefined,
-            assignee: '',
+            assigneeUserId: '',
             notes: '',
             sponsorTaskId: undefined,
             done: false

src/frontend/src/pages/FinancePage/SponsorsTable.tsx

@@ -52,6 +52,35 @@ const SponsorsTable = () => {
     setIsTasksModalOpen(false);
   };
 
+  const sponsorToInlinePayload = (sponsor: Sponsor, overrides: Partial<Sponsor>) => ({
+    sponsorId: sponsor.sponsorId,
+    name: sponsor.name,
+    activeStatus: sponsor.activeStatus,
+    valueTypes: sponsor.valueTypes,
+    sponsorValue: sponsor.sponsorValue,
+    joinDate: sponsor.joinDate,
+    activeYears: sponsor.activeYears,
+    sponsorTierId: sponsor.tier?.sponsorTierId,
+    taxExempt: sponsor.taxExempt,
+    contactName: sponsor.contact.name,
+    contactEmail: sponsor.contact.email,
+    contactPhone: sponsor.contact.phone,
+    contactPosition: sponsor.contact.position,
+    sponsorTasks: sponsor.sponsorTasks.map((t) => ({
+      sponsorTaskId: t.sponsorTaskId,
+      dueDate: t.dueDate,
+      notifyDate: t.notifyDate,
+      assigneeUserId: t.assignee?.userId,
+      notes: t.notes,
+      done: t.done
+    })),
+    discountCode: sponsor.discountCode,
+    sponsorNotes: sponsor.sponsorNotes,
+    stockDescription: sponsor.stockDescription,
+    discountDescription: sponsor.discountDescription,
+    ...overrides
+  });
+
   const columns = [
     { field: 'name', headerName: 'Sponsor', flex: 1, minWidth: 50 },
     {
@@ -66,10 +95,9 @@ const SponsorsTable = () => {
           checked={!!p.value}
           onClick={async (e: MouseEvent<HTMLElement>) => {
             e.stopPropagation();
-            await editSponsorMutateAsync({
-              ...(p.row as MapRowResult<Sponsor>).raw,
-              activeStatus: !p.value
-            } as unknown as Parameters<typeof editSponsorMutateAsync>[0]);
+            const sponsor = (p.row as MapRowResult<Sponsor>).raw;
+            if (!sponsor) return;
+            await editSponsorMutateAsync(sponsorToInlinePayload(sponsor, { activeStatus: !p.value }));
           }}
         />
       )
@@ -151,10 +179,9 @@ const SponsorsTable = () => {
             checked={!!p.value}
             onClick={(e: MouseEvent<HTMLElement>) => {
               e.stopPropagation();
-              editSponsorMutateAsync({
-                ...(p.row as MapRowResult<Sponsor>).raw,
-                taxExempt: !p.value
-              } as unknown as Parameters<typeof editSponsorMutateAsync>[0]);
+              const sponsor = (p.row as MapRowResult<Sponsor>).raw;
+              if (!sponsor) return;
+              editSponsorMutateAsync(sponsorToInlinePayload(sponsor, { taxExempt: !p.value }));
             }}
           />
         );