Skip to content

Fix: update lesson and course filtering to exclude archived entries #328

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
merged 1 commit into from
Feb 11, 2025
Merged

Fix: update lesson and course filtering to exclude archived entries #328

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
22 changes: 19 additions & 3 deletions apps/quick-learn-backend/src/routes/lesson/lesson.service.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,13 @@ import { en } from '@src/lang/en';
import { UserTypeIdEnum } from '@quick-learn/shared';
import { PaginationDto } from '../users/dto';
import { PaginatedResult } from '@src/common/interfaces';
import { Repository, DataSource, ILike, MoreThan } from 'typeorm';
import {
Repository,
DataSource,
ILike,
MoreThan,
FindManyOptions,
} from 'typeorm';
import Helpers from '@src/common/utils/helper';
import { FileService } from '@src/file/file.service';
import { DailyLessonEnum } from '@src/common/enum/daily_lesson.enum';
Expand Down Expand Up @@ -454,13 +460,20 @@ export class LessonService extends PaginationService<LessonEntity> {
try {
const skipItems = (page - 1) * limit;

const findOptions = {
const findOptions: FindManyOptions<FlaggedLessonEntity> = {
relations: {
user: true,
lesson: true,
course: true,
},
where: {},
where: {
lesson: {
archived: false,
},
course: {
archived: false,
},
},
skip: skipItems,
take: limit,
};
Expand All @@ -469,11 +482,14 @@ export class LessonService extends PaginationService<LessonEntity> {
if (search) {
findOptions.where = [
{
...findOptions.where,
lesson: {
name: ILike(`%${search}%`),
archived: false,
},
},
{
...findOptions.where,
user: {
full_name: ILike(`%${search}%`),
},
Expand Down