Skip to content

refactor: protect ReminderPaginator filters and sort properties #1567

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
MartinCupela merged 2 commits into from
Jun 19, 2025
Merged

refactor: protect ReminderPaginator filters and sort properties #1567

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
de0f8c9
refactor: protect ReminderPaginator filters and sort properties
MartinCupela Jun 19, 2025
6a3b51f
test: fix flaky test
MartinCupela Jun 19, 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
2 changes: 1 addition & 1 deletion src/pagination/BasePaginator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ export const DEFAULT_PAGINATION_OPTIONS: Required<PaginatorOptions> = {

export abstract class BasePaginator<T> {
state: StateStore<PaginatorState<T>>;
protected pageSize: number;
pageSize: number;
protected _executeQueryDebounced!: DebouncedExecQueryFunction;
protected _isCursorPagination = false;

Expand Down
22 changes: 20 additions & 2 deletions src/pagination/ReminderPaginator.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,26 @@ import type { StreamChat } from '../client';

export class ReminderPaginator extends BasePaginator<ReminderResponse> {
private client: StreamChat;
filters: ReminderFilters | undefined;
sort: ReminderSort | undefined;
protected _filters: ReminderFilters | undefined;
protected _sort: ReminderSort | undefined;

get filters(): ReminderFilters | undefined {
return this._filters;
}

get sort(): ReminderSort | undefined {
return this._sort;
}

set filters(filters: ReminderFilters | undefined) {
this._filters = filters;
this.resetState();
}

set sort(sort: ReminderSort | undefined) {
this._sort = sort;
this.resetState();
}

constructor(client: StreamChat, options?: PaginatorOptions) {
super(options);
Expand Down
12 changes: 8 additions & 4 deletions test/unit/reminders/ReminderManager.test.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,14 +303,18 @@ describe('ReminderManager', () => {
client.dispatchEvent(generateReminderEvent(type, reminderResponse));
expect(manager.reminders.size).toBe(1);
const remindAtDate = new Date('1970-01-01');
expect(
manager.reminders.get(reminderResponse.message_id)?.state.getLatestValue(),
).toEqual({
const { timeLeftMs, ...state } = manager.reminders
.get(reminderResponse.message_id)
?.state.getLatestValue();
expect({
...state,
timeLeftMs: Math.round(timeLeftMs / 1000),
}).toEqual({
...reminderResponse,
created_at: new Date(reminderResponse.created_at),
remind_at: remindAtDate,
updated_at: new Date(reminderResponse.updated_at),
timeLeftMs: remindAtDate.getTime() - now.getTime(),
timeLeftMs: Math.round((remindAtDate.getTime() - now.getTime()) / 1000),
});
});
it('removes reminder from state on reminder.deleted event', () => {
Expand Down