Remove convert price for hotel rate (#131)

* Remove convertPrice for hotel rate and fix test * Bump version * Update prod build * Remove convertPrice to selected currency in updateCurrency * Update prod build * Update travis config

Author: XavierEr

.travis.yml

@@ -1,7 +1,8 @@
 language: node_js
 sudo: required
 dist: trusty
-node_js: stable
+node_js:
+ - 14
 addons:
  apt:
  sources:

dist/WegoSdk.js

@@ -1,6 +1,6 @@
 {
  "name": "wego-sdk",
- "version": "1.4.8",
+ "version": "1.5.0",
  "description": "Wego SDK",
  "main": "dist/WegoSdk.js",
  "files": [

package.json

@@ -50,14 +50,6 @@ HotelSearchClient.prototype = {
  updateCurrency: function (currency) {
  this.currency = currency;
 
- var hotelMap = this.__hotelMap;
- for (var hotelId in hotelMap) {
- hotelMap[hotelId].rates.forEach(function (rate) {
- rate.price = dataUtils.convertPrice(rate.price, currency);
- });
- }
- this._cloneHotels(Object.keys(hotelMap));
-
  var filter = this.__filter;
  filter.minPrice = dataUtils.convertPrice(filter.minPrice, currency);
  filter.maxPrice = dataUtils.convertPrice(filter.maxPrice, currency);
@@ -104,7 +96,7 @@ HotelSearchClient.prototype = {
  var self = this;
 
  newRates.forEach(function (newRate) {
- dataUtils.prepareRate(newRate, self.currency, self.__staticData);
+ dataUtils.prepareRateProvider(newRate, self.__staticData);
 
  var hotelId = newRate.hotelId;
  var hotel = self.__hotelMap[hotelId];

src/hotel-search/Merger.js

@@ -55,9 +55,8 @@ module.exports = {
  }
  },
 
- prepareRate: function (rate, currency, staticData) {
+ prepareRateProvider: function (rate, staticData) {
  rate.provider = staticData.providers[rate.providerCode];
- rate.price = this.convertPrice(rate.price, currency);
  },
 
  convertPrice: function (price, currency) {

src/hotel-search/dataUtils.js

@@ -116,45 +116,6 @@ describe("HotelSearchClient", function () {
  expect(hotelIds).to.deep.equal([2]);
  });
 
- it("#updateCurrency", function () {
- var hotels, filter;
- var client = new HotelSearchClient(hotelSearchEndpointUrl, {
- onHotelsChanged: function (_hotels) {
- hotels = _hotels;
- },
- onDisplayedFilterChanged: function (_filter) {
- filter = _filter;
- }
- });
-
- mockAjaxCall(client);
-
- var hotel = {
- id: 1
- };
-
- client.handleSearchResponse({
- hotels: [hotel],
- rates: [
- {
- hotelId: 1,
- price: {
- currencyCode: "SGD",
- amount: 1000,
- amountUsd: 100
- }
- }
- ]
- });
-
- client.updateCurrency({
- code: "VND",
- rate: 2
- });
-
- expect(hotels[0].rates[0].price.amount).to.equal(200);
- });
-
  describe("#searchHotels", function () {
  it("start poller", function () {
  client.poller.timer = null;

test/hotel-search/HotelSearchClient.spec.js

@@ -17,49 +17,6 @@ describe('Merger', function() {
  });
 
  describe('#updateCurrency', function() {
- it('update hotel rate', function() {
- var hotel = {
- id: 1,
- };
-
- var roomsCount = 1;
- var nightsCount = 2;
- var amountUsd = 10.15;
- var totalAmountUsd = amountUsd * roomsCount * nightsCount;
-
- var rate = {
- hotelId: 1,
- price: {
- currencyCode: 'vnd',
- amountUsd: 10.15,
- totalAmountUsd: totalAmountUsd
- }
- };
-
- var currency = {
- code: 'sgd',
- rate: 2,
- };
-
- merger.mergeResponse({
- hotels: [hotel],
- rates: [rate]
- });
-
- var oldHotels = merger.getHotels();
- var oldHotel = oldHotels[0];
-
- merger.updateCurrency(currency);
-
- var newHotels = merger.getHotels();
- var newHotel = newHotels[0];
-
- expect(newHotel.rates[0].price.amount).to.equal(20);
- expect(newHotel.rates[0].price.totalAmount).to.equal(40);
- expect(newHotels).to.not.equal(oldHotels);
- expect(newHotel).to.not.equal(oldHotel);
- });
-
  it('update minPrice', function() {
  merger.mergeResponse({
  filter: {

test/hotel-search/Merger.spec.js

@@ -85,7 +85,7 @@ describe('dataUtils', function() {
  })
  });
 
- describe('#prepareRate', function() {
+ describe('#prepareRateProvider', function() {
  it('provider', function() {
  var providerCode = 1;
  var provider = {
@@ -96,32 +96,14 @@ describe('dataUtils', function() {
  providerCode: providerCode,
  };
 
- dataUtils.prepareRate(rate, {}, createStaticData({
+ dataUtils.prepareRateProvider(rate, createStaticData({
  providers: {
  1: provider
  }
  }));
 
  expect(rate.provider).to.equal(provider);
  });
-
- it('price', function() {
- var rate = {
- price: {
- currencyCode: 'VND',
- amountUsd: 10,
- }
- };
-
- var currency = {
- code: 'SGD',
- rate: 2
- };
-
- dataUtils.prepareRate(rate, currency, createStaticData());
-
- expect(rate.price.amount).to.equal(20);
- })
  });
 
  describe('#convertPrice', function() {