Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Bugfix for kigo quote price #463

Merged
merged 4 commits into from
Oct 21, 2016
Merged

Conversation

sharipov-ru
Copy link
Contributor

Previously PR #411 added condition to select the maximum of two possibly different minimum stay values:

property.minimum_stay = [
  property.minimum_stay.to_i,
  pricing_mapper.minimum_stay
].max

Fix was applied to property mapper, however, calendar builder was still using only value from pricing hash without any knowledge that property's minimum stay is stricter. This was the reason of problems when we had minimum_stay = 28 in database, but calendar still allowed period selections of less than 28 days, causing us to get lots of

"The property pricing information is unavailable due to a constraint. This Property has a minimum stay of 28 nights.No Rates AvailableUnfortunately, this unit is not available for your selected period. Please try another unit."

errors while quoting prices. Example: https://concierge-web.roomorama.com/errors/631156

This PR changes Kigo::Calendar to use the same [val1, val2].max logic as property mapper does. Also minimum stays selection extracted to its own class.

Value in property database and calendar entry now synced with the same value. However, due to different intervals of workers start times, it's still possible that values be different from each other. But in that case everything will be working because calendar entry's value will be the most "fresh" one and it will still check which of two minimum stay values should be used.

@sharipov-ru
Copy link
Contributor Author

This PR fixes #381

min_stay = [prop_min_stay.to_i, cal_min_stay.to_i].max

if min_stay.zero?
invalid_min_stay_error
Copy link
Contributor

@keang keang Oct 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We parse the Kigo period as:

module Kigo
  # +Kigo::TimeInterval+
  #
  # represents days count according to +UNIT+ type
  # possible unit types NIGHT, MONTH, YEAR
  #
  # example:
  #
  #   TimeInterval.new({"UNIT"=>"NIGHT", "NUMBER"=>3})
  TimeInterval = Struct.new(:interval) do
    def days
      return nil if interval['NUMBER'].zero?          # <---- could be nil

      multiplier = { 'MONTH' => 30, 'YEAR' => 365 }.fetch(interval['UNIT'], 1)
      interval['NUMBER'].to_i * multiplier
    end
  end

Wonder if you saw this? maybe the condition above to return nil is wrong..

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, that's why I applied to_i for both minimum_stay values before calculating max (nil.to_i evaluates to 0)

We may return 0 instead of nil btw, I still have to convert everything to integer, so there is no difference from getting 0 or nil, just one extra convertion.

Copy link
Contributor

@keang keang Oct 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@sharipov-ru how about defaulting to 1 if it's zero, rather than returning error?
I think kigo is known to put nil minimum stay right?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yes, in this PR you said:

On production currently it was counted about 1260 properties with minimum_stay = 1, so we risk disabling all of it.

So yes, let's keep being on this path. 👍

If quote issues happens again, we'll investigate why property without minimum stay started require it while quote.

Copy link
Contributor Author

@sharipov-ru sharipov-ru Oct 19, 2016

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Changed MinStay class to return nil instead of Result.error.

It's now up-to-caller to decide whether minimum_stay should be nil or we should set a default value:

  • property mapper sets it to 1 to pass roomorama validations
  • calendar entries still have minimum_stay value equal nil (since it's not required field)

@sharipov-ru sharipov-ru force-pushed the bugfix/kigo_quote_price branch from a9c7288 to 2448b94 Compare October 19, 2016 09:29
@sharipov-ru
Copy link
Contributor Author

@keang @kkolotyuk please review again 👀

@kkolotyuk
Copy link
Contributor

LGTM, but I would wait @keang review, because he knows Kigo better then me.

Copy link
Contributor

@keang keang left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

👍

@sharipov-ru sharipov-ru force-pushed the bugfix/kigo_quote_price branch from 2448b94 to e6dd75b Compare October 21, 2016 06:52
@sharipov-ru sharipov-ru merged commit 4f3657c into development Oct 21, 2016
@sharipov-ru sharipov-ru deleted the bugfix/kigo_quote_price branch October 21, 2016 06:56
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants