Merge branch 'master' into develop

Kyusung4698 · Jul 28, 2020 · c698d8a · c698d8a
2 parents ac398bc + 873de04
commit c698d8a
Show file tree

Hide file tree

Showing 8 changed files with 117 additions and 12 deletions.
diff --git a/src/app/data/poe-ninja/service/currency-overview-http.service.spec.ts b/src/app/data/poe-ninja/service/currency-overview-http.service.spec.ts
@@ -0,0 +1,38 @@
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import { BrowserModule } from '@angular/platform-browser';
+import { AssetService } from '@app/assets';
+import { TradeLeaguesHttpLeague } from '@data/poe/schema';
+import { CurrencyOverviewHttpService } from './currency-overview-http.service';
+
+describe('CurrencyOverviewHttpService', () => {
+  let sut: CurrencyOverviewHttpService;
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        HttpClientModule,
+        BrowserModule
+      ]
+    }).compileComponents();
+    sut = TestBed.inject<CurrencyOverviewHttpService>(CurrencyOverviewHttpService);
+    const asset = TestBed.inject<AssetService>(AssetService);
+    await asset.load().toPromise();
+  });
+
+  const leagueMap = {
+    [TradeLeaguesHttpLeague.Standard]: 'standard',
+    [TradeLeaguesHttpLeague.Hardcore]: 'hardcore',
+    ['Harvest']: 'challenge',
+    ['Hardcore Harvest']: 'challengehc',
+  };
+
+  Object.keys(leagueMap).forEach(key => {
+    it(`getLeaguePath('${key}') should be '${leagueMap[key]}'`, () => {
+      const result = sut.getLeaguePath(key);
+      expect(result).toBe(leagueMap[key]);
+    });
+  });
+});
diff --git a/src/app/data/poe-ninja/service/currency-overview-http.service.ts b/src/app/data/poe-ninja/service/currency-overview-http.service.ts
@@ -5,6 +5,7 @@ import { environment } from '@env/environment';
 import { Observable, of, throwError } from 'rxjs';
 import { delay, flatMap, retryWhen } from 'rxjs/operators';
 import { CurrencyOverviewResponse } from '../schema/currency-overview';
+import { OverviewHttpService } from './overview-http.service';
 
 export enum CurrencyOverviewType {
     Currency = 'Currency',
@@ -22,11 +23,13 @@ const RETRY_DELAY = 100;
 @Injectable({
     providedIn: 'root'
 })
-export class CurrencyOverviewHttpService {
+export class CurrencyOverviewHttpService extends OverviewHttpService {
     private readonly baseUrl: string;
 
     constructor(
-        private readonly httpClient: HttpClient) {
+        private readonly httpClient: HttpClient
+    ) {
+        super();
         this.baseUrl = `${environment.poeNinja.baseUrl}/api/data/currencyoverview`;
     }
 
@@ -48,7 +51,7 @@ export class CurrencyOverviewHttpService {
 
                 const result: CurrencyOverviewResponse = {
                     lines: response.lines,
-                    url: `${environment.poeNinja.baseUrl}/challenge/${PATH_TYPE_MAP[type]}`
+                    url: `${environment.poeNinja.baseUrl}/${this.getLeaguePath(leagueId)}/${PATH_TYPE_MAP[type]}`
                 };
                 return of(result);
             })

diff --git a/src/app/data/poe-ninja/service/item-overview-http.service.spec.ts b/src/app/data/poe-ninja/service/item-overview-http.service.spec.ts
@@ -0,0 +1,38 @@
+import { CommonModule } from '@angular/common';
+import { HttpClientModule } from '@angular/common/http';
+import { TestBed } from '@angular/core/testing';
+import { BrowserModule } from '@angular/platform-browser';
+import { AssetService } from '@app/assets';
+import { TradeLeaguesHttpLeague } from '@data/poe/schema';
+import { ItemOverviewHttpService } from './item-overview-http.service';
+
+describe('ItemOverviewHttpService', () => {
+  let sut: ItemOverviewHttpService;
+
+  beforeEach(async () => {
+    TestBed.configureTestingModule({
+      imports: [
+        CommonModule,
+        HttpClientModule,
+        BrowserModule
+      ]
+    }).compileComponents();
+    sut = TestBed.inject<ItemOverviewHttpService>(ItemOverviewHttpService);
+    const asset = TestBed.inject<AssetService>(AssetService);
+    await asset.load().toPromise();
+  });
+
+  const leagueMap = {
+    [TradeLeaguesHttpLeague.Standard]: 'standard',
+    [TradeLeaguesHttpLeague.Hardcore]: 'hardcore',
+    ['Harvest']: 'challenge',
+    ['Hardcore Harvest']: 'challengehc',
+  };
+
+  Object.keys(leagueMap).forEach(key => {
+    it(`getLeaguePath('${key}') should be '${leagueMap[key]}'`, () => {
+      const result = sut.getLeaguePath(key);
+      expect(result).toBe(leagueMap[key]);
+    });
+  });
+});
diff --git a/src/app/data/poe-ninja/service/item-overview-http.service.ts b/src/app/data/poe-ninja/service/item-overview-http.service.ts
@@ -5,6 +5,7 @@ import { environment } from '@env/environment';
 import { Observable, of, throwError } from 'rxjs';
 import { delay, flatMap, retryWhen } from 'rxjs/operators';
 import { ItemOverviewResponse } from '../schema/item-overview';
+import { OverviewHttpService } from './overview-http.service';
 
 export enum ItemOverviewType {
     Prophecy = 'Prophecy',
@@ -52,11 +53,13 @@ const RETRY_DELAY = 100;
 @Injectable({
     providedIn: 'root'
 })
-export class ItemOverviewHttpService {
+export class ItemOverviewHttpService extends OverviewHttpService {
     private readonly baseUrl: string;
 
     constructor(
-        private readonly httpClient: HttpClient) {
+        private readonly httpClient: HttpClient
+    ) {
+        super();
         this.baseUrl = `${environment.poeNinja.baseUrl}/api/data/itemoverview`;
     }
 
@@ -78,7 +81,7 @@ export class ItemOverviewHttpService {
 
                 const result: ItemOverviewResponse = {
                     lines: response.lines,
-                    url: `${environment.poeNinja.baseUrl}/challenge/${PATH_TYPE_MAP[type]}`
+                    url: `${environment.poeNinja.baseUrl}/${this.getLeaguePath(leagueId)}/${PATH_TYPE_MAP[type]}`
                 };
                 return of(result);
             })

diff --git a/src/app/data/poe-ninja/service/overview-http.service.ts b/src/app/data/poe-ninja/service/overview-http.service.ts
@@ -0,0 +1,18 @@
+import { TradeLeaguesHttpLeague } from '@data/poe/schema';
+
+export abstract class OverviewHttpService {
+    protected getLeaguePath(leagueId: string): string {
+        switch (leagueId) {
+            case TradeLeaguesHttpLeague.Standard:
+                return 'standard';
+            case TradeLeaguesHttpLeague.Hardcore:
+                return 'hardcore';
+            default:
+                const exp = new RegExp(`${TradeLeaguesHttpLeague.Hardcore} .*`);
+                if (exp.exec(leagueId)) {
+                    return 'challengehc';
+                }
+                return 'challenge';
+        }
+    }
+}
diff --git a/src/app/data/poe/schema/trade-leagues.ts b/src/app/data/poe/schema/trade-leagues.ts
@@ -2,6 +2,7 @@ import { TradeHttpResponse } from './trade';
 
 export enum TradeLeaguesHttpLeague {
     Standard = 'Standard',
+    Hardcore = 'Hardcore',
 }
 
 export interface TradeLeaguesHttpResult {

diff --git a/src/app/shared/module/poe/price/item-price-rates.provider.ts b/src/app/shared/module/poe/price/item-price-rates.provider.ts
@@ -135,9 +135,9 @@ export class ItemPriceRatesProvider {
             case ItemCategory.GemActivegem:
             case ItemCategory.GemSupportGem:
             case ItemCategory.GemSupportGemplus: {
-                    const key = `${leagueId}_${ItemCategory.Gem}`;
-                    return this.fetch(key, () => this.fetchItem(leagueId, ItemOverviewType.SkillGem));
-                }
+                const key = `${leagueId}_${ItemCategory.Gem}`;
+                return this.fetch(key, () => this.fetchItem(leagueId, ItemOverviewType.SkillGem));
+            }
             case ItemCategory.MapScarab:
             case ItemCategory.Leaguestone:
             case ItemCategory.MonsterSample:
@@ -170,7 +170,7 @@ export class ItemPriceRatesProvider {
                         change: sparkLine.totalChange,
                         history: sparkLine.data,
                         chaosAmount: line.chaosEquivalent,
-                        url: response.url
+                        url: `${response.url}${this.getUrlSuffix(line.currencyTypeName)}`
                     };
                     return rate;
                 })
@@ -199,12 +199,16 @@ export class ItemPriceRatesProvider {
                         change: sparkLine.totalChange,
                         history: sparkLine.data,
                         chaosAmount: line.chaosValue,
-                        url: response.url
+                        url: `${response.url}${this.getUrlSuffix(line.name)}`
                     };
                     return rate;
                 })
             };
             return result;
         }));
     }
+
+    private getUrlSuffix(name: string): string {
+        return `?name=${encodeURIComponent(name)}`;
+    }
 }
diff --git a/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.spec.ts b/src/app/shared/module/poe/trade/chat/trade-chat-parser.service.spec.ts
@@ -6,7 +6,7 @@ import { AssetService } from '@app/assets';
 import { TradeChatParserService } from '.';
 import { TradeParserType } from './trade-chat';
 
-fdescribe('TradeChatParserService', () => {
+describe('TradeChatParserService', () => {
     let sut: TradeChatParserService;
     beforeEach(async () => {
         TestBed.configureTestingModule({