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

refactor: Move units check outside of model for finds #29253

Merged
merged 16 commits into from
Jun 14, 2023

Conversation

KevLehman
Copy link
Contributor

@KevLehman KevLehman commented May 16, 2023

OC-950

Proposed changes (including videos or screenshots)

Issue(s)

Steps to test or reproduce

Further comments

  • Removes Units check from inside find and findpaginated functions.
  • Since updates are async, having the extra filter inside is not a problem.
  • Removes Promise.await introduced to fix a regression on 6.2

@KevLehman KevLehman changed the title improve: Move units check outside of model for finds refactor: Move units check outside of model for finds May 16, 2023
@codecov
Copy link

codecov bot commented May 16, 2023

Codecov Report

Merging #29253 (eeb8a23) into develop (956dbb5) will decrease coverage by 9.11%.
The diff coverage is n/a.

Impacted file tree graph

@@             Coverage Diff             @@
##           develop   #29253      +/-   ##
===========================================
- Coverage    45.76%   36.66%   -9.11%     
===========================================
  Files          687      605      -82     
  Lines        12957    11325    -1632     
  Branches      2217     2031     -186     
===========================================
- Hits          5930     4152    -1778     
- Misses        6709     6911     +202     
+ Partials       318      262      -56     
Flag Coverage Δ
e2e 36.66% <ø> (-9.08%) ⬇️

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

@KevLehman KevLehman marked this pull request as ready for review May 16, 2023 17:29
@KevLehman KevLehman requested review from a team as code owners May 16, 2023 17:29
@changeset-bot
Copy link

changeset-bot bot commented May 23, 2023

🦋 Changeset detected

Latest commit: eeb8a23

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

This PR includes changesets to release 24 packages
Name Type
@rocket.chat/meteor Patch
@rocket.chat/model-typings Patch
@rocket.chat/models 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/omnichannel-services Patch
rocketchat-services Patch
@rocket.chat/core-services Patch
@rocket.chat/cron Patch
@rocket.chat/instance-status Patch
@rocket.chat/presence Patch
@rocket.chat/core-typings Patch
@rocket.chat/rest-typings Patch
@rocket.chat/api-client Patch
@rocket.chat/ui-contexts Patch
@rocket.chat/pdf-worker Patch
@rocket.chat/ddp-client Patch
@rocket.chat/fuselage-ui-kit Patch
@rocket.chat/uikit-playground 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

…b.com:RocketChat/Rocket.Chat into improve/move-unit-check-on-find-outside-model
murtaza98
murtaza98 previously approved these changes May 25, 2023
@KevLehman KevLehman added this to the 6.3.0 milestone May 25, 2023
murtaza98
murtaza98 previously approved these changes Jun 5, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: needs QA labels Jun 5, 2023
@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Jun 12, 2023
@kodiakhq
Copy link
Contributor

kodiakhq bot commented Jun 12, 2023

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

@dionisio-bot dionisio-bot bot added the stat: ready to merge PR tested and approved waiting for merge label Jun 13, 2023
@kodiakhq kodiakhq bot removed the stat: ready to merge PR tested and approved waiting for merge label Jun 13, 2023
@kodiakhq
Copy link
Contributor

kodiakhq bot commented Jun 13, 2023

This PR currently has a merge conflict. Please resolve this and then re-add the ['stat: ready to merge', 'automerge'] label.

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: conflict labels Jun 13, 2023
Copy link
Member

@d-gubert d-gubert left a comment

Choose a reason for hiding this comment

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

Still good on apps side

@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 13, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 13, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 13, 2023
@dionisio-bot dionisio-bot bot added stat: ready to merge PR tested and approved waiting for merge and removed stat: ready to merge PR tested and approved waiting for merge labels Jun 14, 2023
@kodiakhq kodiakhq bot merged commit 7832a40 into develop Jun 14, 2023
@kodiakhq kodiakhq bot deleted the improve/move-unit-check-on-find-outside-model branch June 14, 2023 03:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants