Skip to content

regression: Passing servedBy instead of servedBy.id to findOne call when converting a room from app #35935

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
kodiakhq merged 4 commits into from
May 6, 2025
Merged

regression: Passing servedBy instead of servedBy.id to findOne call when converting a room from app #35935

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
a86cedc
fix regression
KevLehman May 6, 2025
72554e8
Update rooms.js
KevLehman May 6, 2025
f61adf6
cr
KevLehman May 6, 2025
96aa2e8
Update apps/meteor/app/apps/server/converters/rooms.js
KevLehman May 6, 2025
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
6 changes: 3 additions & 3 deletions apps/meteor/app/apps/server/converters/rooms.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,12 @@
};
}

async __getUserIdAndUsername(uid) {
if (!uid) {
async __getUserIdAndUsername(userObj) {
if (!userObj?.id) {
return;
}

const user = await Users.findOneById(uid, { projection: { _id: 1, username: 1 } });
const user = await Users.findOneById(userObj.id, { projection: { _id: 1, username: 1 } });
if (!user) {
return;
}
Expand Down Expand Up @@ -118,7 +118,7 @@
return dept?._id;
}

async convertAppRoom(room, isPartial = false) {

Check warning on line 121 in apps/meteor/app/apps/server/converters/rooms.js

View workflow job for this annotation

GitHub Actions / 🔎 Code Check / Code Lint 

Async method 'convertAppRoom' has a complexity of 32. Maximum allowed is 31
if (!room) {
return undefined;
}
Expand Down
Loading