Skip to content
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

Jump to bottom

10275 refactor continued, maybe #10538

Merged
merged 2 commits into from
Oct 23, 2024
Merged

10275 refactor continued, maybe #10538

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
71e50c6
10275: refactor: proof-of-concept: consolidate counter objects
TomElliottFlexion Oct 23, 2024
ed9e49c
10275: revert mocks
TomElliottFlexion Oct 23, 2024
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
77 changes: 23 additions & 54 deletions ...api/src/business/useCaseHelper/trialSessions/trialSessionCalendaring/CalendarGenerator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,16 @@
import {
CalendaringConfig,
ProspectiveSessionsByCity,
} from './createProspectiveTrialSessions';
import { CaseCountsByProcedureTypeByCity } from '@web-api/business/useCaseHelper/trialSessions/trialSessionCalendaring/getDataForCalendaring';
import { CalendaringConfig } from './createProspectiveTrialSessions';
import { CaseCountsAndSessionsByCity } from '@web-api/business/useCaseHelper/trialSessions/trialSessionCalendaring/getDataForCalendaring';
import { Constraint } from '@web-api/business/useCaseHelper/trialSessions/trialSessionCalendaring/constraints';
import {
FORMATS,
createDateAtStartOfWeekEST,
} from '@shared/business/utilities/DateHandler';
import { RawTrialSession } from '@shared/business/entities/trialSessions/TrialSession';
import {
PROCEDURE_TYPES_MAP,
SESSION_TYPES,
TRIAL_CITY_STRINGS,
TrialSessionTypes,
} from '@shared/business/entities/EntityConstants';
import { RawTrialSession } from '@shared/business/entities/trialSessions/TrialSession';
import {
ScheduledTrialSession,
SessionCountByWeek,
Expand All @@ -25,7 +21,6 @@ import {
WASHINGTON_DC_SOUTH_STRING,
WASHINGTON_DC_STRING,
} from '@web-api/business/useCases/trialSessions/generateSuggestedTrialSessionCalendarInteractor';
import { cloneDeep } from 'lodash';

export type CalendarState = {
sessionCountPerWeek: Record<string, number>;
Expand All @@ -37,20 +32,14 @@ export type CalendarState = {

export class CalendarGenerator {
private calendarState: CalendarState;
private remainingCaseCountsByProcedureTypeByCity: CaseCountsByProcedureTypeByCity;

constructor(
private calendaringConfig: CalendaringConfig,
private constraints: Constraint[],
private prospectiveSessionsByCity: ProspectiveSessionsByCity,
private caseCountsAndSessionsByCity: CaseCountsAndSessionsByCity,
private weeksToLoop: string[],
private specialSessions: RawTrialSession[],
caseCountsByProcedureTypeByCity: CaseCountsByProcedureTypeByCity,
) {
this.remainingCaseCountsByProcedureTypeByCity = cloneDeep(
caseCountsByProcedureTypeByCity,
);

this.calendarState = {
reservedWeekOfLocationIntersection: {},
scheduledTrialSessionsByCity: {},
Expand Down Expand Up @@ -87,7 +76,7 @@ export class CalendarGenerator {
public generateCalendar = (): {
sessionCountPerWeek: SessionCountByWeek;
scheduledTrialSessionsByCity: TrialSessionsByCity;
remainingCaseCountsByProcedureTypeByCity: CaseCountsByProcedureTypeByCity;
caseCountsAndSessionsByCity: CaseCountsAndSessionsByCity;
} => {
// check special sessions
const specialSessionsByLocation = this.specialSessions.reduce(
Expand All @@ -114,14 +103,14 @@ export class CalendarGenerator {

// TODO 10275: test this (and be sure it works)
const sortedProspectiveSessionsByCity: TrialSessionsByCity = Object.keys(
this.prospectiveSessionsByCity,
this.caseCountsAndSessionsByCity,
)
.sort((a, b) => {
const aNotVisited =
this.prospectiveSessionsByCity[a][0]
this.caseCountsAndSessionsByCity[a].sessions[0]
?.cityWasNotVisitedInLastTwoTerms || false;
const bNotVisited =
this.prospectiveSessionsByCity[b][0]
this.caseCountsAndSessionsByCity[b].sessions[0]
?.cityWasNotVisitedInLastTwoTerms || false;

return aNotVisited === bNotVisited ? 0 : aNotVisited ? -1 : 1;
Expand All @@ -130,18 +119,17 @@ export class CalendarGenerator {
if (key === WASHINGTON_DC_STRING) {
obj[WASHINGTON_DC_SOUTH_STRING] = [];

for (const prospectiveSession of this.prospectiveSessionsByCity[
key
]) {
obj[WASHINGTON_DC_SOUTH_STRING].push({
for (const prospectiveSession of this.caseCountsAndSessionsByCity[key]
.sessions) {
obj[WASHINGTON_DC_SOUTH_STRING].sessions.push({
...prospectiveSession,
city: WASHINGTON_DC_SOUTH_STRING,
});
}

return obj;
}
obj[key] = this.prospectiveSessionsByCity[key];
obj[key] = this.caseCountsAndSessionsByCity[key].sessions;
return obj;
}, {});

Expand Down Expand Up @@ -264,8 +252,7 @@ export class CalendarGenerator {
}

return {
remainingCaseCountsByProcedureTypeByCity:
this.remainingCaseCountsByProcedureTypeByCity,
caseCountsAndSessionsByCity: this.caseCountsAndSessionsByCity,
scheduledTrialSessionsByCity:
this.calendarState.scheduledTrialSessionsByCity,
sessionCountPerWeek: this.calendarState.sessionCountPerWeek,
Expand Down Expand Up @@ -304,36 +291,18 @@ export class CalendarGenerator {
// Decrement by the max count for that session type. If that's less than 0, then we scheduled
// a session that was more than the min and less than the max, so just set it to 0
if (sessionType === SESSION_TYPES.regular) {
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.regular
] -= this.calendaringConfig.regularCaseMaxQuantity;
if (
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.regular
] < 0
)
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.regular
] = 0;
this.caseCountsAndSessionsByCity[city].remainingRegularCases -=
this.calendaringConfig.regularCaseMaxQuantity;
if (this.caseCountsAndSessionsByCity[city].remainingRegularCases < 0)
this.caseCountsAndSessionsByCity[city].remainingRegularCases = 0;
} else if (sessionType === SESSION_TYPES.small) {
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.small
] -= this.calendaringConfig.smallCaseMaxQuantity;
if (
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.small
] < 0
)
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.small
] = 0;
this.caseCountsAndSessionsByCity[city].remainingSmallCases -=
this.calendaringConfig.smallCaseMaxQuantity;
if (this.caseCountsAndSessionsByCity[city].remainingSmallCases < 0)
this.caseCountsAndSessionsByCity[city].remainingSmallCases = 0;
} else if (sessionType === SESSION_TYPES.hybrid) {
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.regular
] = 0;
this.remainingCaseCountsByProcedureTypeByCity[city][
PROCEDURE_TYPES_MAP.small
] = 0;
this.caseCountsAndSessionsByCity[city].remainingRegularCases = 0;
this.caseCountsAndSessionsByCity[city].remainingSmallCases = 0;
}
};
}
Loading
Loading