diff --git a/src/app/core/services/basic-fee.service.ts b/src/app/core/services/basic-fee.service.ts index f86b175..a23038a 100644 --- a/src/app/core/services/basic-fee.service.ts +++ b/src/app/core/services/basic-fee.service.ts @@ -16,7 +16,7 @@ export class BasicFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getBasicFees(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBasicFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBasicFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToBasicFees(response))); } diff --git a/src/app/core/services/carnet-fee.service.ts b/src/app/core/services/carnet-fee.service.ts index e342a6e..6ff3f3b 100644 --- a/src/app/core/services/carnet-fee.service.ts +++ b/src/app/core/services/carnet-fee.service.ts @@ -16,7 +16,7 @@ export class CarnetFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getFeeCommissions(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetFeeComm?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetFeeComm/${spid}/ACTIVE`).pipe( map(response => this.mapToFeeCommissions(response))); } diff --git a/src/app/core/services/continuation-sheet-fee.service.ts b/src/app/core/services/continuation-sheet-fee.service.ts index 3c71260..de206ca 100644 --- a/src/app/core/services/continuation-sheet-fee.service.ts +++ b/src/app/core/services/continuation-sheet-fee.service.ts @@ -16,7 +16,7 @@ export class ContinuationSheetFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getContinuationSheets(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCsFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCsFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToContinuationSheetFee(response))); } diff --git a/src/app/core/services/counterfoil-fee.service.ts b/src/app/core/services/counterfoil-fee.service.ts index 4bc140c..0d28839 100644 --- a/src/app/core/services/counterfoil-fee.service.ts +++ b/src/app/core/services/counterfoil-fee.service.ts @@ -16,7 +16,7 @@ export class CounterfoilFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getCounterfoils(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCfFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetCfFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToCounterFoilFee(response))); } diff --git a/src/app/core/services/expedited-fee.service.ts b/src/app/core/services/expedited-fee.service.ts index b8b94ba..31da534 100644 --- a/src/app/core/services/expedited-fee.service.ts +++ b/src/app/core/services/expedited-fee.service.ts @@ -16,7 +16,7 @@ export class ExpeditedFeeService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getExpeditedFees(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetEfFeeRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetEfFeeRates/${spid}/ACTIVE`).pipe( map(response => this.mapToExpeditedFee(response))); } diff --git a/src/app/core/services/security-deposit.service.ts b/src/app/core/services/security-deposit.service.ts index f683a07..b5ef98d 100644 --- a/src/app/core/services/security-deposit.service.ts +++ b/src/app/core/services/security-deposit.service.ts @@ -16,7 +16,7 @@ export class SecurityDepositService { constructor(private http: HttpClient, private userService: UserService, private commonService: CommonService) { } getSecurityDeposits(spid: number): Observable { - return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBondRates?P_SPID=${spid}&P_ACTIVE_INACTIVE=ACTIVE`).pipe( + return this.http.get(`${this.apiUrl}/${this.apiDb}/GetBondRates/${spid}/ACTIVE`).pipe( map(response => this.mapToSecurityDeposit(response))); }