diff --git a/libs/common/src/constants/product-type.enum.ts b/libs/common/src/constants/product-type.enum.ts index 4f72a25..6442f87 100644 --- a/libs/common/src/constants/product-type.enum.ts +++ b/libs/common/src/constants/product-type.enum.ts @@ -14,4 +14,5 @@ export enum ProductType { ONE_1TG = '1GT', WL = 'WL', GD = 'GD', + CUR = 'CUR', } diff --git a/src/group/services/group.service.ts b/src/group/services/group.service.ts index 4f1a1f7..f549afc 100644 --- a/src/group/services/group.service.ts +++ b/src/group/services/group.service.ts @@ -7,6 +7,7 @@ import { convertKeysToCamelCase } from '@app/common/helper/camelCaseConverter'; import { ProductRepository } from '@app/common/modules/product/repositories'; import { PermissionType } from '@app/common/constants/permission-type.enum'; import { In } from 'typeorm'; +import { ProductType } from '@app/common/constants/product-type.enum'; @Injectable() export class GroupService { @@ -44,8 +45,24 @@ export class GroupService { }); const uniqueGroupNames = [...new Set(groupNames)]; - - return uniqueGroupNames.map((groupName) => ({ groupName })); + const groups = uniqueGroupNames.map((groupName) => ({ + groupName: groupName as ProductType, + })); + const allowedProductTypes = [ + ProductType.ONE_1TG, + ProductType.TWO_2TG, + ProductType.THREE_3TG, + ProductType.THREE_G, + ProductType.TWO_G, + ProductType.ONE_G, + ProductType.GD, + ProductType.WH, + ProductType.AC, + ProductType.CUR, + ]; + return groups.filter((group) => + allowedProductTypes.includes(group.groupName), + ); } catch (error) { throw new HttpException( 'This unit does not have any groups',