Add v2 prefix

src/__mocks__/api/client.ts → src/__mocks__/api/v2/client.ts

@@ -1,6 +1,6 @@
-import { default as company } from '../fixtures/company.js'
-import { default as indicator } from '../fixtures/indicator.js'
-import { default as quarter } from '../fixtures/quarter.js'
+import { default as company } from '../../fixtures/v2/company.js'
+import { default as indicator } from '../../fixtures/v2/indicator.js'
+import { default as quarter } from '../../fixtures/v2/quarter.js'
 
 export class BuffettCodeApiClientV2 {
   public mockCompany = jest.fn()

src/__mocks__/api/indicator-property.ts → src/__mocks__/api/v2/indicator-property.ts

@@ -1,4 +1,4 @@
-import { default as indicator } from '../fixtures/indicator-property'
+import { default as indicator } from '../../fixtures/v2/indicator-property'
 
 export class IndicatorProperty {
   static fetch(): object {

src/__mocks__/api/quarter-property.ts → src/__mocks__/api/v2/quarter-property.ts

@@ -1,4 +1,4 @@
-import { default as quarter } from '../fixtures/quarter-property'
+import { default as quarter } from '../../fixtures/v2/quarter-property'
 
 export class QuarterProperty {
   static fetch(): object {

src/api/company-service.test.ts

@@ -1,9 +1,9 @@
 import { CompanyService } from './company-service'
-import { CachingBuffettCodeApiClientV2 } from '../api/caching-client'
+import { CachingBuffettCodeApiClientV2 } from './v2/caching-client'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
 import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
 
-jest.mock('../api/client', () => jest.requireActual('../__mocks__/api/client'))
+jest.mock('./v2/client', () => jest.requireActual('../__mocks__/api/v2/client'))
 jest.mock('../services/company-cache', () =>
   jest.requireActual('../__mocks__/services/company-cache')
 )

src/api/company-service.ts

@@ -1,4 +1,4 @@
-import { BuffettCodeApiClientV2 } from '../api/client'
+import { BuffettCodeApiClientV2 } from './v2/client'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
 import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
 

src/api/ondemand-api-period-range.test.ts

@@ -1,10 +1,10 @@
-import { CachingBuffettCodeApiClientV2 } from './caching-client'
+import { CachingBuffettCodeApiClientV2 } from './v2/caching-client'
 import { CompanyService } from './company-service'
 import { OndemandApiPeriodRange } from './ondemand-api-period-range'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
 import { YearQuarterRange } from '../fiscal-periods/year-quarter-range'
 
-jest.mock('../api/client', () => jest.requireActual('../__mocks__/api/client'))
+jest.mock('./v2/client', () => jest.requireActual('../__mocks__/api/v2/client'))
 jest.mock('../services/company-cache', () =>
   jest.requireActual('../__mocks__/services/company-cache')
 )

src/api/caching-client.test.ts → src/api/v2/caching-client.test.ts

@@ -1,19 +1,19 @@
 import { CachingBuffettCodeApiClientV2 } from './caching-client'
-import { YearQuarter } from '../fiscal-periods/year-quarter'
-import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
-import { CompanyCache } from '../__mocks__/services/company-cache'
-import { IndicatorCache } from '../services/indicator-cache'
-import { QuarterCache } from '../__mocks__/services/quarter-cache'
-
-jest.mock('./client', () => jest.requireActual('../__mocks__/api/client'))
-jest.mock('../services/company-cache', () =>
-  jest.requireActual('../__mocks__/services/company-cache')
+import { YearQuarter } from '../../fiscal-periods/year-quarter'
+import { YearQuarterParam } from '../../fiscal-periods/year-quarter-param'
+import { CompanyCache } from '../../__mocks__/services/company-cache'
+import { IndicatorCache } from '../../services/indicator-cache'
+import { QuarterCache } from '../../__mocks__/services/quarter-cache'
+
+jest.mock('./client', () => jest.requireActual('../../__mocks__/api/v2/client'))
+jest.mock('../../services/company-cache', () =>
+  jest.requireActual('../../__mocks__/services/company-cache')
 )
-jest.mock('../services/indicator-cache', () =>
-  jest.requireActual('../__mocks__/services/indicator-cache')
+jest.mock('../../services/indicator-cache', () =>
+  jest.requireActual('../../__mocks__/services/indicator-cache')
 )
-jest.mock('../services/quarter-cache', () =>
-  jest.requireActual('../__mocks__/services/quarter-cache')
+jest.mock('../../services/quarter-cache', () =>
+  jest.requireActual('../../__mocks__/services/quarter-cache')
 )
 
 describe('company', () => {

src/api/caching-client.ts → src/api/v2/caching-client.ts

@@ -1,8 +1,8 @@
 import { BuffettCodeApiClientV2 } from './client'
-import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
-import { CompanyCache } from '../services/company-cache'
-import { IndicatorCache } from '../services/indicator-cache'
-import { QuarterCache } from '../services/quarter-cache'
+import { YearQuarterParam } from '../../fiscal-periods/year-quarter-param'
+import { CompanyCache } from '../../services/company-cache'
+import { IndicatorCache } from '../../services/indicator-cache'
+import { QuarterCache } from '../../services/quarter-cache'
 
 export class CachingBuffettCodeApiClientV2 extends BuffettCodeApiClientV2 {
   constructor(token: string) {

src/api/caching-indicator-property.test.ts → src/api/v2/caching-indicator-property.test.ts

@@ -1,12 +1,12 @@
 import { CachingIndicatorProperty } from './caching-indicator-property'
-import { IndicatorPropertyCache } from '../services/indicator-property-cache'
+import { IndicatorPropertyCache } from '../../services/indicator-property-cache'
 
-jest.mock('../api/indicator-property', () =>
-  jest.requireActual('../__mocks__/api/indicator-property')
+jest.mock('./indicator-property', () =>
+  jest.requireActual('../../__mocks__/api/v2/indicator-property')
 )
 
-jest.mock('../services/indicator-property-cache', () =>
-  jest.requireActual('../__mocks__/services/indicator-property-cache')
+jest.mock('../../services/indicator-property-cache', () =>
+  jest.requireActual('../../__mocks__/services/indicator-property-cache')
 )
 
 describe('fetch', () => {

src/api/caching-indicator-property.ts → src/api/v2/caching-indicator-property.ts

@@ -1,5 +1,5 @@
 import { IndicatorProperty } from './indicator-property'
-import { IndicatorPropertyCache } from '../services/indicator-property-cache'
+import { IndicatorPropertyCache } from '../../services/indicator-property-cache'
 
 export class CachingIndicatorProperty extends IndicatorProperty {
   static fetch(): object {

src/api/caching-quarter-property.test.ts → src/api/v2/caching-quarter-property.test.ts

@@ -1,12 +1,12 @@
 import { CachingQuarterProperty } from './caching-quarter-property'
-import { QuarterPropertyCache } from '../services/quarter-property-cache'
+import { QuarterPropertyCache } from '../../services/quarter-property-cache'
 
-jest.mock('../api/quarter-property', () =>
-  jest.requireActual('../__mocks__/api/quarter-property')
+jest.mock('./quarter-property', () =>
+  jest.requireActual('../../__mocks__/api/v2/quarter-property')
 )
 
-jest.mock('../services/quarter-property-cache', () =>
-  jest.requireActual('../__mocks__/services/quarter-property-cache')
+jest.mock('../../services/quarter-property-cache', () =>
+  jest.requireActual('../../__mocks__/services/quarter-property-cache')
 )
 
 describe('fetch', () => {

src/api/caching-quarter-property.ts → src/api/v2/caching-quarter-property.ts

@@ -1,5 +1,5 @@
 import { QuarterProperty } from './quarter-property'
-import { QuarterPropertyCache } from '../services/quarter-property-cache'
+import { QuarterPropertyCache } from '../../services/quarter-property-cache'
 
 export class CachingQuarterProperty extends QuarterProperty {
   static fetch(): object {

src/api/client.test.ts → src/api/v2/client.test.ts

@@ -1,10 +1,10 @@
 import { BuffettCodeApiClientV2 } from './client'
-import { HttpError } from './http-error'
-import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
-import { useMockedUrlFetchApp } from './test-helper'
-import * as company from '../__mocks__/fixtures/company'
-import * as indicator from '../__mocks__/fixtures/indicator'
-import * as quarter from '../__mocks__/fixtures/quarter'
+import { HttpError } from '../http-error'
+import { YearQuarterParam } from '../../fiscal-periods/year-quarter-param'
+import { useMockedUrlFetchApp } from '../test-helper'
+import * as company from '../../__mocks__/fixtures/v2/company'
+import * as indicator from '../../__mocks__/fixtures/v2/indicator'
+import * as quarter from '../../__mocks__/fixtures/v2/quarter'
 
 test('HttpError#isInvalidTestingRequest', () => {
   const res1 = useMockedUrlFetchApp(

src/api/client.ts → src/api/v2/client.ts

@@ -1,6 +1,6 @@
-import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
-import { UrlBuilder } from './url-builder'
-import { HttpError } from './http-error'
+import { YearQuarterParam } from '../../fiscal-periods/year-quarter-param'
+import { UrlBuilder } from '../url-builder'
+import { HttpError } from '../http-error'
 
 export class BuffettCodeApiClientV2 {
   static readonly baseUrl = 'https://api.buffett-code.com/api/v2'

src/api/indicator-property.test.ts → src/api/v2/indicator-property.test.ts

@@ -1,7 +1,7 @@
 import { IndicatorProperty } from './indicator-property'
-import { useMockedUrlFetchApp } from './test-helper'
+import { useMockedUrlFetchApp } from '../test-helper'
 
-import { default as indicator } from '../__mocks__/fixtures/indicator-property'
+import { default as indicator } from '../../__mocks__/fixtures/v2/indicator-property'
 
 test('isIndicatorProperty', () => {
   useMockedUrlFetchApp(200, JSON.stringify(indicator))

src/api/quarter-property.test.ts → src/api/v2/quarter-property.test.ts

@@ -1,7 +1,7 @@
 import { QuarterProperty } from './quarter-property'
-import { useMockedUrlFetchApp } from './test-helper'
+import { useMockedUrlFetchApp } from '../test-helper'
 
-import { default as quarter } from '../__mocks__/fixtures/quarter-property'
+import { default as quarter } from '../../__mocks__/fixtures/v2/quarter-property'
 
 test('isQuarterProperty', () => {
   useMockedUrlFetchApp(200, JSON.stringify(quarter))

src/custom-functions/bcode-indicator.test.ts

@@ -1,12 +1,14 @@
 import { bcodeIndicator } from './bcode-indicator'
-import { CachingBuffettCodeApiClientV2 } from '../api/caching-client'
+import { CachingBuffettCodeApiClientV2 } from '../api/v2/caching-client'
 import { IndicatorCache } from '../services/indicator-cache'
 import { IndicatorPropertyCache } from '../services/indicator-property-cache'
 import { BcodeResult } from './bcode-result'
 
-jest.mock('../api/client', () => jest.requireActual('../__mocks__/api/client'))
-jest.mock('../api/indicator-property', () =>
-  jest.requireActual('../__mocks__/api/indicator-property')
+jest.mock('../api/v2/client', () =>
+  jest.requireActual('../__mocks__/api/v2/client')
+)
+jest.mock('../api/v2/indicator-property', () =>
+  jest.requireActual('../__mocks__/api/v2/indicator-property')
 )
 jest.mock('../services/indicator-cache', () =>
   jest.requireActual('../__mocks__/services/indicator-cache')

src/custom-functions/bcode-indicator.ts

@@ -1,6 +1,6 @@
 import { ApiResponseError } from './error'
-import { CachingBuffettCodeApiClientV2 } from '../api/caching-client'
-import { CachingIndicatorProperty } from '../api/caching-indicator-property'
+import { CachingBuffettCodeApiClientV2 } from '../api/v2/caching-client'
+import { CachingIndicatorProperty } from '../api/v2/caching-indicator-property'
 import { BcodeResult } from './bcode-result'
 
 export function bcodeIndicator(

src/custom-functions/bcode-label.test.ts

@@ -2,11 +2,11 @@ import { bcodeLabel } from './bcode-label'
 import { IndicatorPropertyCache } from '../services/indicator-property-cache'
 import { QuarterPropertyCache } from '../services/quarter-property-cache'
 
-jest.mock('../api/indicator-property', () =>
-  jest.requireActual('../__mocks__/api/indicator-property')
+jest.mock('../api/v2/indicator-property', () =>
+  jest.requireActual('../__mocks__/api/v2/indicator-property')
 )
-jest.mock('../api/quarter-property', () =>
-  jest.requireActual('../__mocks__/api/quarter-property')
+jest.mock('../api/v2/quarter-property', () =>
+  jest.requireActual('../__mocks__/api/v2/quarter-property')
 )
 jest.mock('../services/indicator-property-cache', () =>
   jest.requireActual('../__mocks__/services/indicator-property-cache')

src/custom-functions/bcode-label.ts

@@ -1,5 +1,5 @@
-import { CachingIndicatorProperty } from '../api/caching-indicator-property'
-import { CachingQuarterProperty } from '../api/caching-quarter-property'
+import { CachingIndicatorProperty } from '../api/v2/caching-indicator-property'
+import { CachingQuarterProperty } from '../api/v2/caching-quarter-property'
 
 export function bcodeLabel(propertyName: string): string {
   if (!propertyName) {

src/custom-functions/bcode-quarter.test.ts

@@ -1,13 +1,15 @@
 import { bcodeQuarter } from './bcode-quarter'
-import { CachingBuffettCodeApiClientV2 } from '../api/caching-client'
+import { CachingBuffettCodeApiClientV2 } from '../api/v2/caching-client'
 import { QuarterCache } from '../__mocks__/services/quarter-cache'
 import { QuarterPropertyCache } from '../services/quarter-property-cache'
 import { BcodeResult } from './bcode-result'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
 
-jest.mock('../api/client', () => jest.requireActual('../__mocks__/api/client'))
-jest.mock('../api/quarter-property', () =>
-  jest.requireActual('../__mocks__/api/quarter-property')
+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('../services/company-cache', () =>
   jest.requireActual('../__mocks__/services/company-cache')

src/custom-functions/bcode-quarter.ts

@@ -3,8 +3,8 @@ import {
   OndemandApiNotEnabledError,
   UnsupportedTickerError
 } from './error'
-import { CachingBuffettCodeApiClientV2 } from '../api/caching-client'
-import { CachingQuarterProperty } from '../api/caching-quarter-property'
+import { CachingBuffettCodeApiClientV2 } from '../api/v2/caching-client'
+import { CachingQuarterProperty } from '../api/v2/caching-quarter-property'
 import { CompanyService } from '../api/company-service'
 import { BcodeResult } from './bcode-result'
 import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'

src/custom-functions/bcode-unit.test.ts

@@ -2,11 +2,11 @@ import { bcodeUnit } from './bcode-unit'
 import { IndicatorPropertyCache } from '../services/indicator-property-cache'
 import { QuarterPropertyCache } from '../services/quarter-property-cache'
 
-jest.mock('../api/indicator-property', () =>
-  jest.requireActual('../__mocks__/api/indicator-property')
+jest.mock('../api/v2/indicator-property', () =>
+  jest.requireActual('../__mocks__/api/v2/indicator-property')
 )
-jest.mock('../api/quarter-property', () =>
-  jest.requireActual('../__mocks__/api/quarter-property')
+jest.mock('../api/v2/quarter-property', () =>
+  jest.requireActual('../__mocks__/api/v2/quarter-property')
 )
 jest.mock('../services/indicator-property-cache', () =>
   jest.requireActual('../__mocks__/services/indicator-property-cache')

src/custom-functions/bcode-unit.ts

@@ -1,5 +1,5 @@
-import { CachingIndicatorProperty } from '../api/caching-indicator-property'
-import { CachingQuarterProperty } from '../api/caching-quarter-property'
+import { CachingIndicatorProperty } from '../api/v2/caching-indicator-property'
+import { CachingQuarterProperty } from '../api/v2/caching-quarter-property'
 
 export function bcodeUnit(propertyName: string): string {
   if (!propertyName) {

src/services/company-cache.test.ts

@@ -1,5 +1,5 @@
 import { CompanyCache } from './company-cache'
-import * as companyFixture from '../__mocks__/fixtures/company'
+import * as companyFixture from '../__mocks__/fixtures/v2/company'
 import { getMock, putMock } from './cache-test-helper'
 
 const companies = companyFixture.default

src/services/csv-exporter.test.ts

@@ -1,14 +1,16 @@
 import { CsvExporter } from './csv-exporter'
 import { QuarterCache } from './quarter-cache'
-import { QuarterProperty } from '../api/quarter-property'
+import { QuarterProperty } from '../api/v2/quarter-property'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
 
-import { default as quarter } from '../__mocks__/fixtures/quarter-property'
+import { default as quarter } from '../__mocks__/fixtures/v2/quarter-property'
 
 jest.mock('../setting')
-jest.mock('../api/client', () => jest.requireActual('../__mocks__/api/client'))
-jest.mock('../api/quarter-property', () =>
-  jest.requireActual('../__mocks__/api/quarter-property')
+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('../services/quarter-property-cache', () =>
   jest.requireActual('../__mocks__/services/quarter-property-cache')

src/services/csv-exporter.ts

@@ -1,9 +1,9 @@
-import { CachingBuffettCodeApiClientV2 } from '../api/caching-client'
+import { CachingBuffettCodeApiClientV2 } from '../api/v2/caching-client'
 import { Setting } from '../setting'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
 import { YearQuarterRange } from '../fiscal-periods/year-quarter-range'
 import { YearQuarterParam } from '../fiscal-periods/year-quarter-param'
-import { CachingQuarterProperty } from '../api/caching-quarter-property'
+import { CachingQuarterProperty } from '../api/v2/caching-quarter-property'
 import { OndemandApiPeriodRange } from '../api/ondemand-api-period-range'
 import { CompanyService } from '../api/company-service'
 

src/services/indicator-cache.test.ts

@@ -1,5 +1,5 @@
 import { IndicatorCache } from './indicator-cache'
-import * as indicatorFixture from '../__mocks__/fixtures/indicator'
+import * as indicatorFixture from '../__mocks__/fixtures/v2/indicator'
 import { getMock, putMock } from './cache-test-helper'
 
 test('key', () => {

src/services/indicator-property-cache.test.ts

@@ -1,5 +1,5 @@
 import { IndicatorPropertyCache } from './indicator-property-cache'
-import * as indicatorProperty from '../__mocks__/fixtures/indicator-property'
+import * as indicatorProperty from '../__mocks__/fixtures/v2/indicator-property'
 import { getMock, putMock } from './cache-test-helper'
 
 test('get', () => {

src/services/quarter-cache.test.ts

@@ -1,6 +1,6 @@
 import { QuarterCache } from './quarter-cache'
 import { YearQuarter } from '../fiscal-periods/year-quarter'
-import * as quarterFixture from '../__mocks__/fixtures/quarter'
+import * as quarterFixture from '../__mocks__/fixtures/v2/quarter'
 import { getMock, putMock } from './cache-test-helper'
 
 test('key', () => {

src/services/quarter-property-cache.test.ts

@@ -1,5 +1,5 @@
 import { QuarterPropertyCache } from './quarter-property-cache'
-import * as quarterProperty from '../__mocks__/fixtures/quarter-property'
+import * as quarterProperty from '../__mocks__/fixtures/v2/quarter-property'
 import { getMock, putMock } from './cache-test-helper'
 
 test('get', () => {