Merge pull request 'feat: fix get menu' (#29) from feat/privilege into development
continuous-integration/drone/tag Build is passing Details

Reviewed-on: #29
pull/31/head devel_10.6.18
firmanr 2024-07-16 08:15:57 +00:00
commit d5bafe4f4f
1 changed files with 11 additions and 5 deletions

View File

@ -6,9 +6,8 @@ import {
} from 'src/core/modules/domain/entities/base-filter.entity';
import { BaseIndexManager } from 'src/core/modules/domain/usecase/managers/base-index.manager';
import { ORDER_TYPE } from 'src/core/strings/constants/base.constants';
import { SelectQueryBuilder } from 'typeorm';
import { Brackets, SelectQueryBuilder } from 'typeorm';
import { FilterMenuUserPrivilegeConfigurationDto } from 'src/modules/user-related/user-privilege/infrastructure/dto/filter-menu-user-privilege-configuration.dto';
import { mod } from 'mathjs';
import { PaginationResponse } from 'src/core/response/domain/ok-response.interface';
import { UserRole } from 'src/modules/user-related/user/constants';
import { UserPrivilegeConfigurationHelper } from '../helpers/generate-user-privilege-configuration.helper';
@ -67,9 +66,16 @@ export class MenuUserPrivilegeConfigurationManager extends BaseIndexManager<User
user_privilege_id: this.userProvider.user.user_privilege_id,
});
queryBuilder.andWhere('view = :view', {
view: true,
});
queryBuilder.andWhere(
new Brackets((qb) => {
qb.where('"view" = :view', { view: true }).orWhere(
'"create" = :create',
{
create: true,
},
);
}),
);
return queryBuilder;
}