Requested Changes + New Lil Features by Yurika-Kan · Pull Request #200 · Code-4-Community/ssf

Yurika-Kan · 2026-06-27T20:15:24Z

ℹ️ Issue

SSF-236

📝 Description

Changes:

7/12

Pantry Management Unassign & Reassign Volunteers:

Admin unassigns a volunteer from a pantry --> all of that now unassigned volunteer's incomplete (IN PROGRESS & RECEIVED) orders get an empty assignee
Note: Delivered/closed orders keep their historical assignee
Admin assigns a new volunteer to the same pantry --> new volunteer inherits the empty assignee orders left

1 User Representative: M FMs

A user can be representatives for multiple FMs: the representative relationship became FM @manytoone (many manufacturers can share one rep)
A single login can back several manufacturers
Creating a donation now requires an explicit chosen (dropdown) & approved FM
Next donation creation modal opens with the previous chosen submitted FM in the dropdown
Donation list, dashboard stats, reminders all aggregate across every approved manufacturer this rep user represents

Admin Donation Stats Page wording:

Shipping Cost → Shipping/Delivery Expenses
Fair Market Value of Food Donation
% of Food Rescue → % Food Rescue
new column: Lbs Food Rescue
new column: Shipping Paid by SSF

Admin Donation Management

add label to donation if it is the initial donation of a recurring reminder
show upcoming reminder email date schedule

Updated Wording:

FM Confirm Delivery Action Modal - new boolean checkbox determines if shipping cost was paid by SSF

Admin Dashboard Applications Bug:

clicking a pending pantry application from the admin dashboard now opens the application details view instead of a pantry-management view keyed by the wrong id

FM Submit Donation Bug:

every FM donation submit 403'd because the @CheckOwnership guard read foodManufacturerId from the request body, but nothing ever sent it
frontend now sends foodManufacturerId on CreateDonationDto, the @CheckOwnership({ idParam: 'foodManufacturerId', idSource: 'body' })

Login & Sign up Page:

frontend adjustments to make the text more visible

Pantry/FM Application Form:

remove last checkbox: "By submitting this form, you agree to receive automated emails..."
auth gated GET /volunteers/:id/pantries to also allow ADMIN

✔️ Verification

wrote & ran tests
frontend tested pages

🏕️ (Optional) Future Work / Notes

Copilot

Copilot was unable to review this pull request because the user who requested the review has reached their quota limit.

Add a shippingCostPaidBySsf flag to orders (migration + entity + bulk tracking DTO) and surface it through manufacturer donation details and pantry stats. SSF-paid shipping is now excluded from totalShippingCost and reported separately as totalShippingCostPaidBySsf. Also adds the foodRescueLbs pantry stat. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Add foodManufacturerId to CreateDonationDto and pass it from the new donation and resubmit donation forms. Also tweaks the fair-market-value column header copy on the new donation form. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Display the recurring-reminders indicator and the list of upcoming reminder email dates for recurring donations in the donation details modal. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Route pending pantry applications to PANTRY_APPLICATION_DETAILS (keyed by applicationId) instead of PANTRY_MANAGEMENT_DETAILS, which expected a pantryId and was being given an application id. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Add Role.ADMIN to the /volunteers/:id/pantries endpoint so admins can read a volunteer's assigned pantries. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

dburkhart07

3 small things. also getting some errors with closed donations in the adminOrderManagement page i think. since theres a lot of changes here, can you merge main so that we can smoke test all these pages in full?

@roles

- Remove foodManufacturerId from CreateDonationDto and its create-endpoint CheckOwnership. donations.service.create resolves the manufacturer from the authenticated user (req.user.id), so the body id and the ownership check were dead weight; @roles(FOODMANUFACTURER) already gates it. Also collapses a duplicate @roles decorator on the create handler. - Drop foodManufacturerId from the frontend CreateDonationDto type and the new/resubmit donation forms and their container props. - Replace the read-only "Make Donation Recurring Reminders" checkbox in the donation details modal with a bold "Recurring Donation" label. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

# Conflicts: # apps/frontend/src/components/forms/donationDetailsModal.tsx # apps/frontend/src/components/forms/newDonationFormModal.tsx

Follows the DTO field removal so donations.service.spec compiles. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Prettier cleanup of the over-indented recurrence lines left behind by dropping foodManufacturerId from CreateDonationDto. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

dburkhart07

few things. see slack as well for other comments

A food-manufacturer representative was tied to a single manufacturer (findByUserId returned one arbitrary FM), so someone representing more than one couldn't donate for each and the approval check keyed off the wrong manufacturer. Backend: - Map foodManufacturerRepresentative as @manytoone so manufacturers can share a representative; approval reuses an existing Cognito-provisioned account by email instead of failing on the second approval. - POST /donations now requires foodManufacturerId, gated by CheckOwnership plus an approval check for that specific manufacturer. - Add GET /manufacturers/me (rep's approved manufacturers); aggregate donations, dashboard stats, and reminders across all of a rep's approved manufacturers. /manufacturers/my-id returns the lowest-id approved one. - Remove the now-unused findByUserId. Frontend: - Log-donation modal adds a manufacturer dropdown, defaulting to the most recent donation's manufacturer; resubmit targets the donation's own manufacturer; the donation list shows a manufacturer column when donations span more than one. Also widens two BulkUpdate/OrderSummary types to allow null, which code already on this branch depends on to typecheck. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

When a volunteer is removed from a pantry, their open (pending/shipped) orders for that pantry become unassigned; when a volunteer is added, that volunteer inherits the pantry's unassigned open orders. Delivered/closed orders keep their historical assignee. - Make orders.assignee_id nullable (migration + entity) - Unassign/inherit cascade in updatePantryVolunteers, wrapped in a transaction with the volunteer-save so it can't half-apply - Null-safe order reads, ownership resolver, and volunteer emails (fall back to SSF contact / skip when unassigned) - Frontend: render an Unassigned state on admin/pantry order tables and dashboards - Cascade tests in pantries.service.spec.ts Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Copilot

Pull request overview

Copilot reviewed 51 out of 51 changed files in this pull request and generated 3 comments.

+      {filteredDonations.length === 0 ? (
+        <PageEmptyState entity="donations" />
+      ) : (


+      {filteredRequests.length === 0 ? (
+        <PageEmptyState entity="food requests" />
+      ) : (


        totalDonatedFoodValue,
        totalShippingCost,
+        totalShippingCostPaidBySsf,
        totalValue: totalDonatedFoodValue + totalShippingCost,
        percentageFoodRescueItems:


dburkhart07

approving pending just some small comments

dburkhart07 · 2026-07-14T00:44:02Z

+        req.user.id,
+      );
+
+    const approved = manufacturers


for this, and the logic below, can we move this into the service function? maybe a new service function like findApprovedManufacturersByUserId, and just add that in there?

dburkhart07 · 2026-07-14T00:44:36Z

          pantryName: request.pantry.pantryName,
-          volunteerName: `${assignee.firstName} ${assignee.lastName}`,
-          volunteerEmail: assignee.email,
+          volunteerName: assignee


can we reuse the function you wrote in order.service.ts here?

dburkhart07 · 2026-07-14T00:50:17Z

-      const totalShippingCost = shippingMap.get(Number(row.pantryId)) ?? 0;
-      const totalFoodRescueItems = Number(row.totalFoodRescueItems);
+      const shipping = shippingMap.get(Number(row.pantryId));
+      const totalShippingCost = shipping?.totalShippingCost ?? 0;


confirming that totalShippingCost includes totalShippingCostPaidBySsf?

dburkhart07 · 2026-07-14T01:21:37Z

      return this.pantriesService.getDashboardStats(pantry.pantryId);
    } else if (user.role === Role.FOODMANUFACTURER) {
-      const foodManufacturer = await this.foodManufacturersService.findByUserId(
+      return this.foodManufacturersService.getDashboardStatsForRepresentative(


we should create a function like this for the pantry

dburkhart07 · 2026-07-14T02:00:32Z

      const dto: CreateDonationDto = {
+        // Resubmit under the original donation's manufacturer, since the list
+        // can span multiple manufacturers the representative belongs to.
+        foodManufacturerId:


why do we need this check? why cant we just use foodManufacturerId?

Yurika-Kan added 2 commits June 27, 2026 16:13

polished darker signup/login styling

84ef131

remove last question as requested

266be6b

Copilot AI review requested due to automatic review settings June 27, 2026 20:15

Copilot AI reviewed Jun 27, 2026

dburkhart07 approved these changes Jun 28, 2026

View reviewed changes

Yurika-Kan changed the title ~~Requested Small Changes~~ Requested Changes + New Lil Features Jun 28, 2026

dburkhart07 self-assigned this Jul 4, 2026

Yurika-Kan requested a review from Juwang110 July 4, 2026 22:55

Yurika-Kan and others added 6 commits July 4, 2026 18:57

Show recurring reminder schedule in donation details

41b21e7

Display the recurring-reminders indicator and the list of upcoming reminder email dates for recurring donations in the donation details modal. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Allow admins to fetch a volunteer's pantries

e750796

Add Role.ADMIN to the /volunteers/:id/pantries endpoint so admins can read a volunteer's assigned pantries. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

update email script

b621dd7

Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

Yurika-Kan force-pushed the yk/small-fixes branch from c735f05 to b621dd7 Compare July 4, 2026 22:59

Yurika-Kan requested a review from dburkhart07 July 4, 2026 23:03

fixed test

6d77404

dburkhart07 requested changes Jul 5, 2026

View reviewed changes

Comment thread apps/backend/src/donations/dtos/create-donation.dto.ts

Comment thread apps/backend/src/donations/dtos/create-donation.dto.ts

Comment thread apps/frontend/src/components/forms/donationDetailsModal.tsx Outdated

Yurika-Kan and others added 9 commits July 5, 2026 18:45

Merge remote-tracking branch 'origin/main' into yk/small-fixes

160f14d

# Conflicts: # apps/frontend/src/components/forms/donationDetailsModal.tsx # apps/frontend/src/components/forms/newDonationFormModal.tsx

Drop foodManufacturerId from donation create specs

feefaad

Follows the DTO field removal so donations.service.spec compiles. Co-Authored-By: Claude Opus 4.8 (1M context) <noreply@anthropic.com>

food request empty page

65c5335

Fix indentation in donation create specs

f431c67

Prettier cleanup of the over-indented recurrence lines left behind by dropping foodManufacturerId from CreateDonationDto. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

updated recurring donation reminder wording in donation details modal

75c6c62

new: empty state component for food request page

0c185ce

Merge branch 'main' into yk/small-fixes

db681d0

Merge branch 'main' into yk/small-fixes

2391f2d

Yurika-Kan requested a review from dburkhart07 July 6, 2026 23:20

dburkhart07 requested changes Jul 7, 2026

View reviewed changes

Comment thread apps/frontend/src/components/foodRequestManagement.tsx Outdated

Comment thread apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx

Comment thread apps/frontend/src/components/forms/fmCompleteRequiredActionsModal.tsx Outdated

Add empty-state to food request & donation management pages

5776d9e

updated shipping cost conditional render & complete action fields update

d495dd6

Juwang110 requested changes Jul 11, 2026

View reviewed changes

Comment thread apps/frontend/src/types/types.ts Outdated

Comment thread apps/frontend/src/containers/adminDonationStats.tsx Outdated

Comment thread apps/backend/src/emails/emailTemplates.ts Outdated

Yurika-Kan and others added 3 commits July 12, 2026 16:46

small things

7d70add

Yurika-Kan requested a review from dburkhart07 July 12, 2026 21:25

address justin's comments

570bbc2

Yurika-Kan requested review from Juwang110 and Copilot July 12, 2026 21:33

Copilot started reviewing on behalf of Yurika-Kan July 13, 2026 03:46 View session

Copilot AI reviewed Jul 13, 2026

View reviewed changes

dburkhart07 approved these changes Jul 14, 2026

View reviewed changes

Uh oh!

Conversation

Yurika-Kan commented Jun 27, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

ℹ️ Issue

📝 Description

✔️ Verification

🏕️ (Optional) Future Work / Notes

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Uh oh!

dburkhart07 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

dburkhart07 left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Copilot AI left a comment

Choose a reason for hiding this comment

Pull request overview

Uh oh!

dburkhart07 left a comment

Choose a reason for hiding this comment

Uh oh!

dburkhart07 Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

dburkhart07 Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

dburkhart07 Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

dburkhart07 Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

dburkhart07 Jul 14, 2026

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Yurika-Kan commented Jun 27, 2026 •

edited

Loading