From b04d3183b75b5977a288d66151570211b335beba Mon Sep 17 00:00:00 2001 From: mahyargdz Date: Wed, 23 Apr 2025 15:08:48 +0330 Subject: [PATCH] update: change user discount route --- src/modules/blogs/repositories/blog-categories.repository.ts | 2 +- src/modules/discounts/discounts.controller.ts | 2 +- src/modules/discounts/providers/discounts.service.ts | 2 +- src/modules/discounts/repositories/discounts.repository.ts | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/modules/blogs/repositories/blog-categories.repository.ts b/src/modules/blogs/repositories/blog-categories.repository.ts index 26f9eb9..8c3ff73 100755 --- a/src/modules/blogs/repositories/blog-categories.repository.ts +++ b/src/modules/blogs/repositories/blog-categories.repository.ts @@ -29,7 +29,7 @@ export class BlogCategoriesRepository extends Repository { async getCategories(queryDto: CategoryListSearchQueryDto) { const { limit, skip } = PaginationUtils(queryDto); - const query = this.createQueryBuilder("blogCategory").where("blogCategory.deletedAt IS NULL"); + const query = this.createQueryBuilder("blogCategory"); if (queryDto.q) { query.andWhere("blogCategory.title ILIKE :q OR blogCategory.slug ILIKE :q", { q: `%${queryDto.q}%` }); diff --git a/src/modules/discounts/discounts.controller.ts b/src/modules/discounts/discounts.controller.ts index 6fd7850..e2082b7 100755 --- a/src/modules/discounts/discounts.controller.ts +++ b/src/modules/discounts/discounts.controller.ts @@ -69,7 +69,7 @@ export class DiscountsController { } @ApiOperation({ summary: "Get discount list for user" }) - @Get("user") + @Get("user-discounts") getDiscountListForUser(@Query() queryDto: SearchDiscountQueryDto) { return this.discountsService.getDiscountListForUser(queryDto); } diff --git a/src/modules/discounts/providers/discounts.service.ts b/src/modules/discounts/providers/discounts.service.ts index 8369408..558b819 100755 --- a/src/modules/discounts/providers/discounts.service.ts +++ b/src/modules/discounts/providers/discounts.service.ts @@ -166,7 +166,7 @@ export class DiscountsService { await queryRunner.release(); } } - + //************************************************************ */ async getDiscountListForUser(queryDto: SearchDiscountQueryDto) { const [discounts, count] = await this.discountRepository.findDiscountForUser(queryDto); diff --git a/src/modules/discounts/repositories/discounts.repository.ts b/src/modules/discounts/repositories/discounts.repository.ts index 11687b0..e1a7c96 100755 --- a/src/modules/discounts/repositories/discounts.repository.ts +++ b/src/modules/discounts/repositories/discounts.repository.ts @@ -69,7 +69,7 @@ export class DiscountRepository extends Repository { .andWhere("discount.isActive = true") .andWhere("discount.startDate <= :now", { now: new Date() }) .andWhere("discount.endDate >= :now", { now: new Date() }) - .andWhere("discount.type = :type", { type: DiscountApplicationType.CODE_BASED }); + .andWhere("discount.applicationType = :type", { type: DiscountApplicationType.CODE_BASED }); if (queryDto.q) { queryBuilder.andWhere("discount.title ILIKE :query", { query: `%${queryDto.q}%` });