Skip to content
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

Fix route search bal #423

Merged
merged 1 commit into from
Feb 6, 2024
Merged

Fix route search bal #423

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
6 changes: 3 additions & 3 deletions apps/api/src/modules/base_locale/dto/search_base_locale.query.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@ import { ApiProperty } from '@nestjs/swagger';

export class SearchBaseLocalQuery {
@ApiProperty({ required: false, nullable: false })
limit?: number = 20;
limit?: string = '20';

@ApiProperty({ required: false, nullable: false })
offset?: number = 0;
offset?: string = '0';

@ApiProperty({ required: false, nullable: false })
deleted?: boolean = false;
deleted?: string;

@ApiProperty({ required: false, nullable: false })
commune?: string;
Expand Down
9 changes: 5 additions & 4 deletions apps/api/src/modules/base_locale/pipe/search_query.pipe.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,7 @@ import { getCommune } from '@/shared/utils/cog.utils';
import { StatusBaseLocalEnum } from '@/shared/schemas/base_locale/status.enum';

import { checkValidEmail } from '@/modules/base_locale/utils/base_locale.utils';
import { SearchBaseLocalQuery } from '../dto/search_base_locale.query';

export type SearchQueryTransformed = {
offset: number;
Expand All @@ -20,7 +21,7 @@ export type SearchQueryTransformed = {

@Injectable()
export class SearchQueryPipe implements PipeTransform {
transform(query: any): SearchQueryTransformed {
transform(query: SearchBaseLocalQuery): SearchQueryTransformed {
const limit = query.limit ? Number.parseInt(query.limit, 10) : 20;
const offset = query.offset ? Number.parseInt(query.offset, 10) : 0;
const filters: FilterQuery<BaseLocale> = {};
Expand All @@ -39,9 +40,9 @@ export class SearchQueryPipe implements PipeTransform {
);
}

if (Number.parseInt(query.deleted) === 0) {
if (query.deleted === 'false') {
filters._deleted = { $eq: null };
} else if (Number.parseInt(query.deleted) === 1) {
} else if (query.deleted === 'true') {
filters._deleted = { $ne: null };
} else if (query.deleted) {
throw new HttpException(
Expand Down Expand Up @@ -80,7 +81,7 @@ export class SearchQueryPipe implements PipeTransform {
StatusBaseLocalEnum.DRAFT,
StatusBaseLocalEnum.PUBLISHED,
StatusBaseLocalEnum.REPLACED,
].includes(query.status)
].includes(query.status as StatusBaseLocalEnum)
) {
filters.status = { $eq: query.status };
} else {
Expand Down
Loading