Merge pull request #1563 from Northeastern-Electric-Racing/#954-editing-workpackage-bug

#954: fixed bug with stage when editing workpackage

Author: RChandler234

src/backend/src/services/work-packages.services.ts

@@ -362,7 +362,7 @@ export default class WorkPackagesService {
     let changes = [];
     // get the changes or undefined for each of the fields
     const nameChangeJson = createChange('name', originalWorkPackage.wbsElement.name, name, crId, userId, wbsElementId!);
-    const stageChangeJson = createChange('stage', originalWorkPackage.stage, stage ?? 'None', crId, userId, wbsElementId!);
+    const stageChangeJson = createChange('stage', originalWorkPackage.stage, stage, crId, userId, wbsElementId!);
     const startDateChangeJson = createChange(
       'start date',
       originalWorkPackage.startDate.toDateString(),

src/backend/src/utils/changes.utils.ts

@@ -39,13 +39,20 @@ export const createChange = (
   implementerId: number,
   wbsElementId: number
 ): ChangeCreateArgs | undefined => {
-  if (oldValue == null) {
+  if (oldValue == null && newValue !== null) {
     return {
       changeRequestId: crId,
       implementerId,
       wbsElementId,
       detail: `Added ${nameOfField} "${newValue}"`
     };
+  } else if (oldValue !== null && newValue == null) {
+    return {
+      changeRequestId: crId,
+      implementerId,
+      wbsElementId,
+      detail: `Deleted ${nameOfField} "${oldValue}"`
+    };
   } else if (oldValue !== newValue) {
     return {
       changeRequestId: crId,