Server side filtering and pagination #17
Conversation
src/server/initServer.ts
Outdated
| const query: any = {}; | ||
|
|
||
| /* -------------- Date Filter ------------- */ | ||
| const { startDate, endDate } = filters.dateFilterState; |
There was a problem hiding this comment.
Let's cast filters to the correct type (use same type as client, add to server and import it here).
src/server/initServer.ts
Outdated
| @@ -267,13 +263,144 @@ const initServer = ( | |||
| ); | |||
| } | |||
|
|
|||
| // Build MongoDB query based on filters | |||
| const query: any = {}; | |||
There was a problem hiding this comment.
Type { [k: string]: any }
src/server/initServer.ts
Outdated
|
|
||
| /* ------------ Context Filter ------------ */ | ||
| const { contextFilterState } = filters; | ||
| const contextConditions: any[] = []; |
There was a problem hiding this comment.
Be more precise than "any"
There was a problem hiding this comment.
Could we go for a more straightforward query for contexts? Something like:
{
context: { $in: selectedContexts },
subcontext: { $in: selectedSubcontexts },
}Contexts and sub contexts must be unique, so we don't need to be super precise here.
src/server/initServer.ts
Outdated
| } | ||
|
|
||
| if (actionErrorFilterState.type === 'error' && actionErrorFilterState.errorMessage) { | ||
| query.errorMessage = { $regex: actionErrorFilterState.errorMessage, $options: 'i' }; |
There was a problem hiding this comment.
If users can use regexes, let's describe this in the UI
src/server/initServer.ts
Outdated
| query.type = actionErrorFilterState.type; | ||
| } | ||
|
|
||
| if (actionErrorFilterState.type === 'error' && actionErrorFilterState.errorMessage) { |
There was a problem hiding this comment.
Let's move the filter types to the server, then npm run copy-server-types to get them on the client. Then, reference the types: actionErrorFilterState.type === ActionType.Error
src/server/initServer.ts
Outdated
| } | ||
|
|
||
| if (advancedFilterState.userId) { | ||
| query.userId = parseInt(advancedFilterState.userId, 10); |
| roles.push({ isAdmin: true }); | ||
| } | ||
| if (roles.length > 0) { | ||
| query.$and = [{ $or: roles }]; |
There was a problem hiding this comment.
This is complex. Explain in a comment
src/server/initServer.ts
Outdated
| } | ||
|
|
||
| if (advancedFilterState.courseId) { | ||
| query.courseId = parseInt(advancedFilterState.courseId, 10); |
src/server/initServer.ts
Outdated
| } | ||
|
|
||
| if (advancedFilterState.isMobile !== undefined) { | ||
| query['device.isMobile'] = advancedFilterState.isMobile; |
There was a problem hiding this comment.
To be sure, let's cast to boolean
| }, | ||
| perPage: 1000, | ||
| query, | ||
| perPage: 50, |
There was a problem hiding this comment.
Generally, needs a lot of comments because this code is super complicated. Good work! I just want others to be able to understand it
src/server/initServer.ts
Outdated
| contextFilterState: ContextFilterState, | ||
| tagFilterState: TagFilterState, | ||
| actionErrorFilterState: ActionErrorFilterState, | ||
| advancedFilterState: AdvancedFilterState, |
There was a problem hiding this comment.
Can we make this into a type? LogReviewerFilters perhaps? That would be a folder containing an index.ts which was this thing:
dateFilterState: DateFilterState,
contextFilterState: ContextFilterState,
tagFilterState: TagFilterState,
actionErrorFilterState: ActionErrorFilterState,
advancedFilterState: AdvancedFilterState,plus all the other types would be subtypes of this one and would be inside that folder too
src/server/initServer.ts
Outdated
| } | ||
| } else { | ||
| // At least one subcontext is selected | ||
| if (Object.values(value).some((subcontextValue) => { return subcontextValue; })) { |
There was a problem hiding this comment.
Please put this in a separate variable
No description provided.