Skip to content

Commit 3243940

Browse files
committed
fixed duplicated fmc assignments due to parent/child relationships. Match assignment to persons actual assignment
1 parent 7fabdf7 commit 3243940

1 file changed

Lines changed: 18 additions & 14 deletions

File tree

src/containers/PersonalSchedule/utils.ts

Lines changed: 18 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -105,20 +105,24 @@ const getFmcAttemptAssignments = (wcif: Competition, person: Person) => {
105105
return parsed.eventId === '333fm' && parsed.attemptNumber !== null;
106106
});
107107

108-
return fmcAttemptActivities.map(
109-
(
110-
activity,
111-
): Assignment & {
112-
type: 'extra';
113-
activity: Activity;
114-
} => ({
115-
type: 'extra',
116-
assignmentCode: 'competitor',
117-
activityId: activity.id,
118-
stationNumber: null,
119-
activity,
120-
}),
121-
);
108+
const personActivities = person.assignments?.map((ass) => ass.activityId);
109+
110+
return fmcAttemptActivities
111+
.filter((activity) => personActivities?.includes(activity.id))
112+
.map(
113+
(
114+
activity,
115+
): Assignment & {
116+
type: 'extra';
117+
activity: Activity;
118+
} => ({
119+
type: 'extra',
120+
assignmentCode: 'competitor',
121+
activityId: activity.id,
122+
stationNumber: null,
123+
activity,
124+
}),
125+
);
122126
};
123127

124128
export const getAllAssignments = (wcif: Competition, person: Person) => {

0 commit comments

Comments
 (0)