Skip to content

Regression: upserting data into cached collections #27965

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
ggazzo merged 1 commit into from
Feb 8, 2023
Merged

Regression: upserting data into cached collections #27965

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
12 changes: 6 additions & 6 deletions apps/meteor/app/ui-cached-collection/client/models/CachedCollection.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -168,8 +168,8 @@ export class CachedCollection<T extends object> extends Emitter<{ changed: T; re
return;
}

const { _id, ...data } = newRecord;
this.collection.direct.upsert({ _id } as Mongo.Selector<T>, { $set: data } as Mongo.Modifier<T>);
const { _id } = newRecord;
this.collection.direct.upsert({ _id } as Mongo.Selector<T>, newRecord);
this.emit('changed', newRecord as any); // TODO: investigate why this is needed

if (hasUpdatedAt(newRecord) && newRecord._updatedAt > this.updatedAt) {
Expand Down Expand Up @@ -232,8 +232,8 @@ export class CachedCollection<T extends object> extends Emitter<{ changed: T; re
if (action === 'removed') {
this.collection.remove(newRecord._id);
} else {
const { _id, ...data } = newRecord;
this.collection.direct.upsert({ _id } as Mongo.Selector<T>, { $set: data } as Mongo.Modifier<T>);
const { _id } = newRecord;
this.collection.direct.upsert({ _id } as Mongo.Selector<T>, newRecord);
}
this.save();
});
Expand Down Expand Up @@ -276,8 +276,8 @@ export class CachedCollection<T extends object> extends Emitter<{ changed: T; re
const actionTime = newRecord._updatedAt;
changes.push({
action: () => {
const { _id, ...data } = newRecord;
this.collection.direct.upsert({ _id } as Mongo.Selector<T>, { $set: data } as Mongo.Modifier<T>);
const { _id } = newRecord;
this.collection.direct.upsert({ _id } as Mongo.Selector<T>, newRecord);
if (actionTime > this.updatedAt) {
this.updatedAt = actionTime;
}
Expand Down
2 changes: 1 addition & 1 deletion apps/meteor/app/ui-utils/client/lib/RoomHistoryManager.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -59,7 +59,7 @@ export async function upsertMessage(
);
}

return direct.upsert({ _id }, { $set: messageToUpsert });
return direct.upsert({ _id }, msg);
}

export function upsertMessageBulk(
Expand Down