Skip to content

SSF-135 - admin order management changes #121

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
swarkewalia wants to merge 5 commits into
base: main
Choose a base branch
from
+67 −44
Open

SSF-135 - admin order management changes #121

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2feb1c9
order mgmt changes
swarkewalia Mar 8, 2026
d2c8f74
fixed not null and updated db
swarkewalia Mar 14, 2026
62d20af
Merge branch 'main' of https://github.com/Code-4-Community/ssf into s…
swarkewalia Mar 14, 2026
bb59975
deleted unused
swarkewalia Mar 14, 2026
93da783
Merge branch 'main' into sk/SSF-149-admin-order-management-updates
swarkewalia Mar 14, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions apps/backend/src/config/migrations.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,7 @@ import { UpdateOrderEntity1769990652833 } from '../migrations/1769990652833-Upda
import { DonationItemFoodTypeNotNull1771524930613 } from '../migrations/1771524930613-DonationItemFoodTypeNotNull';
import { MoveRequestFieldsToOrders1770571145350 } from '../migrations/1770571145350-MoveRequestFieldsToOrders';
import { RenameDonationMatchingStatus1771260403657 } from '../migrations/1771260403657-RenameDonationMatchingStatus';
import { AddAssigneeToOrders1773009000618 } from '../migrations/1773009000618-AddAssigneeToOrders';
import { FixTrackingLinks1773041840374 } from '../migrations/1773041840374-FixTrackingLinks';
import { CleanupRequestsAndAllocations1771821377918 } from '../migrations/1771821377918-CleanupRequestsAndAllocations';

Expand Down Expand Up @@ -72,6 +73,7 @@ const schemaMigrations = [
DonationItemFoodTypeNotNull1771524930613,
MoveRequestFieldsToOrders1770571145350,
RenameDonationMatchingStatus1771260403657,
AddAssigneeToOrders1773009000618,
FixTrackingLinks1773041840374,
CleanupRequestsAndAllocations1771821377918,
];
Expand Down
14 changes: 9 additions & 5 deletions apps/backend/src/migrations/1768501812134-populateDummyData.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -492,7 +492,7 @@ export class PopulateDummyData1768501812134 implements MigrationInterface {
await queryRunner.query(`
INSERT INTO public.orders (
request_id, pantry_id, shipped_by, status, created_at,
shipped_at, delivered_at
shipped_at, delivered_at, assignee_id
Copy link

@Juwang110 Juwang110 Mar 16, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We should never be editing an existing migration checked into main, this should be done in your new migration.

As per Sam said: "Clarification on updating the dummy data for future database changes: this should be part of the new migration you are writing for the schema update! Existing migrations that are checked in to main should never be modified, and it would not be possible in a lot of cases to split out a database schema change and a data migration into two separate migrations even if you wanted to - e.g., if you were adding new required fields into a table, you wouldn't be able to wait until the next migration to add those fields to existing data - so any future database schema change should include dummy data updates as part of the same migration. This mirrors how migrations are often used in real apps - after the app is deployed to production, any database migration must not only update the database schema but also update all the existing user data that is already in the database to match the new schema!

(tldr: do not change the existing dummy data migration; update the data as part of the new migration you are writing :he_is_brighter:) (edited)"

) VALUES
(
(SELECT request_id FROM public.food_requests
Expand All @@ -504,7 +504,8 @@ export class PopulateDummyData1768501812134 implements MigrationInterface {
'delivered',
'2024-01-16 09:00:00',
'2024-01-17 08:00:00',
'2024-01-18 14:30:00'
'2024-01-18 14:30:00',
(SELECT user_id FROM public.users WHERE email = 'james.t@volunteer.org' LIMIT 1)
),
(
(SELECT request_id FROM public.food_requests
Expand All @@ -516,7 +517,8 @@ export class PopulateDummyData1768501812134 implements MigrationInterface {
'delivered',
'2024-01-21 10:00:00',
'2024-01-22 09:00:00',
'2024-01-23 10:00:00'
'2024-01-23 10:00:00',
(SELECT user_id FROM public.users WHERE email = 'maria.g@volunteer.org' LIMIT 1)
),
(
(SELECT request_id FROM public.food_requests
Expand All @@ -528,7 +530,8 @@ export class PopulateDummyData1768501812134 implements MigrationInterface {
'shipped',
'2024-02-02 11:00:00',
'2024-02-03 08:00:00',
NULL
NULL,
(SELECT user_id FROM public.users WHERE email = 'william.m@volunteer.org' LIMIT 1)
),
(
(SELECT request_id FROM public.food_requests
Expand All @@ -540,7 +543,8 @@ export class PopulateDummyData1768501812134 implements MigrationInterface {
'pending',
'2024-02-03 12:00:00',
NULL,
NULL
NULL,
(SELECT user_id FROM public.users WHERE email = 'patricia.j@volunteer.org' LIMIT 1)
)
`);

Expand Down
20 changes: 20 additions & 0 deletions apps/backend/src/migrations/1773009000618-AddAssigneeToOrders.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
import { MigrationInterface, QueryRunner } from 'typeorm';

export class AddAssigneeToOrders1773009000618 implements MigrationInterface {
public async up(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE orders
Copy link

@Juwang110 Juwang110 Mar 9, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Also here we can edit the dummy data to add ids for the asignee for each order

ADD COLUMN assignee_id INT NOT NULL,
ADD CONSTRAINT fk_assignee_id
FOREIGN KEY (assignee_id) REFERENCES users(user_id) ON DELETE SET NULL
Copy link
Collaborator

@Yurika-Kan Yurika-Kan Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'assignee_id INT NOT NULL' conflicts with 'ON DELETE SET NULL'

so let's make it a 'ON DELETE RESTRICT'

when assignee user is deleted, it will try to be set to null but column is not null so that will error

`);
Copy link
Collaborator

@Yurika-Kan Yurika-Kan Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

when you add dummy data, we'd have to add the assignee column as nullable, backfill by populating existing row values, then set assignee_id as not null and add the fk here!

}

public async down(queryRunner: QueryRunner): Promise<void> {
await queryRunner.query(`
ALTER TABLE orders
DROP CONSTRAINT IF EXISTS fk_assignee_id,
DROP COLUMN assignee_id
`);
}
}
8 changes: 8 additions & 0 deletions apps/backend/src/orders/order.entity.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { FoodRequest } from '../foodRequests/request.entity';
import { FoodManufacturer } from '../foodManufacturers/manufacturers.entity';
import { OrderStatus } from './types';
import { Allocation } from '../allocations/allocations.entity';
import { User } from '../users/users.entity';

@Entity('orders')
export class Order {
Expand Down Expand Up @@ -95,4 +96,11 @@ export class Order {
nullable: true,
})
shippingCost!: number | null;

@ManyToOne(() => User, { nullable: false })
@JoinColumn({ name: 'assignee_id', referencedColumnName: 'userId' })
Copy link
Collaborator

@Yurika-Kan Yurika-Kan Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

'userId' should just be 'id' to match the user entity field name

assignee!: User;

@Column({ name: 'assignee_id' })
assigneeId!: number;
}
12 changes: 6 additions & 6 deletions apps/backend/src/orders/order.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ export class OrdersService {
async getAll(filters?: { status?: string; pantryNames?: string[] }) {
const qb = this.repo
.createQueryBuilder('order')
.leftJoinAndSelect('order.request', 'request')
.leftJoinAndSelect('request.pantry', 'pantry')
.leftJoinAndSelect('pantry.volunteers', 'volunteers')
.leftJoin('order.request', 'request')
.leftJoin('request.pantry', 'pantry')
.leftJoin('order.assignee', 'assignee')
Copy link
Collaborator

@Yurika-Kan Yurika-Kan Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

let's keep the leftJoinAndSelect for these since we want to populate the columns in the returned entity

.select([
'order.orderId',
'order.status',
Expand All @@ -40,9 +40,9 @@ export class OrdersService {
'order.deliveredAt',
'request.pantryId',
'pantry.pantryName',
'volunteers.id',
'volunteers.firstName',
'volunteers.lastName',
'assignee.id',
'assignee.firstName',
'assignee.lastName',
]);

if (filters?.status) {
Expand Down
50 changes: 17 additions & 33 deletions apps/frontend/src/containers/adminOrderManagement.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -120,14 +120,6 @@ const AdminOrderManagement: React.FC = () => {
const status = order.status;

const orderWithColor: OrderWithColor = { ...order };
if (
order.request.pantry.volunteers &&
order.request.pantry.volunteers.length > 0
) {
orderWithColor.assigneeColor =
ASSIGNEE_COLORS[counters[status] % ASSIGNEE_COLORS.length];
counters[status]++;
}
grouped[status].push(orderWithColor);
}

Expand Down Expand Up @@ -613,7 +605,6 @@ const OrderStatusSection: React.FC<OrderStatusSectionProps> = ({
<Table.Body>
{orders.map((order, index) => {
const pantry = order.request.pantry;
const volunteers = pantry.volunteers || [];

return (
<Table.Row
Expand Down Expand Up @@ -670,26 +661,21 @@ const OrderStatusSection: React.FC<OrderStatusSectionProps> = ({
alignItems="center"
justifyContent="center"
>
{volunteers && volunteers.length > 0 ? (
<Box
key={index}
borderRadius="full"
bg={order.assigneeColor || 'gray'}
width="33px"
height="33px"
display="flex"
alignItems="center"
justifyContent="center"
color="white"
p={2}
>
{/* TODO: Change logic later to only get one volunteer */}
{volunteers[0].firstName.charAt(0).toUpperCase()}
{volunteers[0].lastName.charAt(0).toUpperCase()}
</Box>
) : (
<Box>No Assignees</Box>
)}
<Box
key={index}
borderRadius="full"
bg={order.assigneeColor || 'gray'}
width="33px"
height="33px"
display="flex"
alignItems="center"
justifyContent="center"
color="white"
p={2}
>
{order.assignee?.firstName.charAt(0).toUpperCase()}
Copy link
Collaborator

@Yurika-Kan Yurika-Kan Mar 18, 2026

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can remove the ? for first & last name since an order must have an assignee

{order.assignee?.lastName.charAt(0).toUpperCase()}
</Box>
</Box>
</Table.Cell>
<Table.Cell
Expand All @@ -712,10 +698,8 @@ const OrderStatusSection: React.FC<OrderStatusSectionProps> = ({
<Table.Cell
{...tableCellStyles}
textAlign="left"
color="neutral.700"
>
{/* TODO: IMPLEMENT WHAT GOES HERE */}
</Table.Cell>
bg="#FAFAFA"
></Table.Cell>
</Table.Row>
);
})}
Expand Down
5 changes: 5 additions & 0 deletions apps/frontend/src/types/types.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,6 +341,11 @@ export interface OrderSummary {
}[];
};
};
assignee: {
id: number;
firstName: string;
lastName: string;
};
}

export enum ApplicationStatus {
Expand Down
Loading