Skip to content

Commit 217eea1

Browse files
chpy04chpy04
committed
remove db.date
1 parent c8ef784 commit 217eea1

8 files changed

Lines changed: 34 additions & 60 deletions

File tree

‎src/backend/src/prisma/migrations/20260228000000_change_date_only_fields_to_db_date/migration.sql‎

Lines changed: 0 additions & 16 deletions
This file was deleted.

‎src/backend/src/prisma/schema.prisma‎

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -449,7 +449,7 @@ model Activation_CR {
449449
lead User @relation(name: "markAsLead", fields: [leadId], references: [userId])
450450
managerId String
451451
manager User @relation(name: "markAsManager", fields: [managerId], references: [userId])
452-
startDate DateTime @db.Date
452+
startDate DateTime
453453
confirmDetails Boolean
454454
455455
@@index([changeRequestId])
@@ -551,7 +551,7 @@ model Work_Package {
551551
projectId String
552552
project Project @relation(fields: [projectId], references: [projectId])
553553
orderInProject Int
554-
startDate DateTime @db.Date
554+
startDate DateTime
555555
duration Int
556556
blockedBy WBS_Element[] @relation(name: "blockedBy")
557557
stage Work_Package_Stage?
@@ -649,8 +649,8 @@ model Task {
649649
taskId String @id @default(uuid())
650650
title String
651651
notes String
652-
deadline DateTime? @db.Date
653-
startDate DateTime? @db.Date
652+
deadline DateTime?
653+
startDate DateTime?
654654
assignees User[] @relation(name: "assignedTo")
655655
priority Task_Priority
656656
status Task_Status
@@ -700,7 +700,7 @@ model Reimbursement_Request {
700700
saboId Int? @unique
701701
dateCreated DateTime @default(now())
702702
dateDeleted DateTime?
703-
dateOfExpense DateTime? @db.Date
703+
dateOfExpense DateTime?
704704
reimbursementStatuses Reimbursement_Status[]
705705
recipientId String
706706
recipient User @relation(name: "reimbursementRequestRecipient", fields: [recipientId], references: [userId])
@@ -711,7 +711,7 @@ model Reimbursement_Request {
711711
totalCost Int
712712
receiptPictures Receipt[]
713713
reimbursementProducts Reimbursement_Product[]
714-
dateDelivered DateTime? @db.Date
714+
dateDelivered DateTime?
715715
accountCodeId String
716716
accountCode Account_Code @relation(fields: [accountCodeId], references: [accountCodeId])
717717
organizationId String
@@ -803,7 +803,7 @@ model Sponsor {
803803
tier Sponsor_Tier @relation(fields: [sponsorTierId], references: [sponsorTierId])
804804
sponsorTierId String
805805
sponsorValue Int
806-
joinDate DateTime @db.Date
806+
joinDate DateTime
807807
discountCode String?
808808
activeYears Int[]
809809
taxExempt Boolean
@@ -818,8 +818,8 @@ model Sponsor {
818818

819819
model Sponsor_Task {
820820
sponsorTaskId String @id @default(uuid())
821-
dueDate DateTime @db.Date
822-
notifyDate DateTime? @db.Date
821+
dueDate DateTime
822+
notifyDate DateTime?
823823
assignee User? @relation(fields: [assigneeUserId], references: [userId], name: "assignedSponsorTasks")
824824
assigneeUserId String?
825825
notes String
@@ -1173,8 +1173,7 @@ model Availability {
11731173
11741174
// Availibilies are integers between 0 and 11 from 10am - 10pm for a given day at hour intervals see meetingTime field in Design_Review
11751175
availability Int[]
1176-
dateSet DateTime @db.Date
1177-
1176+
dateSet DateTime
11781177
@@index([scheduleSettingsId])
11791178
}
11801179

@@ -1229,7 +1228,7 @@ model Project_Proposed_Changes {
12291228

12301229
model Work_Package_Proposed_Changes {
12311230
workPackageProposedChangesId String @id @default(uuid())
1232-
startDate DateTime @db.Date
1231+
startDate DateTime
12331232
duration Int
12341233
blockedBy WBS_Element[] @relation(name: "proposedBlockedBy")
12351234
stage Work_Package_Stage?
@@ -1383,7 +1382,7 @@ model FrequentlyAskedQuestion {
13831382
model Milestone {
13841383
milestoneId String @id @default(uuid())
13851384
name String
1386-
dateOfEvent DateTime @db.Date
1385+
dateOfEvent DateTime
13871386
description String
13881387
userCreated User @relation(fields: [userCreatedId], references: [userId], name: "milestoneCreator")
13891388
userCreatedId String
@@ -1399,8 +1398,8 @@ model Milestone {
13991398

14001399
model Graph {
14011400
id String @id @default(uuid())
1402-
startDate DateTime? @db.Date
1403-
endDate DateTime? @db.Date
1401+
startDate DateTime?
1402+
endDate DateTime?
14041403
title String
14051404
graphType Graph_Type
14061405
displayGraphType Graph_Display_Type

‎src/backend/tests/unit/finance.test.ts‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -67,7 +67,7 @@ describe('Finance Tests', () => {
6767
expect(result.name).toEqual('Google');
6868
expect(result.activeStatus).toBe(true);
6969
expect(result.sponsorValue).toBe(5000);
70-
expect(result.joinDate).toEqual(new Date(Date.UTC(12, 1, 24)));
70+
expect(result.joinDate).toEqual(new Date(12, 1, 24));
7171
expect(result.activeYears).toEqual([2024, 2025]);
7272
expect(result.tier.sponsorTierId).toEqual(sponsorTierId);
7373
expect(result.taxExempt).toBe(true);
@@ -228,8 +228,8 @@ describe('Finance Tests', () => {
228228
);
229229

230230
expect(newSponsorTask.notes).toEqual('newNotes');
231-
expect(newSponsorTask.dueDate).toEqual(new Date(Date.UTC(12, 10, 24)));
232-
expect(newSponsorTask.notifyDate).toEqual(new Date(Date.UTC(12, 20, 24)));
231+
expect(newSponsorTask.dueDate).toEqual(new Date(12, 10, 24));
232+
expect(newSponsorTask.notifyDate).toEqual(new Date(12, 20, 24));
233233
expect(newSponsorTask.assigneeUserId).toEqual(user.userId);
234234
});
235235
it('Edit fails with non head user trying to edit', async () => {
@@ -459,7 +459,7 @@ describe('Finance Tests', () => {
459459

460460
expect(result.assignee?.userId).toEqual(user.userId);
461461
expect(result.notes).toEqual('hello notes');
462-
expect(result.dueDate).toEqual(new Date(Date.UTC(1, 2, 3)));
462+
expect(result.dueDate).toEqual(new Date(1, 2, 3));
463463
expect(result.assignee?.userId).toEqual(user.userId);
464464
});
465465
});
@@ -529,7 +529,7 @@ describe('Finance Tests', () => {
529529
expect(updatedSponsor.name).toBe('newName');
530530
expect(updatedSponsor.activeStatus).toBe(false);
531531
expect(updatedSponsor.sponsorValue).toBe(4000);
532-
expect(updatedSponsor.joinDate).toEqual(new Date(Date.UTC(5, 11, 25)));
532+
expect(updatedSponsor.joinDate).toEqual(new Date(5, 11, 25));
533533
expect(updatedSponsor.activeYears).toEqual([2024, 2025]);
534534
expect(updatedSponsor.tier.sponsorTierId).toBe(sponsorTierId);
535535
expect(updatedSponsor.sponsorContact).toBe('New Vendor Contact');

‎src/backend/tests/unit/recruitment.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe('Recruitment Tests', () => {
121121

122122
expect(result.name).toEqual('name');
123123
expect(result.description).toEqual('description');
124-
expect(result.dateOfEvent).toEqual(new Date('2024-11-12'));
124+
expect(result.dateOfEvent).toEqual(new Date('11/12/24'));
125125
});
126126
});
127127

@@ -202,7 +202,7 @@ describe('Recruitment Tests', () => {
202202

203203
expect(updatedMilestone.name).toEqual('new name');
204204
expect(updatedMilestone.description).toEqual('new description');
205-
expect(updatedMilestone.dateOfEvent).toEqual(new Date('2024-11-14'));
205+
expect(updatedMilestone.dateOfEvent).toEqual(new Date('11/14/24'));
206206
});
207207
});
208208

‎src/backend/tests/unit/reimbursement-requests.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -182,7 +182,7 @@ describe('Reimbursement Requests', () => {
182182
expect(rr.indexCode.name).toEqual('CASH');
183183
expect(rr.vendor.vendorId).toEqual(createdVendor.vendorId);
184184
expect(rr.recipient.userId).toEqual(createdUser.userId);
185-
expect(rr.dateOfExpense).toEqual(new Date('2023-12-29'));
185+
expect(rr.dateOfExpense).toEqual(new Date('12-29-2023'));
186186
expect(rr.reimbursementProducts).toHaveLength(1);
187187
expect(rr.reimbursementProducts[0].name).toEqual('GLUE');
188188
expect(rr.reimbursementProducts[0].cost).toEqual(200000);
@@ -267,11 +267,7 @@ describe('Reimbursement Requests', () => {
267267
dateToSetAsDelivered
268268
);
269269

270-
// @db.Date strips time component, so compare date portion only
271-
const expectedDate = new Date(
272-
Date.UTC(dateToSetAsDelivered.getFullYear(), dateToSetAsDelivered.getMonth(), dateToSetAsDelivered.getDate())
273-
);
274-
expect(updatedRR.dateDelivered).toEqual(expectedDate);
270+
expect(updatedRR.dateDelivered).toEqual(dateToSetAsDelivered);
275271
});
276272
});
277273

‎src/backend/tests/unmocked/recruitment.test.ts‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -121,7 +121,7 @@ describe('Recruitment Tests', () => {
121121

122122
expect(result.name).toEqual('name');
123123
expect(result.description).toEqual('description');
124-
expect(result.dateOfEvent).toEqual(new Date('2024-11-12'));
124+
expect(result.dateOfEvent).toEqual(new Date('11/12/24'));
125125
});
126126
});
127127

@@ -202,7 +202,7 @@ describe('Recruitment Tests', () => {
202202

203203
expect(updatedMilestone.name).toEqual('new name');
204204
expect(updatedMilestone.description).toEqual('new description');
205-
expect(updatedMilestone.dateOfEvent).toEqual(new Date('2024-11-14'));
205+
expect(updatedMilestone.dateOfEvent).toEqual(new Date('11/14/24'));
206206
});
207207
});
208208

‎src/backend/tests/unmocked/reimbursement-requests.test.ts‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ describe('Reimbursement Requests', () => {
193193
expect(rr.indexCode.name).toEqual('CASH');
194194
expect(rr.vendor.vendorId).toEqual(createdVendor.vendorId);
195195
expect(rr.recipient.userId).toEqual(createdUser.userId);
196-
expect(rr.dateOfExpense).toEqual(new Date('2023-12-29'));
196+
expect(rr.dateOfExpense).toEqual(new Date('12-29-2023'));
197197
expect(rr.reimbursementProducts).toHaveLength(1);
198198
expect(rr.reimbursementProducts[0].name).toEqual('GLUE');
199199
expect(rr.reimbursementProducts[0].cost).toEqual(200000);
@@ -274,11 +274,7 @@ describe('Reimbursement Requests', () => {
274274
dateToSetAsDelivered
275275
);
276276

277-
// @db.Date strips time component, so compare date portion only
278-
const expectedDate = new Date(
279-
Date.UTC(dateToSetAsDelivered.getFullYear(), dateToSetAsDelivered.getMonth(), dateToSetAsDelivered.getDate())
280-
);
281-
expect(updatedRR.dateDelivered).toEqual(expectedDate);
277+
expect(updatedRR.dateDelivered).toEqual(dateToSetAsDelivered);
282278
});
283279
});
284280

‎src/backend/tests/unmocked/statistics.test.ts‎

Lines changed: 7 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -152,9 +152,8 @@ describe('Statistics Tests', () => {
152152
graphDisplayType: 'PIE',
153153
measure: Measure.AVG
154154
});
155-
expect(result.startDate).toStrictEqual(new Date('1970-12-12'));
156-
// @db.Date stores only date portion, so endDate becomes 2024-12-12 midnight UTC
157-
expect(result.endDate).toStrictEqual(new Date('2024-12-12'));
155+
expect(result.startDate).toStrictEqual(new Date('12/12/1970'));
156+
expect(result.endDate?.getTime()).toBeGreaterThan(new Date('12/12/2024').getTime());
158157

159158
expect(result.graphData).toStrictEqual([
160159
{
@@ -195,7 +194,7 @@ describe('Statistics Tests', () => {
195194
graphDisplayType: 'BAR',
196195
measure: Measure.SUM
197196
});
198-
expect(result.startDate).toStrictEqual(new Date('1970-12-12'));
197+
expect(result.startDate).toStrictEqual(new Date('12/12/1970'));
199198
expect(result.endDate?.getTime()).toBeGreaterThan(new Date('12/12/2024').getTime());
200199

201200
expect(result.graphData).toStrictEqual([
@@ -277,8 +276,8 @@ describe('Statistics Tests', () => {
277276
graphDisplayType: 'BAR',
278277
measure: Measure.SUM
279278
});
280-
expect(result.startDate).toStrictEqual(new Date('1970-12-12'));
281-
expect(result.endDate).toStrictEqual(new Date('1971-12-12'));
279+
expect(result.startDate).toStrictEqual(new Date('12/12/1970'));
280+
expect(result.endDate).toStrictEqual(new Date('12/12/1971'));
282281

283282
expect(result.graphData).toStrictEqual([
284283
{
@@ -460,8 +459,8 @@ describe('Statistics Tests', () => {
460459

461460
describe('Edit Graph', () => {
462461
it('Edit graph correctly updates startDate, endDate, title, and graphType', async () => {
463-
const updatedStartDate = new Date('2024-12-13');
464-
const updatedEndDate = new Date('2024-12-14');
462+
const updatedStartDate = new Date('12/13/2024');
463+
const updatedEndDate = new Date(updatedStartDate.getTime() + 10000);
465464
const updatedTitle = 'Updated Graph';
466465
const updatedGraphType = Graph_Type.PROJECT_BUDGET_BY_PROJECT;
467466
const updatedMeasure = Measure.AVG;

0 commit comments

Comments
 (0)