Skip to content

StopSearch: Make municipality filter more robust #1323

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 1 commit into from
Jan 22, 2026
Merged

StopSearch: Make municipality filter more robust #1323

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
17 changes: 3 additions & 14 deletions ui/src/components/stop-registry/search/by-stop/filtersToQueryVariables.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
import isEmpty from 'lodash/isEmpty';
import { StopsDatabaseQuayNewestVersionBoolExp } from '../../../../generated/graphql';
import {
StopRegistryMunicipality,
knownPriorityValues,
} from '../../../../types/enums';
import { knownPriorityValues } from '../../../../types/enums';
import {
AllOptionEnum,
NullOptionEnum,
Expand All @@ -16,7 +13,6 @@ import {
ResultSelection,
SearchBy,
StopSearchFilters,
StringMunicipality,
} from '../types';

function toTiamatDBEnumCase(str: string) {
Expand Down Expand Up @@ -63,15 +59,8 @@ function buildSearchStopsMunicipalityFilter({

return {
stop_place: {
topographic_place_id: {
_in: municipalities.map(
(name) =>
(
StopRegistryMunicipality as unknown as Readonly<
Record<StringMunicipality, number>
>
)[name as StringMunicipality],
),
topographic_place: {
name_value: { _in: municipalities },
},
},
};
Expand Down
6 changes: 2 additions & 4 deletions ui/src/components/stop-registry/search/types/StopSearchFilters.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,15 +15,13 @@ import { AllOptionEnum, NullOptionEnum, areEqual } from '../../../../utils';
import { instanceOfDateTime, requiredString } from '../../../forms/common';
import { SearchBy } from './SearchBy';
import { SearchFor } from './SearchFor';
import { StringMunicipality, knownMunicipalities } from './StringMunicipality';
import { knownMunicipalities } from './StringMunicipality';

const allEnum = z.nativeEnum(AllOptionEnum);
const nullEnum = z.nativeEnum(NullOptionEnum);

function zMunicipalityEnumArray() {
const municipalityEnum = z.enum(
knownMunicipalities as [StringMunicipality, ...StringMunicipality[]],
);
const municipalityEnum = z.enum(knownMunicipalities);
return z.array(z.union([municipalityEnum, allEnum]));
}

Expand Down
19 changes: 12 additions & 7 deletions ui/src/components/stop-registry/search/types/StringMunicipality.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,13 @@
import { StopRegistryMunicipality } from '../../../../types/enums';
import { numberEnumKeys } from '../../../../utils';
export const knownMunicipalities = [
'Helsinki',
'Vantaa',
'Espoo',
'Kauniainen',
'Siuntio',
'Kirkkonummi',
'Sipoo',
'Kerava',
'Tuusula',
] as const;

export const knownMunicipalities = Object.freeze(
numberEnumKeys(StopRegistryMunicipality),
);

export type StringMunicipality = keyof typeof StopRegistryMunicipality;
export type StringMunicipality = (typeof knownMunicipalities)[number];
12 changes: 0 additions & 12 deletions ui/src/types/enums.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -72,18 +72,6 @@ export enum DayType {
SU = 9, // Sunday
}

export enum StopRegistryMunicipality {
Helsinki = 3,
Vantaa = 4,
Espoo = 5,
Kauniainen = 6,
Siuntio = 7,
Kirkkonummi = 8,
Sipoo = 9,
Kerava = 10,
Tuusula = 11,
}

export const knownMunicipalityPrefixes = {
Helsinki: 'H',
Vantaa: 'V',
Expand Down