Skip to content

fix: update from comments #61

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.

Sign up for GitHub

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

Merged
merged 1 commit into from
Jun 10, 2022
Merged

fix: update from comments #61

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/services/QuoteService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,7 +126,7 @@ export class QuoteService {

if (dowModifier) {
const modifier = dowModifier[
day.weekdayShort.toLocaleLowerCase()
day.toFormat('ccc').toLocaleLowerCase()
] as DayOfWeekRateModifierElement;

if (modifier) {
Expand Down
40 changes: 18 additions & 22 deletions src/services/SearchService.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ export class SearchService {
this.checkInTime =
this.facility.policies?.checkInTimeOneof.oneofKind === 'checkInTime'
? this.facility.policies.checkInTimeOneof.checkInTime
: 'utc';
: '1500'; //todo think about default checkin time

const spacesIds = await facilityRepository.getFacilityKey(
this.facilityId,
Expand Down Expand Up @@ -148,12 +148,10 @@ export class SearchService {
spaceRuleRepository
);

const firstDay = dates[0];
const checkIn = dates[0];

const checkIn = DateTime.now().setZone('utc');
const interval = Interval.fromDateTimes(checkIn, firstDay).toDuration([
'days'
]);
const now = DateTime.now().setZone('utc');
const interval = Interval.fromDateTimes(now, checkIn).toDuration(['days']);

const intervalSeconds = convertDaysToSeconds(interval.get('days'));

Expand All @@ -164,11 +162,11 @@ export class SearchService {
return false;
}

const formattedFirstDay = firstDay.toFormat('ccc').toLowerCase();
const formattedCheckInDay = checkIn.toFormat('ccc').toLowerCase();
const lOSRule = await this.getRule<DayOfWeekLOSRule>(
'length_of_stay',
spaceRuleRepository,
formattedFirstDay
formattedCheckInDay
);

const lOS = dates.length;
Expand All @@ -177,19 +175,19 @@ export class SearchService {

if (lOSRule) {
try {
minLOS = lOSRule[formattedFirstDay]?.minLengthOfStay || 0;
minLOS = lOSRule[formattedCheckInDay]?.minLengthOfStay || 0;
} catch (e) {
//rule not exist
}

try {
maxLOS = lOSRule[formattedFirstDay]?.maxLengthOfStay || 0;
maxLOS = lOSRule[formattedCheckInDay]?.maxLengthOfStay || 0;
} catch (e) {
//rule not exist
}
}

return (minLOS === 0 || lOS > minLOS) && (maxLOS === 0 || lOS < maxLOS);
return lOS > minLOS && lOS < maxLOS;
}

private async getRule<T extends Rules>(
Expand All @@ -207,27 +205,27 @@ export class SearchService {
}

private checkSuitableQuantity(space: Space) {
const numOfAdults =
const maxNumOfAdults =
space.maxNumberOfAdultOccupantsOneof.oneofKind ===
'maxNumberOfAdultOccupants'
? space.maxNumberOfAdultOccupantsOneof.maxNumberOfAdultOccupants
: 0;

const numOfChildren =
const maxNumOfChildren =
space.maxNumberOfChildOccupantsOneof.oneofKind ===
'maxNumberOfChildOccupants'
? space.maxNumberOfChildOccupantsOneof.maxNumberOfChildOccupants
: 0;

const guestCheck = numOfAdults - this.ask.numPaxAdult;
const guestCheck = maxNumOfAdults - this.ask.numPaxAdult;

if (guestCheck < 0) {
return false;
}

//if there is a place left from an adult, we give it to a child
const childrenCheck =
numOfChildren + guestCheck - (this.ask.numPaxChild || 0);
maxNumOfChildren + guestCheck - (this.ask.numPaxChild || 0);

if (childrenCheck < 0) {
return false;
Expand All @@ -252,16 +250,10 @@ export class SearchService {
spaceId
);

let defaultAvailable = await availabilityRepository.getSpaceAvailability(
const defaultAvailable = await availabilityRepository.getSpaceAvailability(
'default'
);

if (!defaultAvailable) {
defaultAvailable = {
numSpaces: 0
};
}

for (const date of dates) {
try {
const formattedDate = date.toFormat('yyyy-MM-dd') as FormattedDate;
Expand All @@ -274,6 +266,10 @@ export class SearchService {
available = defaultAvailable;
}

if (!available) {
return false;
}

const numBooked = await spaceStubRepository.getNumBookedByDate(
`${formattedDate}-num_booked`
);
Expand Down