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

fix: Wrong Business hours validations between different weeks #32287

Merged
merged 4 commits into from
Apr 23, 2024

Conversation

ggazzo
Copy link
Member

@ggazzo ggazzo commented Apr 22, 2024

Proposed changes (including videos or screenshots)

it seems that Business Hours doesnt work properly in special scenarios:

  • the Business Hours is configured in a different timezone
  • the server is running on Saturday but considering the timezone the Business Hours is already Sunday

Thats the reason why CI refused to pass saturday 6pm

image

Issue(s)

Steps to test or reproduce

Further comments

CORE-306

Copy link

changeset-bot bot commented Apr 22, 2024

🦋 Changeset detected

Latest commit: a80db4d

The changes in this PR will be included in the next version bump.

This PR includes changesets to release 32 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/apps Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/gazzodown Patch
@rocket.chat/livechat Patch
@rocket.chat/model-typings Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/account-service Patch
@rocket.chat/authorization-service Patch
@rocket.chat/ddp-streamer Patch
@rocket.chat/omnichannel-transcript Patch
@rocket.chat/presence-service Patch
@rocket.chat/queue-worker Patch
@rocket.chat/stream-hub-service Patch
@rocket.chat/api-client Patch
@rocket.chat/license Patch
@rocket.chat/omnichannel-services Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/presence Patch
rocketchat-services Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/models Patch
@rocket.chat/ui-avatar Patch
@rocket.chat/ui-client Patch
@rocket.chat/ui-video-conf Patch
@rocket.chat/uikit-playground Patch
@rocket.chat/web-ui-registration Patch
@rocket.chat/instance-status Patch

Not sure what this means? Click here to learn what changesets are.

Click here if you're a maintainer who wants to add another changeset to this PR

Copy link

codecov bot commented Apr 22, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Project coverage is 55.47%. Comparing base (f423d7f) to head (a80db4d).

Additional details and impacted files

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #32287      +/-   ##
===========================================
+ Coverage    52.70%   55.47%   +2.76%     
===========================================
  Files         2112     2330     +218     
  Lines        47953    51376    +3423     
  Branches      9773    10514     +741     
===========================================
+ Hits         25274    28501    +3227     
+ Misses       20389    20367      -22     
- Partials      2290     2508     +218     
Flag Coverage Δ
e2e 54.92% <ø> (+5.49%) ⬆️
unit 74.95% <100.00%> (+0.03%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

@ggazzo ggazzo marked this pull request as ready for review April 22, 2024 19:00
@ggazzo ggazzo requested a review from a team as a code owner April 22, 2024 19:00
@ggazzo ggazzo added this to the 6.8 milestone Apr 22, 2024
Copy link
Contributor

dionisio-bot bot commented Apr 22, 2024

Looks like this PR is ready to merge! 🎉
If you have any trouble, please check the PR guidelines

Copy link
Member

@MarcosSpessatto MarcosSpessatto left a comment

Choose a reason for hiding this comment

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

Can we create a changeset?

@MartinSchoeler MartinSchoeler added the stat: QA assured Means it has been tested and approved by a company insider label Apr 23, 2024
@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Apr 23, 2024
@kodiakhq kodiakhq bot merged commit a8e1a46 into develop Apr 23, 2024
46 checks passed
@kodiakhq kodiakhq bot deleted the fix/bh-sunday-monday branch April 23, 2024 12:37
gabriellsh added a commit that referenced this pull request Apr 23, 2024
…engagementMDM

* 'develop' of github.com:RocketChat/Rocket.Chat:
  chore: including x.com hostname to Twitter oembed (#32267)
  feat: node-gcm deprecation (#32208)
  chore: Deprecate mute/unmute meteor methods and convert to endpoint (#31811)
  fix:  Wrong Business hours validations between different weeks (#32287)
  chore: Force logout live clients on E2EE keys reset changes (#32291)
  ci: skip update version message for TEST_MODE=true (#32293)
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
stat: QA assured Means it has been tested and approved by a company insider stat: ready to merge PR tested and approved waiting for merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants