Skip to content

KAAV-3506 timeUtil.compareAndUpdateDates Ei toimi odotetulla tavalla #677

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

KAAV-3506 timeUtil.compareAndUpdateDates Ei toimi odotetulla tavalla #677

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
d3fa5dd
KAAV-3506 fix(timeline): fix compareAndUpdateDates cascade bugs
henrihaapalasiili Feb 20, 2026
b49e948
recude duplication
henrihaapalasiili Feb 20, 2026
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
104 changes: 51 additions & 53 deletions src/__tests__/utils/timeUtil.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -286,6 +286,14 @@ describe ("addDays and subtractDays with disabled dates", () => {
});

describe("getDisabledDates for various phases", () => {
/** Assert every date in the array falls on a weekday (Mon-Fri) */
const expectAllWeekdays = (dates) => {
for (const date of dates) {
const day = new Date(date).getDay();
expect([0, 6].includes(day), `${date} is a weekend`).toBe(false);
}
};

test("getDisabledDatesForProjectStart returns valid *allowed* dates", () => {
const name = "projektin_kaynnistys_pvm";
const formValues = {
Expand All @@ -303,10 +311,9 @@ describe("getDisabledDates for various phases", () => {
expect(result[result.length-1]).toBe("2025-05-19"); //maintain 10 working days distance
const nextDate = new Date(formValues["kaynnistys_paattyy_pvm"]);
for (let date of result) {
let newDate = new Date(date);
expect(newDate < nextDate).toBe(true);
expect(newDate.getDay() !== 0 && newDate.getDay() !== 6).toBe(true); // Not weekend
expect(new Date(date) < nextDate).toBe(true);
}
expectAllWeekdays(result);
});
test("getDisabledDatesForApproval returns valid *allowed* dates", () => {
const name = "hyvaksymispaatos_pvm";
Expand All @@ -323,10 +330,9 @@ describe("getDisabledDates for various phases", () => {
expect(result[0]).toBe("2025-05-23"); // maintain 15 working days distance
const previousDate = new Date(formValues["hyvaksyminenvaihe_alkaa_pvm"]);
for (let date of result) {
let newDate = new Date(date);
expect(newDate > previousDate).toBe(true);
expect(newDate.getDay() !== 0 && newDate.getDay() !== 6).toBe(true); // Not weekend
expect(new Date(date) > previousDate).toBe(true);
}
expectAllWeekdays(result);
const resultXS = timeUtil.getDisabledDatesForApproval(name, formValues, matchingItem, dateTypes, "XS");
expect(resultXS[0]).toBe("2025-05-22"); // 1 extra day for XS/S
});
Expand Down Expand Up @@ -365,10 +371,9 @@ describe("getDisabledDates for various phases", () => {
expect(result_maaraika[0]).toBe("2025-08-11");
const previousDate_maaraika = new Date(formValues["tarkistettu_ehdotusvaihe_alkaa_pvm"]);
for (let date of result_maaraika) {
let newDate = new Date(date);
expect(newDate > previousDate_maaraika).toBe(true);
expect([0, 6].includes(newDate.getDay())).toBe(false);
expect(new Date(date) > previousDate_maaraika).toBe(true);
}
expectAllWeekdays(result_maaraika);
const result_lautakunta = timeUtil.getDisabledDatesForLautakunta("milloin_tarkistettu_ehdotus_lautakunnassa", formValues, "tarkistettu_ehdotus", lautakuntaItem, kylkItem, dateTypes);
const previousDate = new Date(formValues["tarkistettu_ehdotus_kylk_maaraaika"]);
// 27 work days distance from maaraika (23rd), then next possible tuesday (30th)
Expand Down Expand Up @@ -440,26 +445,17 @@ describe("getDisabledDates for various phases", () => {
// Test maaraAika - should return disabled dates (working days only)
const maaraAikaResult = timeUtil.getDisabledDatesForSizeXSXL(name, formValues, maaraAikaItem, dateTypes);
expect(maaraAikaResult.length).toBeGreaterThan(0);
for (let date of maaraAikaResult) {
let newDate = new Date(date);
expect(newDate.getDay() !== 0 && newDate.getDay() !== 6).toBe(true); // Not weekend
}
expectAllWeekdays(maaraAikaResult);

// Test alkaa - should return disabled dates after prerequisite
const alkaaResult = timeUtil.getDisabledDatesForSizeXSXL("milloin_oas_esillaolo_alkaa", formValues, alkaaItem, dateTypes);
expect(alkaaResult.length).toBeGreaterThan(0);
for (let date of alkaaResult) {
let newDate = new Date(date);
expect(newDate.getDay() !== 0 && newDate.getDay() !== 6).toBe(true);
}
expectAllWeekdays(alkaaResult);

// Test paattyy - should return disabled dates (working days only)
const paattyyResult = timeUtil.getDisabledDatesForSizeXSXL("milloin_oas_esillaolo_paattyy", formValues, paattyyItem, dateTypes);
expect(paattyyResult.length).toBeGreaterThan(0);
for (let date of paattyyResult) {
let newDate = new Date(date);
expect(newDate.getDay() !== 0 && newDate.getDay() !== 6).toBe(true); // Not weekend
}
expectAllWeekdays(paattyyResult);
});
test("getHighestLautakuntaDate returns correct date", () => {
const formValues = {
Expand Down Expand Up @@ -628,7 +624,7 @@ describe("compareAndUpdateDates function", () => {
expect(test_data[key], `Key ${key} was not updated`).toBe(test_data[viimeistaan_items[key]]);
}
});
test.skip("compareAndUpdateDates phase end dates correctly", () => {
test("compareAndUpdateDates phase end dates correctly", () => {
const end_keys = [
"periaatteetvaihe_paattyy_pvm",
"oasvaihe_paattyy_pvm",
Expand All @@ -654,45 +650,47 @@ describe("compareAndUpdateDates function", () => {
test_data["kaavaluonnos_lautakuntaan_1"] = true;
test_data["kaavaluonnos_lautakuntaan_2"] = true;
test_data["kaavaluonnos_lautakuntaan_3"] = false;
test_data["kaavehdotus_nahtaville_1"] = true;
test_data["kaavehdotus_uudelleen_nahtaville_2"] = true;
test_data["kaavehdotus_uudelleen_nahtaville_3"] = false;
test_data["kaavaehdotus_nahtaville_1"] = true;
test_data["kaavaehdotus_uudelleen_nahtaville_2"] = true;
test_data["kaavaehdotus_uudelleen_nahtaville_3"] = false;
test_data["tarkistettu_ehdotus_lautakuntaan_1"] = true;
test_data["tarkistettu_ehdotus_lautakuntaan_2"] = true;
test_data["tarkistettu_ehdotus_lautakuntaan_3"] = false;
test_data["tarkistettu_ehdotus_lautakuntaan_4"] = false;

timeUtil.compareAndUpdateDates(test_data);
expect(test_data["oasvaihe_paattyy_pvm"]).toBe(test_data["milloin_oas_esillaolo_paattyy_2"]);
expect(test_data["luonnosvaihe_paattyy_pvm"]).toBe(test_data["milloin_kaavaluonnos_lautakunnassa_2"]);
expect(test_data["ehdotusvaihe_paattyy_pvm"]).toBe(test_data["milloin_kaavaehdotus_lautakunnassa_2"]);
expect(test_data["ehdotusvaihe_paattyy_pvm"]).toBe(test_data["viimeistaan_lausunnot_ehdotuksesta_2"]);
expect(test_data["tarkistettuehdotusvaihe_paattyy_pvm"]).toBe(test_data["milloin_tarkistettu_ehdotus_lautakunnassa_2"]);
timeUtil.compareAndUpdateDates(test_data);
});
test.skip("compareAndUpdateDates end dates, periaatteet with no lautakunta", () => {
test_data["periaatteetvaihe_paattyy_pvm"] = undefined;
test_data["periaatteet_lautakuntaan_1"] = false;
test_data["periaatteet_lautakuntaan_2"] = false;
test_data["periaatteet_lautakuntaan_3"] = false;
test_data["periaatteet_lautakuntaan_4"] = false;
test_data["jarjestetaan_periaatteet_esillaolo_1"] = true;
test_data["jarjestetaan_periaatteet_esillaolo_2"] = false;
test_data["jarjestetaan_periaatteet_esillaolo_3"] = false;
timeUtil.compareAndUpdateDates(test_data);
expect(test_data["periaatteetvaihe_paattyy_pvm"]).toBe(test_data["milloin_periaatteet_esillaolo_paattyy"]);
});
test.skip("compareAndUpdateDates end dates, luonnos with no lautakunta", () => {
test_data["luonnosvaihe_paattyy_pvm"] = undefined;
test_data["kaavaluonnos_lautakuntaan_1"] = false;
test_data["kaavaluonnos_lautakuntaan_2"] = false;
test_data["kaavaluonnos_lautakuntaan_3"] = false;
test_data["kaavaluonnos_lautakuntaan_4"] = false;
test_data["jarjestetaan_luonnos_esillaolo_1"] = true;
test_data["jarjestetaan_luonnos_esillaolo_2"] = false;
test_data["jarjestetaan_luonnos_esillaolo_3"] = false;
timeUtil.compareAndUpdateDates(test_data);
expect(test_data["luonnosvaihe_paattyy_pvm"]).toBe(test_data["milloin_luonnos_esillaolo_paattyy"]);
});
test.skip("compareAndUpdateDates end dates, ehdotus in XS size", () => {
test.each([
{
phase: "periaatteet",
endKey: "periaatteetvaihe_paattyy_pvm",
lautakuntaPrefix: "periaatteet_lautakuntaan",
esillaoloPrefix: "jarjestetaan_periaatteet_esillaolo",
expectedSrc: "milloin_periaatteet_esillaolo_paattyy",
},
{
phase: "luonnos",
endKey: "luonnosvaihe_paattyy_pvm",
lautakuntaPrefix: "kaavaluonnos_lautakuntaan",
esillaoloPrefix: "jarjestetaan_luonnos_esillaolo",
expectedSrc: "milloin_luonnos_esillaolo_paattyy",
},
])("compareAndUpdateDates end dates, $phase with no lautakunta",
({ endKey, lautakuntaPrefix, esillaoloPrefix, expectedSrc }) => {
test_data[endKey] = undefined;
for (let i = 1; i <= 4; i++) test_data[`${lautakuntaPrefix}_${i}`] = false;
test_data[`${esillaoloPrefix}_1`] = true;
test_data[`${esillaoloPrefix}_2`] = false;
test_data[`${esillaoloPrefix}_3`] = false;
timeUtil.compareAndUpdateDates(test_data);
expect(test_data[endKey]).toBe(test_data[expectedSrc]);
}
);
test("compareAndUpdateDates end dates, ehdotus in XS size", () => {
test_data["ehdotusvaihe_paattyy_pvm"] = undefined;
test_data["kaavaprosessin_kokoluokka"] = "XS";
test_data["kaavaehdotus_lautakuntaan_1"] = false;
Expand All @@ -705,7 +703,7 @@ describe("compareAndUpdateDates function", () => {
timeUtil.compareAndUpdateDates(test_data);
expect(test_data["ehdotusvaihe_paattyy_pvm"]).toBe(test_data["milloin_ehdotuksen_nahtavilla_paattyy"]);
});
test.skip("compareAndUpdateDates moves backwards start dates to match previous end dates", () => {
test("compareAndUpdateDates moves backwards start dates to match previous end dates", () => {
test_data["periaatteetvaihe_alkaa_pvm"] = "2025-05-01";
test_data["kaynnistys_paattyy_pvm"] = "2025-06-01";
timeUtil.compareAndUpdateDates(test_data);
Expand Down
11 changes: 8 additions & 3 deletions src/utils/objectUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -462,7 +462,9 @@ const checkForDecreasingValues = (arr, isAdd, field, disabledDates, oldDate, mov
//Make next or previous or previous and 1 after previous dates follow the moved date if needed
if (arr[currentIndex]?.key?.includes("kylk_maaraaika") || arr[currentIndex]?.key?.includes("kylk_aineiston_maaraaika") || arr[currentIndex]?.key?.includes("_lautakunta_aineiston_maaraaika")) {
//maaraika in lautakunta moving - forward cascade to lautakunnassa
const lautakuntaResult = timeUtil.findAllowedLautakuntaDate(movedDate, arr[i + 1].initial_distance, disabledDates?.date_types[arr[i + 1]?.date_type]?.dates, false, disabledDates?.date_types[arr[i]?.date_type]?.dates);
// Use initial_distance, fall back to distance_from_previous, then default 21 (P7/L7/E8/T3 standard gap)
const lautakuntaGap = arr[i + 1].initial_distance ?? arr[i + 1].distance_from_previous ?? 21;
const lautakuntaResult = timeUtil.findAllowedLautakuntaDate(movedDate, lautakuntaGap, disabledDates?.date_types[arr[i + 1]?.date_type]?.dates, false, disabledDates?.date_types[arr[i]?.date_type]?.dates);
arr[i + 1].value = new Date(lautakuntaResult).toISOString().split('T')[0];
indexToContinue = i + 1

Expand Down Expand Up @@ -536,7 +538,9 @@ const checkForDecreasingValues = (arr, isAdd, field, disabledDates, oldDate, mov
const oldStartISO = arr[i + 1]?.value;
const oldEndISO = arr[i + 2]?.value;
const endAllowed = disabledDates?.date_types[arr[i + 2]?.date_type]?.dates || [];
const alkaaResult = timeUtil.findAllowedDate(movedDate, arr[i + 1].initial_distance, disabledDates?.date_types[arr[i]?.date_type]?.dates, false);
// Use initial_distance, fall back to distance_from_previous, then default 14 (P3/L3/O3 standard gap)
const alkaaGap = arr[i + 1].initial_distance ?? arr[i + 1].distance_from_previous ?? 14;
const alkaaResult = timeUtil.findAllowedDate(movedDate, alkaaGap, disabledDates?.date_types[arr[i]?.date_type]?.dates, false);
arr[i + 1].value = new Date(alkaaResult).toISOString().split('T')[0];
indexToContinue = i + 1
if (!arr[currentIndex]?.key?.includes("kylk_maaraaika") && !arr[currentIndex]?.key?.includes("kylk_aineiston_maaraaika") && !arr[currentIndex]?.key?.includes("_lautakunta_aineiston_maaraaika") && !arr[currentIndex]?.key?.includes("lautakunnassa") && arr[currentIndex]?.key?.includes("maaraaika")) {
Expand All @@ -550,7 +554,8 @@ const checkForDecreasingValues = (arr, isAdd, field, disabledDates, oldDate, mov
const val = endAllowed.findIndex(d => d >= arr[i + 1].value);
let kept = (val !== -1 && val + timespan < endAllowed.length) ? endAllowed[val + timespan] : null;
if (!kept) {
kept = timeUtil.findAllowedDate(arr[i + 1].value, arr[i + 2].initial_distance, endAllowed, false);
const paattyyGap = arr[i + 2].initial_distance ?? arr[i + 2].distance_from_previous ?? 14;
kept = timeUtil.findAllowedDate(arr[i + 1].value, paattyyGap, endAllowed, false);
}
arr[i + 2].value = new Date(kept).toISOString().split('T')[0];
indexToContinue = i + 2
Expand Down
29 changes: 17 additions & 12 deletions src/utils/timeUtil.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -869,30 +869,36 @@ const compareAndUpdateDates = (data) => {
});
//Check that phase end date line is moved to phases actual last date
const buildPhasePairs = (size) => {
// L and XL have reversed order in ehdotus phase: lautakunta first, nähtävilläolo last
const isLargeProject = size === "XL" || size === "L";
// Each entry: [dstField, primarySrcBase, fallbackSrcBase?]
// Primary is tried first; if getLatestDateValue returns null, fallback is tried.
return [
["periaatteetvaihe_paattyy_pvm", "milloin_periaatteet_lautakunnassa"],
["periaatteetvaihe_paattyy_pvm", "milloin_periaatteet_lautakunnassa", "milloin_periaatteet_esillaolo_paattyy"],
["oasvaihe_paattyy_pvm", "milloin_oas_esillaolo_paattyy"],
["luonnosvaihe_paattyy_pvm", "milloin_kaavaluonnos_lautakunnassa"],
["ehdotusvaihe_paattyy_pvm", isLargeProject ? "milloin_ehdotuksen_nahtavilla_paattyy" : "milloin_ehdotus_esillaolo_paattyy"],
["luonnosvaihe_paattyy_pvm", "milloin_kaavaluonnos_lautakunnassa", "milloin_luonnos_esillaolo_paattyy"],
// All sizes use milloin_ehdotuksen_nahtavilla_paattyy for ehdotus end
// (milloin_ehdotus_esillaolo_paattyy does not exist in project data; alkaa differs by size but paattyy does not)
["ehdotusvaihe_paattyy_pvm", "milloin_ehdotuksen_nahtavilla_paattyy"],
["tarkistettuehdotusvaihe_paattyy_pvm", "milloin_tarkistettu_ehdotus_lautakunnassa"],
// hyvaksyminen & voimaantulo intentionally excluded (no paired controlling date specified)
];
};

const phasePairs = buildPhasePairs(data["kaavaprosessin_kokoluokka"]);
phasePairs.forEach(([dst, srcBase]) => {
phasePairs.forEach(([dst, srcBase, fallbackBase]) => {
// Always pick the latest available date among base + suffixed variants
const latest = getLatestDateValue(srcBase);
let latest = getLatestDateValue(srcBase);
// If primary source yields nothing (e.g. lautakunta disabled), try fallback
if (!latest && fallbackBase) {
latest = getLatestDateValue(fallbackBase);
}
if (latest && data[dst] !== latest) {
data[dst] = latest;
}
});
// Generic adjacency enforcement: each phase's start >= previous phase's end.
// Ordered phases including optional ones (periaatteet, luonnos) which may be absent.
// Enforce phase adjacency: next phase alkaa >= previous phase paattyy
// Spec: P1=K2, O1=P8|K2, L1=O6, E1=L8|O6, T1=E9, H1=T5, V1=H3
const orderedPhases = [
{ start: "kaynnistysvaihe_alkaa_pvm", end: "kaynnistysvaihe_paattyy_pvm" },
{ start: "kaynnistysvaihe_alkaa_pvm", end: "kaynnistys_paattyy_pvm" },
{ start: "periaatteetvaihe_alkaa_pvm", end: "periaatteetvaihe_paattyy_pvm", optional: true },
{ start: "oasvaihe_alkaa_pvm", end: "oasvaihe_paattyy_pvm" },
{ start: "luonnosvaihe_alkaa_pvm", end: "luonnosvaihe_paattyy_pvm", optional: true },
Expand All @@ -902,7 +908,7 @@ const compareAndUpdateDates = (data) => {
{ start: "voimaantulovaihe_alkaa_pvm", end: "voimaantulovaihe_paattyy_pvm" }
];

// Build a filtered sequence of phases that actually exist (have either start or end present)
// Build filtered sequence of phases that actually exist (have either start or end present)
const existingPhases = orderedPhases.filter(p => data[p.start] || data[p.end]);

for (let i = 1; i < existingPhases.length; i++) {
Expand All @@ -911,7 +917,6 @@ const compareAndUpdateDates = (data) => {
const prevEnd = validateAndNormalizeDate(data[prev.end]);
const curStart = validateAndNormalizeDate(data[cur.start]);
if (prevEnd && curStart && curStart < prevEnd) {
// Move current start forward to previous end
data[cur.start] = prevEnd;
}
}
Expand Down