Merge pull request #206 from saneyuki/refactor

Refactor AccountMap & related codes.
voyagegroup · Dec 27, 2016 · e753e08 · e753e08
2 parents 80cd1de + 3f94b94
commit e753e08
Show file tree

Hide file tree

Showing 4 changed files with 28 additions and 38 deletions.
diff --git a/src/agency/account/AgencyAccountGateway.ts b/src/agency/account/AgencyAccountGateway.ts
@@ -7,9 +7,8 @@ import {AccountGateway, AccountMap} from '../../public/account/AccountGateway';
 import {
     AccountId,
     SponsorData,
-    SponsorDataList,
-    dummyAgencyId,
-    dummySponsorId,
+    DUMMY_AGENCY_ID,
+    DUMMY_SPONSOR_ID,
 } from '../../public/account/AccountContract';
 
 /**
@@ -33,9 +32,9 @@ export class AgencyAccountGateway extends AccountGateway {
 
 class SponsorMap extends AccountMap {
     protected _dummyAccount: SponsorData = {
-        id: dummySponsorId,
+        id: DUMMY_SPONSOR_ID,
         exchange_id: 1,
-        agency_id: dummyAgencyId,
+        agency_id: DUMMY_AGENCY_ID,
         role: 'sponsor',
         uuid: '00000000000000000000000000000000',
         name: '不明な広告主',
@@ -51,9 +50,9 @@ async function getSponsor(driver: FetchDriver, sponsorId: AccountId): Promise<Op
     return data;
 }
 
-async function getSponsorAll(driver: FetchDriver): Promise<Option<SponsorDataList>> {
+async function getSponsorAll(driver: FetchDriver): Promise<Option<Array<SponsorData>>> {
     const PATH = '/dr/account/sponsors/';
     const res = await driver.get(PATH, {});
-    const data = await handleOkResponseToOption<SponsorDataList>(res);
+    const data = await handleOkResponseToOption<Array<SponsorData>>(res);
     return data;
 }
diff --git a/src/operator/account/OperatorAccountGateway.ts b/src/operator/account/OperatorAccountGateway.ts
@@ -7,9 +7,8 @@ import {AgencyAccountGateway} from '../../agency/account/AgencyAccountGateway';
 import {
     AccountId,
     AgencyData,
-    AgencyDataList,
-    SponsorDataList,
-    dummyAgencyId,
+    DUMMY_AGENCY_ID,
+    SponsorData,
 } from '../../public/account/AccountContract';
 import {AccountMap} from '../../public/account/AccountGateway';
 
@@ -19,7 +18,7 @@ import {AccountMap} from '../../public/account/AccountGateway';
  */
 export class OperatorAccountGateway extends AgencyAccountGateway {
 
-    getSponsorAllByAgency(agencyId: AccountId): Promise<Option<SponsorDataList>> {
+    getSponsorAllByAgency(agencyId: AccountId): Promise<Option<Array<SponsorData>>> {
         const result = getSponsorAllByAgency(this._driver, agencyId);
         return result;
     }
@@ -40,7 +39,7 @@ export class OperatorAccountGateway extends AgencyAccountGateway {
 
 export class AgencyMap extends AccountMap {
     protected _dummyAccount: AgencyData = {
-        id: dummyAgencyId,
+        id: DUMMY_AGENCY_ID,
         exchange_id: 1,
         role: 'agency',
         uuid: '00000000000000000000000000000000',
@@ -49,11 +48,11 @@ export class AgencyMap extends AccountMap {
     };
 }
 
-async function getSponsorAllByAgency(driver: FetchDriver, agencyId: AccountId): Promise<Option<SponsorDataList>> {
+async function getSponsorAllByAgency(driver: FetchDriver, agencyId: AccountId): Promise<Option<Array<SponsorData>>> {
     const PATH = '/dr/account/sponsors/';
     const url = `${PATH}/?agency_id=${String(agencyId)}`;
     const res = await driver.get(url, {});
-    const data = await handleOkResponseToOption<SponsorDataList>(res);
+    const data = await handleOkResponseToOption<Array<SponsorData>>(res);
     return data;
 }
 
@@ -65,9 +64,9 @@ async function getAgency(driver: FetchDriver, agencyId: AccountId): Promise<Opti
     return data;
 }
 
-async function getAgencyAll(driver: FetchDriver): Promise<Option<AgencyDataList>> {
+async function getAgencyAll(driver: FetchDriver): Promise<Option<Array<SponsorData>>> {
     const PATH = '/dr/account/agencies/';
     const res = await driver.get(PATH, {});
-    const data = await handleOkResponseToOption<AgencyDataList>(res);
+    const data = await handleOkResponseToOption<Array<SponsorData>>(res);
     return data;
 }
diff --git a/src/public/account/AccountContract.ts b/src/public/account/AccountContract.ts
@@ -14,23 +14,15 @@ export interface AccountData {
     readonly name: string; // 社名
     readonly person: string; // 担当者名
 }
-export type AccountDataList = Array<AccountData>;
-export type AccountDataMap = Map<AccountId, AccountData>;
 
-export const dummyAgencyId = 3000;
-export const dummySponsorId = 3000;
+export const DUMMY_AGENCY_ID = 3000;
+export const DUMMY_SPONSOR_ID = 3000;
 
 export interface AgencyData extends AccountData {
     readonly role: 'agency';
 }
 
-export type AgencyDataList = Array<AgencyData>;
-export type AgencyDataMap = Map<AccountId, AgencyData>;
-
 export interface SponsorData extends AccountData {
     readonly role: 'sponsor';
     readonly agency_id: AccountId; // 属するAgencyData.idと一致する
 }
-
-export type SponsorDataList = Array<SponsorData>;
-export type SponsorDataMap = Map<AccountId, SponsorData>;
diff --git a/src/public/account/AccountGateway.ts b/src/public/account/AccountGateway.ts
@@ -4,7 +4,7 @@ import {Result} from 'option-t/src/Result';
 import {FetchDriver} from '../../lib/FetchDriver';
 import {handleOkResponseToResult} from '../../lib/FetchHelper';
 
-import {AccountId, AccountData, AccountDataList, AccountDataMap} from './AccountContract';
+import {AccountId, AccountData} from './AccountContract';
 
 export type AccountInfoResult = Result<AccountData, string>;
 
@@ -31,19 +31,11 @@ export class AccountGateway {
 }
 
 export abstract class AccountMap {
-    protected _map: AccountDataMap;
+    protected _map: Map<AccountId, AccountData>;
     protected _dummyAccount: AccountData;
 
-    constructor(accountList: Option<AccountDataList>) {
-        this._map = this._generateAccountMap(accountList);
-    }
-
-    _generateAccountMap(accountList: Option<AccountDataList>): AccountDataMap {
-        const map = new Map();
-        for (const row of accountList.unwrapOr([])) {
-            map.set(row.id, row);
-        }
-        return map;
+    constructor(accountList: Option<Array<AccountData>>) {
+        this._map = generateAccountMap(accountList);
     }
 
     get(accountId: AccountId): AccountData {
@@ -56,6 +48,14 @@ export abstract class AccountMap {
     }
 }
 
+function generateAccountMap(accountList: Option<Array<AccountData>>): Map<AccountId, AccountData> {
+    const map = new Map();
+    for (const row of accountList.unwrapOr([])) {
+        map.set(row.id, row);
+    }
+    return map;
+}
+
 export async function getAccountInformation(driver: FetchDriver, param?: GetAccountInfoArgs): Promise<AccountInfoResult> {
     const PATH = '/dr/account/me';
     let url = PATH;