Skip to content

Required jore stop keyvalues #1444

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

Merged
Huulivoide merged 3 commits into from
Jun 16, 2026
Merged

Required jore stop keyvalues #1444

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
58c91c8
E2E: Cleanup code
Huulivoide Jun 15, 2026
4c97b72
E2E: Update jore Quay extension seed data
Huulivoide Jun 15, 2026
697d6ec
Stop: Set Stop to be in InOpereration state on creation
Huulivoide Jun 15, 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
60 changes: 57 additions & 3 deletions cypress/datasets/stopRegistry.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,9 +13,11 @@ import {
StopRegistryShelterType,
StopRegistryTransportModeType,
TerminalInput,
minimalQuayKeyValues,
seedOrganisations,
} from '@hsl/jore4-test-db-manager/dist/CypressSpecExports';
import cloneDeep from 'lodash/cloneDeep';
import { StopPlaceState } from '../enums';
import { stopCoordinatesByLabel } from './base';

const coordinatesToStopRegistryGeoJSON = (
Expand Down Expand Up @@ -67,6 +69,7 @@ const stopPlaceData: Array<StopAreaInput> = [
privateCode: { type: 'HSL/TEST', value: 'X0003' },
name: { lang: 'fin', value: 'Annankatu 15' },
alternativeNames: Annankatu15AltNames,
transportMode: StopRegistryTransportModeType.Bus,
keyValues: [
{ key: KnownValueKey.ValidityStart, values: ['2020-01-01'] },
{ key: KnownValueKey.ValidityEnd, values: ['2050-01-01'] },
Expand All @@ -80,6 +83,7 @@ const stopPlaceData: Array<StopAreaInput> = [
publicCode: 'E2E001',
description: { lang: 'fin', value: 'Annankatu 15' },
keyValues: [
...minimalQuayKeyValues,
{ key: KnownValueKey.StreetAddress, values: ['Annankatu 15'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E001'] },
],
Expand All @@ -91,6 +95,7 @@ const stopPlaceData: Array<StopAreaInput> = [
publicCode: 'E2E009',
description: { lang: 'fin', value: 'Annankatu 15' },
keyValues: [
...minimalQuayKeyValues,
{ key: KnownValueKey.StreetAddress, values: ['Annankatu 15'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E009'] },
],
Expand All @@ -106,6 +111,7 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'X0004' },
name: { lang: 'fin', value: 'Kalevankatu 32' },
transportMode: StopRegistryTransportModeType.Bus,
keyValues: [
{ key: KnownValueKey.ValidityStart, values: ['2020-01-01'] },
{ key: KnownValueKey.ValidityEnd, values: ['2050-01-01'] },
Expand All @@ -118,6 +124,7 @@ const stopPlaceData: Array<StopAreaInput> = [
{
publicCode: 'E2E003',
keyValues: [
...minimalQuayKeyValues,
{ key: KnownValueKey.StreetAddress, values: ['Kalevankatu 32'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E003'] },
],
Expand All @@ -128,6 +135,7 @@ const stopPlaceData: Array<StopAreaInput> = [
{
publicCode: 'E2E006',
keyValues: [
...minimalQuayKeyValues,
{ key: KnownValueKey.StreetAddress, values: ['Kalevankatu 32'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E006'] },
],
Expand All @@ -144,6 +152,7 @@ const stopPlaceData: Array<StopAreaInput> = [
privateCode: { type: 'HSL/TEST', value: 'E2E002' },
name: Annankatu20Name,
alternativeNames: Annankatu20AltNames,
transportMode: StopRegistryTransportModeType.Bus,
quays: [
{
publicCode: 'E2E002',
Expand All @@ -152,6 +161,7 @@ const stopPlaceData: Array<StopAreaInput> = [
stopCoordinatesByLabel.E2E002,
),
keyValues: [
...minimalQuayKeyValues,
{ key: KnownValueKey.StreetAddress, values: ['Annankatu 20'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E002'] },
],
Expand All @@ -165,6 +175,7 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2E004' },
name: { lang: 'fin', value: 'Albertinkatu 38' },
transportMode: StopRegistryTransportModeType.Bus,
alternativeNames: [
{
nameType: StopRegistryNameType.Translation,
Expand All @@ -186,6 +197,7 @@ const stopPlaceData: Array<StopAreaInput> = [
stopCoordinatesByLabel.E2E004,
),
keyValues: [
...minimalQuayKeyValues,
{
key: KnownValueKey.StreetAddress,
values: ['Albertinkatu 38'],
Expand All @@ -202,13 +214,15 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2E005' },
name: { lang: 'fin', value: 'Lönnrotinkatu 32' },
transportMode: StopRegistryTransportModeType.Bus,
quays: [
{
publicCode: 'E2E005',
geometry: coordinatesToStopRegistryGeoJSON(
stopCoordinatesByLabel.E2E005,
),
keyValues: [
...minimalQuayKeyValues,
{
key: KnownValueKey.StreetAddress,
values: ['Lönnrotinkatu 32'],
Expand All @@ -225,13 +239,19 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2E007' },
name: { lang: 'fin', value: 'Kalevankatu 18' },
transportMode: StopRegistryTransportModeType.Bus,
quays: [
{
publicCode: 'E2E007',
geometry: coordinatesToStopRegistryGeoJSON(
stopCoordinatesByLabel.E2E005,
),
keyValues: [
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
{ key: KnownValueKey.StreetAddress, values: ['Kalevankatu 18'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E007'] },
{ key: KnownValueKey.ValidityStart, values: ['2020-03-20'] },
Expand All @@ -246,13 +266,19 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2E008' },
name: { lang: 'fin', value: 'Kuttulammentie' },
transportMode: StopRegistryTransportModeType.Bus,
quays: [
{
publicCode: 'E2E008',
geometry: coordinatesToStopRegistryGeoJSON(
stopCoordinatesByLabel.E2E005,
),
keyValues: [
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
{
key: KnownValueKey.StreetAddress,
values: ['Kuttulammentie 15'],
Expand Down Expand Up @@ -299,13 +325,19 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2E010' },
name: { lang: 'fin', value: 'Finnoonkartano' },
transportMode: StopRegistryTransportModeType.Bus,
quays: [
{
publicCode: 'E2E010',
geometry: coordinatesToStopRegistryGeoJSON(
stopCoordinatesByLabel.E2E005,
),
keyValues: [
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
{ key: KnownValueKey.StreetAddress, values: ['Finnoonkartano'] },
{ key: KnownValueKey.ElyNumber, values: ['E2E010'] },
{ key: KnownValueKey.ValidityStart, values: ['2020-03-20'] },
Expand All @@ -320,6 +352,7 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2E011' },
name: { lang: 'fin', value: 'Eteläinen Hesperiankatu' },
transportMode: StopRegistryTransportModeType.Bus,
keyValues: [
{ key: KnownValueKey.ValidityStart, values: ['2020-01-01'] },
{ key: KnownValueKey.ValidityEnd, values: ['2052-01-01'] },
Expand All @@ -339,6 +372,11 @@ const stopPlaceData: Array<StopAreaInput> = [
{ key: KnownValueKey.ElyNumber, values: ['E2E011'] },
{ key: KnownValueKey.ValidityStart, values: ['2020-01-01'] },
{ key: KnownValueKey.ValidityEnd, values: ['2052-01-01'] },
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
],
geometry: coordinatesToStopRegistryGeoJSON(
stopCoordinatesByLabel.E2E011,
Expand All @@ -352,6 +390,7 @@ const stopPlaceData: Array<StopAreaInput> = [
StopArea: {
privateCode: { type: 'HSL/TEST', value: 'E2ENQ' },
name: { lang: 'fin', value: 'No quays' },
transportMode: StopRegistryTransportModeType.Bus,
quays: [],
geometry: {
coordinates: [60.16993495, 24.92596546],
Expand All @@ -362,9 +401,9 @@ const stopPlaceData: Array<StopAreaInput> = [
},
{
StopArea: {
transportMode: StopRegistryTransportModeType.Tram,
privateCode: { type: 'HSL/TEST', value: 'E2ER001' },
name: { lang: 'fin', value: 'Tram stop area' },
transportMode: StopRegistryTransportModeType.Tram,
quays: [
{
publicCode: 'E2ER001',
Expand All @@ -375,6 +414,11 @@ const stopPlaceData: Array<StopAreaInput> = [
{ key: KnownValueKey.StreetAddress, values: ['Tram stop area'] },
{ key: KnownValueKey.ElyNumber, values: ['E2ER001'] },
{ key: KnownValueKey.ValidityStart, values: ['2020-03-20'] },
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
],
},
],
Expand All @@ -386,9 +430,9 @@ const stopPlaceData: Array<StopAreaInput> = [
},
{
StopArea: {
transportMode: StopRegistryTransportModeType.Tram,
privateCode: { type: 'HSL/TEST', value: 'E2ER002' },
name: { lang: 'fin', value: 'Tram stop area 2' },
transportMode: StopRegistryTransportModeType.Tram,
quays: [
{
publicCode: 'E2ER002',
Expand All @@ -399,6 +443,11 @@ const stopPlaceData: Array<StopAreaInput> = [
{ key: KnownValueKey.StreetAddress, values: ['Tram stop area 2'] },
{ key: KnownValueKey.ElyNumber, values: ['E2ER002'] },
{ key: KnownValueKey.ValidityStart, values: ['2020-03-20'] },
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
],
},
],
Expand All @@ -410,9 +459,9 @@ const stopPlaceData: Array<StopAreaInput> = [
},
{
StopArea: {
transportMode: StopRegistryTransportModeType.Tram,
privateCode: { type: 'HSL/TEST', value: 'E2ER003' },
name: { lang: 'fin', value: 'Tram stop area 3' },
transportMode: StopRegistryTransportModeType.Tram,
quays: [
{
publicCode: 'E2ER003',
Expand All @@ -423,6 +472,11 @@ const stopPlaceData: Array<StopAreaInput> = [
{ key: KnownValueKey.StreetAddress, values: ['Tram stop area 3'] },
{ key: KnownValueKey.ElyNumber, values: ['E2ER003'] },
{ key: KnownValueKey.ValidityStart, values: ['2020-03-20'] },
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
],
},
],
Expand Down
2 changes: 2 additions & 0 deletions cypress/e2e/map/createRoute.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ import {
StopRegistryGeoJsonInput,
StopRegistryGeoJsonType,
StopRegistryTransportModeType,
minimalQuayKeyValues,
} from '@hsl/jore4-test-db-manager/dist/CypressSpecExports';
import {
buildInfraLinksAlongRoute,
Expand Down Expand Up @@ -54,6 +55,7 @@ function constructStopRegistryEntriesForBaseDbResourceStopPoints(
privateCode: { value: label, type: 'HSL/TEST' },
publicCode: label,
geometry,
keyValues: minimalQuayKeyValues.slice(),
},
],
},
Expand Down
7 changes: 6 additions & 1 deletion cypress/e2e/map/createTerminal.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import {
testInfraLinkExternalIds,
} from '../../datasets/base';
import { getClonedBaseStopRegistryData } from '../../datasets/stopRegistry';
import { Tag } from '../../enums';
import { StopPlaceState, Tag } from '../../enums';
import {
FilterPanel,
KnownMapItemTypeFilters,
Expand Down Expand Up @@ -279,6 +279,11 @@ describe('Terminal creation tests', rootOpts, () => {
key: KnownValueKey.ValidityStart,
values: ['2020-03-20'],
},
{ key: KnownValueKey.Priority, values: ['10'] },
{
key: KnownValueKey.StopState,
values: [StopPlaceState.InOperation],
},
],
},
],
Expand Down
3 changes: 3 additions & 0 deletions cypress/e2e/map/editStopAreas.cy.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,5 @@
import {
ReusableComponentsVehicleModeEnum,
StopAreaInput,
StopRegistryGeoJsonType,
} from '@hsl/jore4-test-db-manager/dist/CypressSpecExports';
Expand All @@ -13,6 +14,7 @@ import { getClonedBaseStopRegistryData } from '../../datasets/stopRegistry';
import { Tag } from '../../enums';
import {
ConfirmationDialog,
FilterPanel,
KnownMapItemTypeFilters,
MapFooter,
MapItemTypeFiltersOverlay,
Expand Down Expand Up @@ -92,6 +94,7 @@ describe('Stop areas on map', { tags: [Tag.StopAreas, Tag.Map] }, () => {
lng: 24.93858,
});

FilterPanel.toggleShowStops(ReusableComponentsVehicleModeEnum.Bus);
expectGraphQLCallToSucceed('@gqlGetStopAreasByLocation');
MapPage.map.waitForLoadToComplete();
});
Expand Down
Loading
Loading