Skip to content

Commit

Permalink
Mob 4140 post release 1 6 2 [MASTER] (#150)
Browse files Browse the repository at this point in the history
* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resource_class to medium to fit our price plan

* revert Xcode to 12.0, revert resource_class to xlarge, and change bundler version to 2.2.7 - working UISDK config

* try solution proposed by Mikolaj

* going back to xcode 12.2 and large resource_class

* using medium resource_class

* update fastlane

* update fastlane take 2

* circleci sanity check

* test removing ssh key

* reverting last commit

* adjust bundler version

* test circleci

* update to xcode 13

* update fastlane

* remove fastline update, run bundle install before installing specific gem

* Use xcode 12.5.1

* Minor change

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Diana Petrea <[email protected]>

* [MOB-3633] Add Loyalty API (#119)

* Add endpoints

* LoyaltyStatus API Added

* Add LoyaltyPoints model

* Fix up the API endpoints

* LoyaltyStatus Interactor

* Edit APIEndpoint again

* Update LoyaltyService

* LoyaltyBurn interactor

* Loyaltyearn Interactor

* Update LoyaltyService

* PreAuth interactor

* Update service

* Add mocks

* Preauth mock

* Add tests

* Add remaining tests

* Update PreAuth interactor

* Remove Integration Tests (Not ready)

* Fix loyaltyservice for preauth

* Fix tests

* Make requested changes to LoyaltyPreAuth

* points to burnPoints

* Guard currency

* Fix broken test

* Add new status test to make sure request is setup correctly

* Fix loyaltyStatus?

* cicleci test commit

* test circleci commit

* Add errors

* Mob 3656 (#123)

* get and persist loyalty status after payment provider response

* minor change

* add get current status method to loyalty service

* refresh current loyalty status

* add unit tests

* Fix for paymemt provider model

* resolve PR comments

Co-authored-by: Mostafa Hadian <[email protected]>

Co-authored-by: Diana Petrea <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* Mob 3650 (#125)

* update loyalty nonce model

* fix unit test

* fix loyalty preauth interactor

* redo execute implementation in loyalty preauth interactor

* Mob 3785 (#126)

* add slug to KarhooError

* use slug, add new error type

* add new errot type

* bump version (#127)

* MOB-3819 add shopper locale to adyen payment request (#129)

* add shopper locale to adyen payment request

* add minor tweak

* Feature/MOB-3883 add basic analytics events to track the conversion steps (#130)

* New event names added according to requirements in https://karhoo.atlassian.net/browse/MOB-3868

* cleanup

* cleanup

* Renaming

* bump version (#131)

* change vehicle class to vehicle type in quote categories (#134)

* change vehicle class to vehicle type in quote categories
* fix tests

* Feature/4021 add client key endpoint (#137)

* add Adyen client key call

* Mob 4024 post release 1.6 [DEVELOP] (#141)

* [MOB-3216] Update master (#97)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3387 Final release 1.5.0 (#102)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* Post release 1 5 1 (#107)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3488 Post release 1.5.2 (master) (#111)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* Release 1.5.2

* Update marketting project version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* MOB-3528: Post Release 1.5.3 (master) (#116)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* Release 1.5.3

* test circleci fix

* undo circleci test

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>

* Mob-3749_post_release_1_5_4 (#128)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resource_class to medium to fit our price plan

* revert Xcode to 12.0, revert resource_class to xlarge, and change bundler version to 2.2.7 - working UISDK config

* try solution proposed by Mikolaj

* going back to xcode 12.2 and large resource_class

* using medium resource_class

* update fastlane

* update fastlane take 2

* circleci sanity check

* test removing ssh key

* reverting last commit

* adjust bundler version

* test circleci

* update to xcode 13

* update fastlane

* remove fastline update, run bundle install before installing specific gem

* Use xcode 12.5.1

* Minor change

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Diana Petrea <[email protected]>

* [MOB-3633] Add Loyalty API (#119)

* Add endpoints

* LoyaltyStatus API Added

* Add LoyaltyPoints model

* Fix up the API endpoints

* LoyaltyStatus Interactor

* Edit APIEndpoint again

* Update LoyaltyService

* LoyaltyBurn interactor

* Loyaltyearn Interactor

* Update LoyaltyService

* PreAuth interactor

* Update service

* Add mocks

* Preauth mock

* Add tests

* Add remaining tests

* Update PreAuth interactor

* Remove Integration Tests (Not ready)

* Fix loyaltyservice for preauth

* Fix tests

* Make requested changes to LoyaltyPreAuth

* points to burnPoints

* Guard currency

* Fix broken test

* Add new status test to make sure request is setup correctly

* Fix loyaltyStatus?

* cicleci test commit

* test circleci commit

* Add errors

* Mob 3656 (#123)

* get and persist loyalty status after payment provider response

* minor change

* add get current status method to loyalty service

* refresh current loyalty status

* add unit tests

* Fix for paymemt provider model

* resolve PR comments

Co-authored-by: Mostafa Hadian <[email protected]>

Co-authored-by: Diana Petrea <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* Mob 3650 (#125)

* update loyalty nonce model

* fix unit test

* fix loyalty preauth interactor

* redo execute implementation in loyalty preauth interactor

* Mob 3785 (#126)

* add slug to KarhooError

* use slug, add new error type

* add new errot type

* bump version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>
Co-authored-by: Anca Feurdean <[email protected]>

* Mob 3893 post release 1 5 5 [MASTER] (#132)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease resource_class to medium to fit our price plan

* revert Xcode to 12.0, revert resource_class to xlarge, and change bundler version to 2.2.7 - working UISDK config

* try solution proposed by Mikolaj

* going back to xcode 12.2 and large resource_class

* using medium resource_class

* update fastlane

* update fastlane take 2

* circleci sanity check

* test removing ssh key

* reverting last commit

* adjust bundler version

* test circleci

* update to xcode 13

* update fastlane

* remove fastline update, run bundle install before installing specific gem

* Use xcode 12.5.1

* Minor change

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Diana Petrea <[email protected]>

* [MOB-3633] Add Loyalty API (#119)

* Add endpoints

* LoyaltyStatus API Added

* Add LoyaltyPoints model

* Fix up the API endpoints

* LoyaltyStatus Interactor

* Edit APIEndpoint again

* Update LoyaltyService

* LoyaltyBurn interactor

* Loyaltyearn Interactor

* Update LoyaltyService

* PreAuth interactor

* Update service

* Add mocks

* Preauth mock

* Add tests

* Add remaining tests

* Update PreAuth interactor

* Remove Integration Tests (Not ready)

* Fix loyaltyservice for preauth

* Fix tests

* Make requested changes to LoyaltyPreAuth

* points to burnPoints

* Guard currency

* Fix broken test

* Add new status test to make sure request is setup correctly

* Fix loyaltyStatus?

* cicleci test commit

* test circleci commit

* Add errors

* Mob 3656 (#123)

* get and persist loyalty status after payment provider response

* minor change

* add get current status method to loyalty service

* refresh current loyalty status

* add unit tests

* Fix for paymemt provider model

* resolve PR comments

Co-authored-by: Mostafa Hadian <[email protected]>

Co-authored-by: Diana Petrea <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* Mob 3650 (#125)

* update loyalty nonce model

* fix unit test

* fix loyalty preauth interactor

* redo execute implementation in loyalty preauth interactor

* Mob 3785 (#126)

* add slug to KarhooError

* use slug, add new error type

* add new errot type

* bump version (#127)

* MOB-3819 add shopper locale to adyen payment request (#129)

* add shopper locale to adyen payment request

* add minor tweak

* Feature/MOB-3883 add basic analytics events to track the conversion steps (#130)

* New event names added according to requirements in https://karhoo.atlassian.net/browse/MOB-3868

* cleanup

* cleanup

* Renaming

* bump version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>
Co-authored-by: Anca Feurdean <[email protected]>
Co-authored-by: Aleksander Wędrychowski <[email protected]>

* Feature/MOB-4020 update network sdk to support versioning of payment related calls (#136)

* Add `version` parameter to PaymentProvider model

* Payment API Version added to payments interactors and endpints

* force v68 api version for debug

* Payment version added to path if differs from v51

* version path component fix

* version string calculation improved

* Test v68 version

* update tests

* version bump 1.5.5 => 1.5.6

* Change version number

* MOB-4021 cherry pick

* version bump 1.6.0

* version bump in Podspec

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: dianakarh <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>
Co-authored-by: Anca Feurdean <[email protected]>
Co-authored-by: Aleksander Wędrychowski <[email protected]>
Co-authored-by: Aleksander Wędrychowski <[email protected]>

* MOB-4020 post release 1.6.1 [develop] (#144)

* [MOB-3216] Update master (#97)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3387 Final release 1.5.0 (#102)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* Post release 1 5 1 (#107)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>

* MOB-3488 Post release 1.5.2 (master) (#111)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* Release 1.5.2

* Update marketting project version

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: dianakarh <[email protected]>

* MOB-3528: Post Release 1.5.3 (master) (#116)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* Release 1.5.3

* test circleci fix

* undo circleci test

Co-authored-by: EdwardW2 <[email protected]>
Co-authored-by: Jo Santa Maria <[email protected]>
Co-authored-by: Mostafa Hadian <[email protected]>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: cornelkar <[email protected]>
Co-authored-by: cosminBadulescu <[email protected]>
Co-authored-by: ancafeurdean09 <[email protected]>

* Mob-3749_post_release_1_5_4 (#128)

* [MOB-2976] Quote model update for Polling (#80)

* Update quote models

* Update tests

* Update cart file (#81)

* Call follow endpoint for guest checkout booking fee retrieval (#83)

* [MOB-3176] Cancellation SLA to booking (#84)

* New models

* Update tripinfo object

* Update JSON

* Remove package.resolved file

* Update tests

* Ignore this (#85)

* {MOB-3181] Quotes cancellation SLA (#86)

* Update quote model

* Update tests

* MOB-3144 - Add decimal formatting to CancellationFeePrice (#87)

* Add decimal formatting to CancellationFeePrice

* Update to use global const

* Remove URL suffix (#88)

* Add BrowserInfo to Adyen DropIn Payload (#89)

* Bump nokogiri from 1.10.7 to 1.11.1 (#76)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.10.7 to 1.11.1.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.10.7...v1.11.1)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* MOB-3205 Add SupplyPartnerID to the AdyenPayments request (#90)

* Add SupplyPartnerId field to the payments API

* Update tests and add supplyPartnerId

* Add Fleet model to be used in Quote model (#91)

* Make service cancellation type an enum (#92)

* Make service cancellation type an enum

* Retain other service cancellation type values.

* Bump kramdown from 2.3.0 to 2.3.1 (#93)

Bumps [kramdown](https://github.com/gettalong/kramdown) from 2.3.0 to 2.3.1.
- [Release notes](https://github.com/gettalong/kramdown/releases)
- [Changelog](https://github.com/gettalong/kramdown/blob/master/doc/news.page)
- [Commits](https://github.com/gettalong/kramdown/commits)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use the Keychain to store user credentials. (#94)

* Add fastlane update command (#95)

* Add fastlane update command

* Add fastlane update as a separate command

* Update Gemfile.lock

* [MOB-3216] Release 1.4.0 (#96)

* Bump version

* Update pod spec (Need this to be published)

* Bump nokogiri from 1.11.2 to 1.11.5 (#98)

Bumps [nokogiri](https://github.com/sparklemotion/nokogiri) from 1.11.2 to 1.11.5.
- [Release notes](https://github.com/sparklemotion/nokogiri/releases)
- [Changelog](https://github.com/sparklemotion/nokogiri/blob/main/CHANGELOG.md)
- [Commits](https://github.com/sparklemotion/nokogiri/compare/v1.11.2...v1.11.5)

Signed-off-by: dependabot[bot] <[email protected]>

Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Use date data type for dateBooked (#99)

* Bump version number to 1.5.0 (#100)

* [MOB-3438] login with credentials (#104)

* Make first small changes to auth service.

* Create auth credentials swift files and update authservice

* Init auth credentials interactor

* Credentials finally works as public

* Almost finished

* Swap credentials with authToken

* Finish interactor + rename token interactor

* Remove requestsender

* Test pass

* Release 1.5.1 (#106)

* versiob bump to 1_5_1-rc1

* updated version to 1_5_1

* changed readme (#108)

* MOB-3445 change AuthToken init access level from internal to public (#109)

* MOB-3488 Release 1.5.2 (develop) (#110)

* Release 1.5.2

* Update marketting project version

* MOB-3405 fix coding key for fleet capabilties (#112)

Co-authored-by: Anca Feurdean <[email protected]>

* fix refresh token call headers (#114)

* MOB-3528: Release 1.5.3 (develop) (#115)

* Release 1.5.3

* test circleci

* undo circleci test

* Add new error codes (#117)

* Add loyalty nonce to booking api (#118)

* Modify LoyaltyProgramme to be an Object vs an Array (#120)

* Mob xxxx circleci fix (#124)

* Update config.yml

* Update config.yml

* Revert

* Avoid deleting the SSH private key

* use separate commends

* use xlarge resource

* use cache for bundle

* update xcode version to 12.2.0

* a bit cleanup

* revert back to working version

* update bundler version

* use large resource

* use xlarge resource

* update xcode version, decrease r…
  • Loading branch information
13 people authored Jun 7, 2022
1 parent 1d0d70a commit e8e4bbd
Show file tree
Hide file tree
Showing 17 changed files with 38 additions and 90 deletions.
2 changes: 1 addition & 1 deletion Gemfile.lock
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ GEM
public_suffix
typhoeus (~> 1.0)
cocoapods-deintegrate (1.0.4)
cocoapods-downloader (1.4.0)
cocoapods-downloader (1.6.3)
cocoapods-plugins (1.0.0)
nap
cocoapods-search (1.0.0)
Expand Down
2 changes: 1 addition & 1 deletion KarhooSDK.podspec
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Pod::Spec.new do |s|

s.name = "KarhooSDK"
s.version = "1.6.1"
s.version = "1.6.2"
s.summary = "Karhoo Network SDK"
s.homepage = "https://developer.karhoo.com/docs/build-apps-using-sdks"
s.license = 'BSD 2-Clause'
Expand Down
8 changes: 4 additions & 4 deletions KarhooSDK.xcodeproj/project.pbxproj
Original file line number Diff line number Diff line change
Expand Up @@ -4314,7 +4314,7 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 27;
CURRENT_PROJECT_VERSION = 28;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = U7U4Q7YGDH;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -4338,7 +4338,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.1;
MARKETING_VERSION = 1.6.2;
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.karhoo.KarhooSDK;
Expand All @@ -4359,7 +4359,7 @@
CODE_SIGN_IDENTITY = "";
"CODE_SIGN_IDENTITY[sdk=iphoneos*]" = "iPhone Developer";
CODE_SIGN_STYLE = Automatic;
CURRENT_PROJECT_VERSION = 27;
CURRENT_PROJECT_VERSION = 28;
DEFINES_MODULE = YES;
DEVELOPMENT_TEAM = U7U4Q7YGDH;
DYLIB_COMPATIBILITY_VERSION = 1;
Expand All @@ -4383,7 +4383,7 @@
"@executable_path/Frameworks",
"@loader_path/Frameworks",
);
MARKETING_VERSION = 1.6.1;
MARKETING_VERSION = 1.6.2;
MODULEMAP_PRIVATE_FILE = "";
ONLY_ACTIVE_ARCH = YES;
PRODUCT_BUNDLE_IDENTIFIER = com.karhoo.KarhooSDK;
Expand Down
5 changes: 5 additions & 0 deletions KarhooSDK/Api/Response/PaymentProvider.swift
Original file line number Diff line number Diff line change
Expand Up @@ -9,23 +9,28 @@ import Foundation

public struct PaymentProvider : KarhooCodableModel {
public let provider: Provider
public let version: String
public let loyaltyProgamme: LoyaltyProgramme

public init(provider: Provider = Provider(),
version: String = "v51",
loyaltyProgamme: LoyaltyProgramme = LoyaltyProgramme()) {
self.provider = provider
self.version = version
self.loyaltyProgamme = loyaltyProgamme
}

public init (from decoder: Decoder) throws {
let container = try decoder.container(keyedBy: CodingKeys.self)

self.provider = (try? container.decode(Provider.self, forKey: .provider)) ?? Provider()
self.version = (try? container.decodeIfPresent(String.self, forKey: .version)) ?? "v51"
self.loyaltyProgamme = (try? container.decode(LoyaltyProgramme.self, forKey: .loyaltyProgamme)) ?? LoyaltyProgramme()
}

enum CodingKeys: String, CodingKey {
case provider
case version
case loyaltyProgamme = "loyalty_programme"
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -84,10 +84,7 @@ final class KarhooAuthLoginWithCredentialsInteractor: AuthLoginWithCredentialsIn
callback: { [weak self] (result: Result<PaymentProvider>) in
let paymentProvider = result.successValue()
self?.userDataStore.updatePaymentProvider(paymentProvider: paymentProvider)
if paymentProvider?.provider.type == .braintree {
self?.updateUserNonce(user: user)
}

self?.updateUserNonce(user: user)
guard let self = self else { return }
LoyaltyUtils.updateLoyaltyStatusFor(paymentProvider: paymentProvider,
userDataStore: self.userDataStore,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -102,10 +102,7 @@ final class KarhooAuthLoginWithTokenInteractor: AuthLoginWithTokenInteractor {

let paymentProvider = result.successValue()
self?.userDataStore.updatePaymentProvider(paymentProvider: paymentProvider)
if paymentProvider?.provider.type == .braintree {
self?.updateUserNonce(user: user)
}

self?.updateUserNonce(user: user)
guard let self = self else { return }

LoyaltyUtils.updateLoyaltyStatusFor(paymentProvider: paymentProvider,
Expand Down
4 changes: 2 additions & 2 deletions KarhooSDK/Service/Quote/CategoryQuoteMapper.swift
Original file line number Diff line number Diff line change
Expand Up @@ -14,12 +14,12 @@ struct CategoryQuoteMapper {
var categoriesToMap: [String] = categories.uniqueArray()

if categories.isEmpty {
categoriesToMap = quotes.map { $0.vehicle.vehicleClass }.uniqueArray()
categoriesToMap = quotes.map { $0.vehicle.type }.uniqueArray()
}

return categoriesToMap.map { category in
let quotes = quotes.filter {
let name = $0.vehicle.vehicleClass
let name = $0.vehicle.type
return name.lowercased() == category.lowercased()
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -97,7 +97,7 @@ final class KarhooQuoteInteractor: QuoteInteractor {
}

let filteredQuotes = quoteList.quotes.filter { $0.vehicle.qta.highMinutes <= filterRidesWithETA }
let quoteCategories = CategoryQuoteMapper().map(categories: quoteList.availability.vehicles.classes,
let quoteCategories = CategoryQuoteMapper().map(categories: quoteList.availability.vehicles.types,
toQuotes: filteredQuotes)
let quotes = Quotes(quoteListId: quoteList.listId,
quoteCategories: quoteCategories,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -129,11 +129,7 @@ final class KarhooLoginInteractor: LoginInteractor {
endpoint: .paymentProvider,
callback: { [weak self] (result: Result<PaymentProvider>) in
self?.userDataStore.updatePaymentProvider(paymentProvider: result.successValue())

if result.successValue()?.provider.type == .braintree {
self?.updateUserNonce(user: user)
}

self?.updateUserNonce(user: user)
guard let self = self else { return }

LoyaltyUtils.updateLoyaltyStatusFor(paymentProvider: result.successValue(),
Expand Down
16 changes: 10 additions & 6 deletions KarhooSDKIntegrationTests/JSON/Quote/QuotesV2.json
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,11 @@
"Electric"
],
"types": [
"electric",
"moto",
"standard",
"mpv"]
"mpv",
"bus"
]
}
},
"id": "1762fe84-cb53-11ea-994d-52087d195d90",
Expand All @@ -37,15 +39,15 @@
"quote_type": "ESTIMATED",
"source": "FLEET",
"vehicle": {
"type": "standard",
"class": "Saloon",
"tags": [
"electric", "taxi"
],
"qta": {
"high_minutes": 30,
"low_minutes": 30
}
},
"type": "moto"
},
"service_level_agreements": {
"free_cancellation": {
Expand Down Expand Up @@ -81,7 +83,8 @@
"qta": {
"high_minutes": 2,
"low_minutes": 2
}
},
"type": "standard"
},
"service_level_agreements": {
"free_cancellation": {
Expand Down Expand Up @@ -117,7 +120,8 @@
"qta": {
"high_minutes": 2,
"low_minutes": 2
}
},
"type": "standard"
},
"service_level_agreements": {
"free_cancellation": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ final class UIConfigMethod: XCTestCase {

call.execute(callback: { result in
XCTAssertTrue(result.isSuccess())
XCTAssertFalse(result.successValue()!.hidden)
XCTAssertFalse(result.successValue()?.hidden ?? false)

expectation.fulfill()
})
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -38,15 +38,15 @@ final class QuoteSearchMethodSpec: XCTestCase {
pollCall.execute(callback: { result in
XCTAssertTrue(result.isSuccess())
self.assertSuccess(quote: result.successValue()?.all[0])

XCTAssertEqual(6, result.successValue()?.quoteCategories.count)
XCTAssertEqual(2, result.successValue()?.quotes(for: "Saloon").count)
XCTAssertEqual(1, result.successValue()?.quotes(for: "Taxi").count)
XCTAssertEqual(4, result.successValue()?.quoteCategories.count)
XCTAssertEqual(0, result.successValue()?.quotes(for: "Saloon").count)
XCTAssertEqual(0, result.successValue()?.quotes(for: "Taxi").count)
XCTAssertEqual(0, result.successValue()?.quotes(for: "MPV").count)
XCTAssertEqual(0, result.successValue()?.quotes(for: "Exec").count)
XCTAssertEqual(0, result.successValue()?.quotes(for: "Electric").count)
XCTAssertEqual(0, result.successValue()?.quotes(for: "Moto").count)

XCTAssertEqual(1, result.successValue()?.quotes(for: "moto").count)
XCTAssertEqual(2, result.successValue()?.quotes(for: "standard").count)
expectation.fulfill()
})

Expand All @@ -56,7 +56,7 @@ final class QuoteSearchMethodSpec: XCTestCase {
/**
* Given: Searching for quotes
* When: QuotesListId fails (no availability)
* Then: Expected error should be propogated
* Then: Expected error should be propagated
*/
func testQuoteListIdRequestErrorResponse() {
NetworkStub.errorResponse(path: quoteListIdPath, responseData: RawKarhooErrorFactory.buildError(code: "K3002"))
Expand Down Expand Up @@ -129,7 +129,7 @@ final class QuoteSearchMethodSpec: XCTestCase {
* Given: Polling for quotes
* When: The first execution succeeds
* And: The second execution fails
* Then: correct results should be propogated
* Then: correct results should be propagated
*/
func testQuoteSearchPolling() {
NetworkStub.successResponse(jsonFile: "QuoteListId.json", path: quoteListIdPath)
Expand Down
2 changes: 1 addition & 1 deletion KarhooSDKTests/Mocks/Api/Response/QuoteMock.swift
Original file line number Diff line number Diff line change
Expand Up @@ -121,7 +121,7 @@ final class QuoteMock {
categoryName: String? = nil,
fleet: Fleet? = nil,
vehicle: QuoteVehicle? = nil) {
let quoteVehicle = QuoteVehicle(vehicleClass: categoryName ?? "",
let quoteVehicle = QuoteVehicle(type: categoryName ?? "",
qta: QuoteQta(highMinutes: qtaHighMinutes ?? 0,
lowMinutes: qtaLowMinutes ?? 0))
self.quote = Quote(
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -174,23 +174,6 @@ final class KarhooAuthLoginInteractorSpec: XCTestCase {
XCTAssertNil(mockUserDataStore.updateCurrentNonce)
}

/**
* Given: Login successful and the payment
* When: provider is adyen
* Then: get nonce should not be called
*/
func testAdyenDoesNotGetBraintreeNonce() {
triggerSuccessfulAuthLoginAndProfileFetch()
let paymentProvider = PaymentProvider(provider: Provider(id: "adyen"))
mockPaymentProviderRequest.triggerSuccessWithDecoded(value: paymentProvider)

mockGetNonceRequestSender.triggerFail(error: TestUtil.getRandomError())

XCTAssertFalse(mockGetNonceRequestSender.requestAndDecodeCalled)
XCTAssertFalse(mockUserDataStore.updateCurrentNonceCalled)
XCTAssertNil(mockUserDataStore.updateCurrentNonce)
}

private func triggerSuccessfulAuthLoginAndProfileFetch() {
testObject.execute(callback: { (_: Result<UserInfo>) in })
mocktokenExchangeRequest.triggerEncodedRequestSuccess(value: AuthTokenMock().set(accessToken: "123").build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -167,23 +167,6 @@ final class KarhooAuthLoginWithCredentialsSpec: XCTestCase {
XCTAssertNil(mockUserDataStore.updateCurrentNonce)
}

/**
* Given: Login successful and the payment
* When: provider is adyen
* Then: get nonce should not be called
*/
func testAdyenDoesNotGetBraintreeNonce() {
triggerSuccessfulAuthLoginAndProfileFetch()
let paymentProvider = PaymentProvider(provider: Provider(id: "adyen"))
mockPaymentProviderRequest.triggerSuccessWithDecoded(value: paymentProvider)

mockGetNonceRequestSender.triggerFail(error: TestUtil.getRandomError())

XCTAssertFalse(mockGetNonceRequestSender.requestAndDecodeCalled)
XCTAssertFalse(mockUserDataStore.updateCurrentNonceCalled)
XCTAssertNil(mockUserDataStore.updateCurrentNonce)
}

private func triggerSuccessfulAuthLoginAndProfileFetch() {
testObject.execute(callback: { (_: Result<UserInfo>) in })
mockUserRequest.triggerSuccessWithDecoded(value: UserInfoMock().set(firstName: "Bob").build())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -312,23 +312,6 @@ class KarhooLoginInteractorSpec: XCTestCase {
XCTAssertNil(mockUserDataStore.updateCurrentNonce)
}

/**
* Given: Login successful and the payment
* When: provider is adyen
* Then: get nonce should not be called
*/
func testAdyenDoesNotGetBraintreeNonce() {
triggerSuccessfulLoginAndProfileFetch()
let paymentProvider = PaymentProvider(provider: Provider(id: "adyen"))
mockPaymentProviderRequest.triggerSuccessWithDecoded(value: paymentProvider)

mockGetNonceRequestSender.triggerFail(error: TestUtil.getRandomError())

XCTAssertFalse(mockGetNonceRequestSender.requestAndDecodeCalled)
XCTAssertFalse(mockUserDataStore.updateCurrentNonceCalled)
XCTAssertNil(mockUserDataStore.updateCurrentNonce)
}

private func triggerSuccessfulLoginAndProfileFetch() {
let userLogin = UserLogin(username: "email", password: "password")

Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ You can use [CocoaPods](http://cocoapods.org/) to install `KarhooSDK` by adding
```ruby

use_frameworks!
pod 'KarhooSDK', '~> 1.6.1'
pod 'KarhooSDK', '~> 1.6.2'
```

then import `KarhooSDK` wherever you want to access Karhoo services
Expand All @@ -52,7 +52,7 @@ Once you have your Swift package set up, adding Karhoo as a dependency is as eas

```swift
dependencies: [
.package(url: "https://github.com/Karhoo/karhoo-ios-sdk.git", .upToNextMajor(from: "1.6.1"))
.package(url: "https://github.com/Karhoo/karhoo-ios-sdk.git", .upToNextMajor(from: "1.6.2"))
]
```

Expand Down

0 comments on commit e8e4bbd

Please sign in to comment.