Skip to content

Ensure date range validation logic runs before report syncing logic #3505

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
wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Ensure date range validation logic runs before report syncing logic #3505

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff47687
Ensure date range validation logic runs before report syncing logic
CarsonF Jun 18, 2025
5958c20
Add some temporary debug code for this invalid date range log
CarsonF Jun 19, 2025
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: 1 addition & 1 deletion src/components/engagement/handlers/validate-eng-date-overrides-on-project-change.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ import { EventsHandler, type IEventHandler } from '~/core';
import { ProjectUpdatedEvent } from '../../project/events';
import { EngagementService } from '../engagement.service';

@EventsHandler(ProjectUpdatedEvent)
@EventsHandler([ProjectUpdatedEvent, 10])
export class ValidateEngDateOverridesOnProjectChangeHandler
implements IEventHandler<ProjectUpdatedEvent>
{
Expand Down
2 changes: 1 addition & 1 deletion ...nts/partnership/handlers/validate-partnership-date-overrides-on-project-change.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import { OrganizationLoader } from '../../organization';
import { ProjectUpdatedEvent } from '../../project/events';
import { PartnershipService } from '../partnership.service';

@EventsHandler(ProjectUpdatedEvent)
@EventsHandler([ProjectUpdatedEvent, 10])
export class ValidatePartnershipDateOverridesOnProjectChangeHandler
implements IEventHandler<ProjectUpdatedEvent>
{
Expand Down
24 changes: 23 additions & 1 deletion src/components/periodic-report/handlers/sync-progress-report-to-engagement.handler.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import { Settings } from 'luxon';
import { DateInterval, type UnsecuredDto } from '~/common';
import { EventsHandler, type IEventHandler, ILogger, Logger } from '~/core';
import { EngagementService } from '../../engagement';
Expand Down Expand Up @@ -89,12 +90,33 @@ export class SyncProgressReportToEngagementDateRange
: [event.engagement];

for (const engagement of engagements) {
Settings.throwOnInvalid = false;
const [updated, prev] =
event instanceof ProjectUpdatedEvent
? this.intervalsFromProjectChange(engagement, event)
: event instanceof EngagementCreatedEvent
? [engagementRange(event.engagement), null]
: [engagementRange(event.updated), engagementRange(event.previous)];
: [
engagementRange(event.updated), //
engagementRange(event.previous),
];
Settings.throwOnInvalid = true;
if (prev && !prev.isValid) {
this.logger.error('Found invalid date range for event', {
eventType: event.constructor.name,
diffSide: 'before',
event,
});
throw new Error('Invalid engagement date range');
}
if (updated && !updated.isValid) {
this.logger.error('Found invalid date range for event', {
eventType: event.constructor.name,
diffSide: 'after',
event,
});
throw new Error('Invalid engagement date range');
}

const diff = this.diffBy(updated, prev, 'quarter');

Expand Down