Merge pull request #3268 from SeedCompany/tests/new-project-workflow-kinda

Author: CarsonF

src/components/engagement/handlers/update-engagement-status.handler.ts

@@ -14,23 +14,18 @@ import { EngagementRepository } from '../engagement.repository';
 import { EngagementService } from '../engagement.service';
 
 const changes: Change[] = [
-  {
-    to: { status: ProjectStatus.Active },
-    newStatus: EngagementStatus.Active,
-  },
   {
     to: { step: ProjectStep.ActiveChangedPlan },
     newStatus: EngagementStatus.ActiveChangedPlan,
   },
-  {
-    from: { status: ProjectStatus.Active },
-    to: { status: ProjectStatus.InDevelopment },
-    newStatus: EngagementStatus.InDevelopment,
-  },
   {
     to: { step: ProjectStep.DiscussingChangeToPlan },
     newStatus: EngagementStatus.DiscussingChangeToPlan,
   },
+  {
+    to: { step: ProjectStep.DiscussingSuspension },
+    newStatus: EngagementStatus.DiscussingSuspension,
+  },
   {
     to: { step: ProjectStep.Suspended },
     newStatus: EngagementStatus.Suspended,
@@ -63,6 +58,15 @@ const changes: Change[] = [
     to: { step: ProjectStep.Terminated },
     newStatus: EngagementStatus.Terminated,
   },
+  {
+    to: { status: ProjectStatus.Active },
+    newStatus: EngagementStatus.Active,
+  },
+  {
+    from: { status: ProjectStatus.Active },
+    to: { status: ProjectStatus.InDevelopment },
+    newStatus: EngagementStatus.InDevelopment,
+  },
 ];
 
 type Change = RequireAtLeastOne<{ from: Condition; to: Condition }> & {

src/components/project/workflow/project-workflow.service.ts

@@ -105,7 +105,7 @@ export class ProjectWorkflowService extends WorkflowService(
     );
     await this.eventBus.publish(event);
 
-    return this.projects.secure(updated, session);
+    return this.projects.secure(event.project, session);
   }
 
   /** @deprecated */

src/components/workflow/workflow.service.ts

@@ -150,11 +150,11 @@ export const WorkflowService = <W extends Workflow>(workflow: () => W) => {
   return WorkflowServiceClass;
 };
 
-export const findTransition = <T extends { key: ID }>(
+export const findTransition = <T extends { key: ID; disabled?: boolean }>(
   transitions: readonly T[],
   needle: ExecuteTransitionInput['transition'],
 ) => {
-  const transition = transitions.find((t) => t.key === needle);
+  const transition = transitions.find((t) => t.key === needle && !t.disabled);
   if (!transition) {
     throw new UnauthorizedException('This transition is not available');
   }

src/core/exception/jest-skip-source-file.ts

@@ -19,7 +19,7 @@ export const jestSkipFileInExceptionSource = (
     return e;
   }
 
-  const all = filepath instanceof RegExp && filepath.global;
+  const all = filepath instanceof RegExp ? filepath.global : true;
   e.stack = e.stack?.[all ? 'replaceAll' : 'replace'](filepath, (substr) => {
     const path = substr.match(/\s+at /)
       ? stacktrace.parse({ stack: 'Error \n' + substr } as any)[0].getFileName()

test/engagement-changeset-aware.e2e-spec.ts

@@ -2,7 +2,6 @@ import { CalendarDate, ID, Role } from '~/common';
 import { EngagementStatus } from '../src/components/engagement/dto';
 import { Language } from '../src/components/language/dto';
 import { ProjectChangeRequestType } from '../src/components/project-change-request/dto';
-import { ProjectStep } from '../src/components/project/dto';
 import {
   approveProjectChangeRequest,
   createFundingAccount,
@@ -22,10 +21,7 @@ import {
   updateProject,
 } from './utility';
 import { fragments } from './utility/fragments';
-import {
-  changeProjectStep,
-  stepsFromEarlyConversationToBeforeActive,
-} from './utility/transition-project';
+import { forceProjectTo } from './utility/transition-project';
 
 const readEngagements = (app: TestApp, id: string, changeset?: string) =>
   app.graphql.query(
@@ -135,14 +131,7 @@ const activeProject = async (app: TestApp, projectId: ID) => {
     primaryLocationId: location.id,
     fieldRegionId: region.id,
   });
-  await runAsAdmin(app, async () => {
-    for (const next of [
-      ...stepsFromEarlyConversationToBeforeActive,
-      ProjectStep.Active,
-    ]) {
-      await changeProjectStep(app, projectId, next);
-    }
-  });
+  await forceProjectTo(app, projectId, 'Active');
 };
 
 describe('Engagement Changeset Aware e2e', () => {

test/engagement-workflow.e2e-spec.ts

@@ -45,7 +45,6 @@ describe('Engagement-Workflow e2e', () => {
     const transProject = await createProject(app, {
       type: ProjectType.MomentumTranslation,
     });
-    expect(transProject.step.value).toBe(ProjectStep.EarlyConversations);
 
     const langEngagement = await createLanguageEngagement(app, {
       projectId: transProject.id,