Use v3 endpoint in csv exporter

src/entities/v3/daily.test.ts

@@ -0,0 +1,24 @@
+import * as response from '~/__mocks__/fixtures/v3/daily'
+import { Daily } from '~/entities/v3/daily'
+
+const daily = Daily.fromResponse(response)
+
+test('period', () => {
+  expect(daily.period()).toEqual(new Date('2020-09-06'))
+})
+
+test('propertyNames', () => {
+  expect(daily.propertyNames()).toEqual(
+    Object.keys(response['column_description'])
+  )
+})
+
+test('labelOf', () => {
+  expect(daily.labelOf('day')).toEqual('日付')
+  expect(daily.labelOf('market_capital')).toEqual('時価総額')
+})
+
+test('unitOf', () => {
+  expect(daily.unitOf('day')).toEqual('単位無し')
+  expect(daily.unitOf('market_capital')).toEqual('円')
+})

src/entities/v3/daily.ts

@@ -1,8 +1,40 @@
-export class Daily {
+import { HasColumnDescription, HasPeriod } from '~/entities/v3/interface'
+
+export class Daily implements HasColumnDescription, HasPeriod<Date> {
   constructor(readonly data: object, readonly columnDescription: object) {
     // noop
   }
 
+  period(): Date {
+    return new Date(this.data['day'])
+  }
+
+  propertyNames(): string[] {
+    return Object.keys(this.columnDescription)
+  }
+
+  labelOf(propertyName: string): string | null {
+    const desc = this.columnDescriptionOf(propertyName)
+    if (desc) {
+      return desc['name_jp']
+    } else {
+      return null
+    }
+  }
+
+  unitOf(propertyName: string): string | null {
+    const desc = this.columnDescriptionOf(propertyName)
+    if (desc) {
+      return desc['unit']
+    } else {
+      return null
+    }
+  }
+
+  private columnDescriptionOf(propertyName: string): string | null {
+    return this.columnDescription[propertyName]
+  }
+
   static fromResponse(response: object): Daily {
     return new Daily(response['data'], response['column_description'])
   }

src/entities/v3/interface.ts

@@ -0,0 +1,11 @@
+export interface HasColumnDescription {
+  propertyNames(): string[]
+
+  labelOf(propertyName: string): string | null
+
+  unitOf(propertyName: string): string | null
+}
+
+export interface HasPeriod<T> {
+  period(): T
+}

src/entities/v3/quarter.test.ts

@@ -0,0 +1,25 @@
+import * as response from '~/__mocks__/fixtures/v3/quarter'
+import { Quarter } from '~/entities/v3/quarter'
+import { YearQuarter } from '~/fiscal-periods/year-quarter'
+
+const quarter = Quarter.fromResponse(response)
+
+test('period', () => {
+  expect(quarter.period()).toEqual(new YearQuarter(2018, 1))
+})
+
+test('propertyNames', () => {
+  expect(quarter.propertyNames()).toEqual(
+    Object.keys(response['column_description'])
+  )
+})
+
+test('labelOf', () => {
+  expect(quarter.labelOf('fiscal_year')).toEqual('会計年度')
+  expect(quarter.labelOf('net_sales')).toEqual('売上')
+})
+
+test('unitOf', () => {
+  expect(quarter.unitOf('fiscal_year')).toEqual('なし')
+  expect(quarter.unitOf('net_sales')).toEqual('円')
+})

src/entities/v3/quarter.ts

@@ -1,8 +1,44 @@
-export class Quarter {
+import { HasColumnDescription, HasPeriod } from '~/entities/v3/interface'
+import { YearQuarter } from '~/fiscal-periods/year-quarter'
+
+export class Quarter implements HasColumnDescription, HasPeriod<YearQuarter> {
   constructor(readonly data: object, readonly columnDescription: object) {
     // noop
   }
 
+  period(): YearQuarter {
+    return new YearQuarter(
+      this.data['fiscal_year'],
+      this.data['fiscal_quarter']
+    )
+  }
+
+  propertyNames(): string[] {
+    return Object.keys(this.columnDescription)
+  }
+
+  labelOf(propertyName: string): string | null {
+    const desc = this.columnDescriptionOf(propertyName)
+    if (desc) {
+      return desc['name_jp']
+    } else {
+      return null
+    }
+  }
+
+  unitOf(propertyName: string): string | null {
+    const desc = this.columnDescriptionOf(propertyName)
+    if (desc) {
+      return desc['unit']
+    } else {
+      return null
+    }
+  }
+
+  private columnDescriptionOf(propertyName: string): string | null {
+    return this.columnDescription[propertyName]
+  }
+
   static fromResponse(response: object): Quarter {
     return new Quarter(response['data'], response['column_description'])
   }

src/services/csv-exporter.test.ts

@@ -1,15 +1,11 @@
-import { default as quarter } from '~/__mocks__/fixtures/v2/quarter-property'
-import { QuarterProperty } from '~/api/v2/quarter-property'
+import { default as quarter } from '~/__mocks__/fixtures/v3/quarter'
 import { YearQuarter } from '~/fiscal-periods/year-quarter'
 import { CsvExporter } from '~/services/csv-exporter'
 import { QuarterCache } from '~/services/quarter-cache'
 
 jest.mock('~/setting', () => jest.requireActual('~/__mocks__/setting'))
-jest.mock('~/api/v2/client', () =>
-  jest.requireActual('~/__mocks__/api/v2/client')
-)
-jest.mock('~/api/v2/quarter-property', () =>
-  jest.requireActual('~/__mocks__/api/v2/quarter-property')
+jest.mock('~/api/v3/client', () =>
+  jest.requireActual('~/__mocks__/api/v3/client')
 )
 jest.mock('~/services/quarter-property-cache', () =>
   jest.requireActual('~/__mocks__/services/quarter-property-cache')
@@ -21,8 +17,10 @@ jest.mock('~/services/quarter-cache', () =>
   jest.requireActual('~/__mocks__/services/quarter-cache')
 )
 
-const fiscalYearIndex = Object.keys(quarter).indexOf('fiscal_year')
-const fiscalQuarterIndex = Object.keys(quarter).indexOf('fiscal_quarter')
+const columnDescription = quarter['column_description']
+const propertyNames = Object.keys(columnDescription)
+const fiscalYearIndex = propertyNames.indexOf('fiscal_year')
+const fiscalQuarterIndex = propertyNames.indexOf('fiscal_quarter')
 
 describe('generateData', () => {
   test('uncached', () => {
@@ -34,7 +32,7 @@ describe('generateData', () => {
 
     const data = CsvExporter.generateData(ticker, from, to, today)
 
-    expect(data.length).toBe(QuarterProperty.names().length + 1)
+    expect(data.length).toBe(propertyNames.length + 1)
     expect(data[0].length).toBe(3 + 1)
     expect(data[0]).toEqual(['キー', '項目名', '単位', from])
     expect(data[fiscalYearIndex + 1]).toEqual([
@@ -65,7 +63,7 @@ describe('generateData', () => {
 
     const data = CsvExporter.generateData(ticker, from, to, today)
 
-    expect(data.length).toBe(QuarterProperty.names().length + 1)
+    expect(data.length).toBe(propertyNames.length + 1)
     expect(data[0].length).toBe(3 + 1)
     expect(data[0]).toEqual(['キー', '項目名', '単位', from])
     expect(data[fiscalYearIndex + 1]).toEqual([

src/services/csv-exporter.ts

@@ -1,7 +1,6 @@
 import { CompanyService } from '~/api/company-service'
 import { OndemandApiPeriodRange } from '~/api/ondemand-api-period-range'
-import { CachingBuffettCodeApiClientV2 } from '~/api/v2/caching-client'
-import { CachingQuarterProperty } from '~/api/v2/caching-quarter-property'
+import { CachingBuffettCodeApiClientV3 } from '~/api/v3/caching-client'
 import { YearQuarter } from '~/fiscal-periods/year-quarter'
 import { YearQuarterParam } from '~/fiscal-periods/year-quarter-param'
 import { YearQuarterRange } from '~/fiscal-periods/year-quarter-range'
@@ -23,7 +22,7 @@ export class CsvExporter {
     const range = new YearQuarterRange(fromYearQuarter, toYearQuarter)
 
     const setting = Setting.load()
-    const client = new CachingBuffettCodeApiClientV2(setting.token)
+    const client = new CachingBuffettCodeApiClientV3(setting.token)
     const companyService = new CompanyService(ticker, client, today)
     if (!companyService.isSupportedTicker()) {
       throw new Error('<<サポートされていないtickerです>>')
@@ -65,8 +64,8 @@ export class CsvExporter {
     }
 
     const sortedQuarters = quarters.slice().sort((a, b) => {
-      const labelA = `${a['fiscal_year']}Q${a['fiscal_quarter']}`
-      const labelB = `${b['fiscal_year']}Q${b['fiscal_quarter']}`
+      const labelA = a.period().toString()
+      const labelB = b.period().toString()
       if (labelA > labelB) {
         return 1
       } else if (labelA < labelB) {
@@ -76,18 +75,14 @@ export class CsvExporter {
       }
     })
 
-    const quarterLabels = sortedQuarters.map(
-      quarter => `${quarter['fiscal_year']}Q${quarter['fiscal_quarter']}`
+    const quarter = quarters[0]
+    const quarterLabels = sortedQuarters.map(quarter =>
+      quarter.period().toString()
     )
     const header = [['キー', '項目名', '単位', ...quarterLabels]]
-    const values = CachingQuarterProperty.names().map(name => {
-      const data = sortedQuarters.map(quarter => quarter[name])
-      return [
-        name,
-        CachingQuarterProperty.labelOf(name),
-        CachingQuarterProperty.unitOf(name),
-        ...data
-      ]
+    const values = quarter.propertyNames().map(name => {
+      const data = sortedQuarters.map(quarter => quarter.data[name])
+      return [name, quarter.labelOf(name), quarter.unitOf(name), ...data]
     })
 
     return [...header, ...values]