Merge branch 'feature/unit-testing' into feature/unit-testing-search-…

…address-from-partial-zipcode
GoQSystemInc · May 1, 2024 · 024c41d · 024c41d
2 parents d2aa7c8 + 9b42acd
commit 024c41d
Show file tree

Hide file tree

Showing 6 changed files with 19 additions and 10 deletions.
diff --git a/src/test/constants/address.ts b/src/test/constants/address.ts
@@ -1,6 +1,6 @@
-import { Address } from '../type/type';
+import { Address, UnHyphenatedZipCode } from '../type/type';
 
-export const addresses: Address[] = [
+export const addresses: Address<UnHyphenatedZipCode>[] = [
   {
     zipcode: '7340001',
     pref: '広島県',

diff --git a/src/test/constants/addressIncludingHyphenDataList.ts b/src/test/constants/addressIncludingHyphenDataList.ts
@@ -1,4 +1,6 @@
-export const addressIncludingHyphenDataList = [
+import type { Address, HyphenatedZipCode } from '../type/type';
+
+export const addressIncludingHyphenDataList: Address<HyphenatedZipCode>[] = [
   {
     zipcode: '734-0001',
     pref: '広島県',

diff --git a/src/test/convertHyphenatedZipCode.test.ts b/src/test/convertHyphenatedZipCode.test.ts
@@ -1,7 +1,6 @@
 import { expect } from '@jest/globals';
 import { goqZipCode } from './utils/goqZipCode';
-import { addresses } from './constants/address';
-import { addressIncludingHyphenDataList } from './constants';
+import { addresses, addressIncludingHyphenDataList } from './constants';
 
 describe('オプションによってハイフンを付与', () => {
   test('オプションでハイフンありを指定している場合、郵便番号にハイフンを追加する', () => {

diff --git a/src/test/convertZipCode.test.ts b/src/test/convertZipCode.test.ts
@@ -3,6 +3,7 @@ import { goqZipCode } from './utils/goqZipCode';
 
 describe('convertZipCodeの動作をテスト', () => {
   const expectedZipCodeExcludingHyphen = '7320021';
+
   test('全角の郵便番号を半角に変換', () => {
     expect(goqZipCode.convertZipCode('７３２００２１')).toBe(
       expectedZipCodeExcludingHyphen

diff --git a/src/test/type/type.ts b/src/test/type/type.ts
@@ -1,6 +1,9 @@
-export type Address = {
-  zipcode: string;
+export type Address<ZipCode extends string> = {
+  zipcode: ZipCode;
   pref: string;
   city: string;
   town: string;
 };
+
+export type UnHyphenatedZipCode = `${string}`;
+export type HyphenatedZipCode = `${string}-${string}`;
diff --git a/src/test/utils/goqZipCode.ts b/src/test/utils/goqZipCode.ts
@@ -1,4 +1,8 @@
-import type { Address } from '../type/type';
+import type {
+  Address,
+  HyphenatedZipCode,
+  UnHyphenatedZipCode,
+} from '../type/type';
 
 export const goqZipCode = {
   convertZipCode: function (testZipCode: string): string {
@@ -29,8 +33,8 @@ export const goqZipCode = {
 
   convertHyphenatedZipCode: function (
     hasOptionHyphen: boolean,
-    addresses: Address[]
-  ): Address[] {
+    addresses: Address<string>[]
+  ): Address<UnHyphenatedZipCode | HyphenatedZipCode>[] {
     if (hasOptionHyphen === false) {
       return addresses;
     }