Merge pull request #259 from zigzagdev/feat/replace-region-front

Replace StudyRegion

Author: zigzagdev

client/src/app/features/heritages/mappers/to-world-heritage-vm.ts

@@ -8,21 +8,24 @@ import { CRITERIA } from "../../../../domain/types.ts";
 
 const ORDER: readonly CriteriaCode[] = CRITERIA;
 
-const isCode = (v: string): v is CriteriaCode => (ORDER as readonly string[]).includes(v);
+const isCode = (value: string): value is CriteriaCode =>
+  (ORDER as readonly string[]).includes(value);
 
-const normalizeCriteria = (arr: readonly (string | CriteriaCode)[]): CriteriaCode[] =>
-  Array.from(new Set(arr))
+const normalizeCriteria = (values: readonly (string | CriteriaCode)[]): CriteriaCode[] =>
+  Array.from(new Set(values))
     .filter(isCode)
     .sort((a, b) => ORDER.indexOf(a) - ORDER.indexOf(b));
 
-const fmtHa = (v: number | null) => (v == null ? "—" : `${Number(v).toLocaleString("en-CA")} ha`);
+const fmtHa = (value: number | null): string =>
+  value == null ? "—" : `${Number(value).toLocaleString("en-CA")} ha`;
 
-const titleOf = (data: ApiWorldHeritageDto) =>
+const titleOf = (data: ApiWorldHeritageDto): string =>
   data.heritage_name_jp || data.official_name || data.name;
 
-const countryLabelOf = (data: ApiWorldHeritageDto) => data.country_name_jp || data.country || null;
+const countryLabelOf = (data: ApiWorldHeritageDto): string | null =>
+  data.country_name_jp || data.country || null;
 
-const subtitleOf = (data: ApiWorldHeritageDto) =>
+const subtitleOf = (data: ApiWorldHeritageDto): string =>
   [countryLabelOf(data), data.region].filter(Boolean).join(" · ");
 
 const toStatePartyLabelsJp = (codes: readonly string[]): string[] =>
@@ -31,14 +34,16 @@ const toStatePartyLabelsJp = (codes: readonly string[]): string[] =>
 const normalizeStatePartiesMeta = (
   meta: ApiWorldHeritageDto["state_parties_meta"],
 ): WorldHeritageVm["statePartiesMeta"] => {
-  if (Array.isArray(meta)) return {};
+  if (Array.isArray(meta)) {
+    return {};
+  }
 
   return Object.fromEntries(
-    Object.entries(meta).map(([k, v]) => [
-      k,
+    Object.entries(meta).map(([key, value]) => [
+      key,
       {
-        isPrimary: v.is_primary,
-        inscriptionYear: v.inscription_year,
+        isPrimary: value.is_primary,
+        inscriptionYear: value.inscription_year,
       },
     ]),
   );

client/src/app/features/search/apis/index.test.ts

@@ -91,13 +91,13 @@ describe("createSearchApi", () => {
 
       const out = await api.searchHeritages({
         keyword: "Japan",
-        region: "APA",
+        region: "Asia",
         category: "Cultural",
         currentPage: 2,
         perPage: 10,
       });
 
-      const expectedUrl = `${ENDPOINT}?search_query=Japan&region=APA&category=Cultural&current_page=2&per_page=10`;
+      const expectedUrl = `${ENDPOINT}?search_query=Japan&region=Asia&category=Cultural&current_page=2&per_page=10`;
 
       expect(fetchSpy).toHaveBeenCalledWith(
         expectedUrl,

client/src/app/features/search/apis/search-api.ts

@@ -1,4 +1,9 @@
-import type { ApiWorldHeritageDto, ListResult, Pagination } from "../../../../domain/types";
+import type {
+  ApiWorldHeritageDto,
+  ListResult,
+  Pagination,
+  StudyRegion,
+} from "../../../../domain/types";
 
 export type SearchApiDeps = {
   apiBase: string;
@@ -7,7 +12,7 @@ export type SearchApiDeps = {
 
 export type SearchParams = {
   keyword?: string;
-  region?: string;
+  region?: StudyRegion;
   category?: string;
   yearInscribedFrom?: number;
   yearInscribedTo?: number;
@@ -47,10 +52,10 @@ export const createSearchApi = ({ apiBase, fetchImpl = fetch }: SearchApiDeps) =
     const queryParams = new URLSearchParams();
 
     const keyword = params.keyword?.trim();
-    const region = params.region?.trim();
+    const region = params.region;
     const category = params.category?.trim();
-    const yearInscribedFrom = params.yearInscribedFrom?.toString().trim();
-    const yearInscribedTo = params.yearInscribedTo?.toString().trim();
+    const yearInscribedFrom = params.yearInscribedFrom?.toString();
+    const yearInscribedTo = params.yearInscribedTo?.toString();
 
     if (keyword) queryParams.set("search_query", keyword);
     if (region) queryParams.set("region", region);