Skip to content

Commit 36dc983

Browse files
authored
Merge pull request #1336 from Northeastern-Electric-Racing/HotFix
hotfix
2 parents 7e09521 + c79b9b2 commit 36dc983

2 files changed

Lines changed: 4 additions & 26 deletions

File tree

src/backend/src/services/change-requests.services.ts

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -118,16 +118,12 @@ export default class ChangeRequestsService {
118118
await prisma.project.update({
119119
where: { projectId: foundCR.wbsElement.project.projectId },
120120
data: {
121-
budget: newBudget,
122-
wbsElement: {
123-
update: {
124-
changes: {
125-
create: change
126-
}
127-
}
128-
}
121+
budget: newBudget
129122
}
130123
});
124+
125+
//Make the associated budget change if there was a change
126+
if (change) await prisma.change.create({ data: change });
131127
} else if (foundCR.wbsElement.workPackage) {
132128
// get the project for the work package
133129
const wpProj = await prisma.project.findUnique({

src/backend/tests/change-requests.test.ts

Lines changed: 0 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -210,24 +210,6 @@ describe('Change Requests', () => {
210210
expect(prisma.change_Request.findUnique).toHaveBeenCalledTimes(1);
211211
expect(prisma.proposed_Solution.findUnique).toHaveBeenCalledTimes(1);
212212
expect(prisma.user_Settings.findUnique).toHaveBeenCalledTimes(1);
213-
expect(prisma.project.update).toHaveBeenCalledWith({
214-
data: {
215-
budget: 1003,
216-
wbsElement: {
217-
update: {
218-
changes: {
219-
create: {
220-
changeRequestId: 2,
221-
detail: 'Changed Budget from "3" to "1003"',
222-
implementerId: 2,
223-
wbsElementId: 65
224-
}
225-
}
226-
}
227-
}
228-
},
229-
where: { projectId: 2 }
230-
});
231213
expect(prisma.change_Request.update).toHaveBeenCalledTimes(1);
232214
});
233215

0 commit comments

Comments
 (0)