chore: get discount data with all relation

This commit is contained in:
Matin
2025-02-17 11:27:40 +03:30
parent 7f09e92abb
commit 9cdd7ef28e
8 changed files with 168 additions and 18 deletions
+8
View File
@@ -414,3 +414,11 @@ export const enum AdsMessage {
ADS_ACTIVATED = "تبلیغ با موفقیت فعال شد",
ADS_DEACTIVATED = "تبلیغ با موفقیت غیرفعال شد",
}
export const enum ProvinceMessage {
SEARCH_QUERY_MUST_BE_A_STRING = "رشته جستجو باید یک رشته باشد",
}
export const enum CityMessage {
SEARCH_QUERY_MUST_BE_A_STRING = "رشته جستجو باید یک رشته باشد",
}
@@ -0,0 +1,12 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsOptional, IsString } from "class-validator";
import { PaginationDto } from "../../../common/DTO/pagination.dto";
import { CityMessage } from "../../../common/enums/message.enum";
export class SearchCitiesDto extends PaginationDto {
@IsOptional()
@IsString({ message: CityMessage.SEARCH_QUERY_MUST_BE_A_STRING })
@ApiPropertyOptional({ description: "search query", example: "search query" })
q: string;
}
@@ -0,0 +1,12 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsOptional, IsString } from "class-validator";
import { PaginationDto } from "../../../common/DTO/pagination.dto";
import { ProvinceMessage } from "../../../common/enums/message.enum";
export class SearchProvincesDto extends PaginationDto {
@IsOptional()
@IsString({ message: ProvinceMessage.SEARCH_QUERY_MUST_BE_A_STRING })
@ApiPropertyOptional({ description: "search query", example: "search query" })
q: string;
}
+19 -2
View File
@@ -1,6 +1,23 @@
import { Controller } from "@nestjs/common";
import { Controller, Get, Query } from "@nestjs/common";
import { ApiOperation } from "@nestjs/swagger";
import { SearchCitiesDto } from "./DTO/cities-search-query.dto";
import { SearchProvincesDto } from "./DTO/provinces-search-query.dto";
import { AddressService } from "./providers/address.service";
@Controller("address")
export class AddressController {
constructor() {}
constructor(private readonly addressService: AddressService) {}
@ApiOperation({ summary: "Get all cities" })
@Get("cities/list")
getCitiesList(@Query() queryDto: SearchCitiesDto) {
return this.addressService.getAllCities(queryDto);
}
@ApiOperation({ summary: "Get all provinces" })
@Get("provinces/list")
getProvincesList(@Query() queryDto: SearchProvincesDto) {
return this.addressService.getAllProvinces(queryDto);
}
}
@@ -1,6 +1,54 @@
import { Injectable } from "@nestjs/common";
import { PaginationUtils } from "../../utils/providers/pagination.utils";
import { SearchCitiesDto } from "../DTO/cities-search-query.dto";
import { CityRepository } from "../repositories/city.repository";
import { ProvinceRepository } from "../repositories/province.repository";
@Injectable()
export class AddressService {
constructor() {}
constructor(
private readonly cityRepository: CityRepository,
private readonly provinceRepository: ProvinceRepository,
) {}
async getAllCities(queryDto: SearchCitiesDto) {
const { limit, skip } = PaginationUtils(queryDto);
const queryBuilder = this.cityRepository.createQueryBuilder("city");
if (queryDto.q) {
queryBuilder.andWhere("city.name ILIKE :q", { q: `%${queryDto.q}%` });
}
queryBuilder.skip(skip).take(limit);
const [cities, count] = await queryBuilder.getManyAndCount();
return {
cities,
count,
paginate: true,
};
}
async getAllProvinces(queryDto: SearchCitiesDto) {
const { limit, skip } = PaginationUtils(queryDto);
const queryBuilder = this.provinceRepository.createQueryBuilder("province");
if (queryDto.q) {
queryBuilder.andWhere("province.name ILIKE :q", { q: `%${queryDto.q}%` });
}
queryBuilder.skip(skip).take(limit);
const [provinces, count] = await queryBuilder.getManyAndCount();
return {
provinces,
count,
paginate: true,
};
}
}
@@ -0,0 +1,12 @@
import { ApiPropertyOptional } from "@nestjs/swagger";
import { IsOptional, IsString } from "class-validator";
import { PaginationDto } from "../../../common/DTO/pagination.dto";
import { FinancialMessage } from "../../../common/enums/message.enum";
export class SearchDiscountsDto extends PaginationDto {
@IsOptional()
@IsString({ message: FinancialMessage.SEARCH_QUERY_MUST_BE_A_STRING })
@ApiPropertyOptional({ description: "search query", example: "search query" })
q: string;
}
@@ -1,7 +1,8 @@
import { Body, Controller, Get, Param, Patch, Post } from "@nestjs/common";
import { Body, Controller, Get, Param, Patch, Post, Query } from "@nestjs/common";
import { ApiOperation, ApiTags } from "@nestjs/swagger";
import { CreateDiscountDto } from "./DTO/create-discount.dto";
import { SearchDiscountsDto } from "./DTO/discount-search-query.dto";
import { DiscountService } from "./providers/discounts.service";
import { AuthGuards } from "../../common/decorators/auth-guard.decorator";
import { Roles } from "../../common/decorators/roles.decorator";
@@ -29,8 +30,8 @@ export class DiscountController {
@ApiOperation({ summary: "Retrieve all discounts" })
@Roles(RoleEnum.ADMIN)
@Get()
async findAll() {
return this.discountService.findAll();
async findAll(@Query() queryDto: SearchDiscountsDto) {
return this.discountService.findAll(queryDto);
}
//************************************ */
@@ -46,8 +47,8 @@ export class DiscountController {
@ApiOperation({ summary: "Retrieve a discounts by userID" })
@Get("/user-discounts")
async findDiscountsByUsers(@UserDec("id") userId: string) {
return this.discountService.findDiscountsByUser(userId);
async findDiscountsByUsers(@Query() queryDto: SearchDiscountsDto, @UserDec("id") userId: string) {
return this.discountService.findDiscountsByUser(queryDto, userId);
}
//************************************ */
@@ -6,7 +6,9 @@ import { In } from "typeorm";
import { CommonMessage, DiscountMessage, SubscriptionMessage, UserMessage } from "../../../common/enums/message.enum";
import { SubscriptionsPlanRepository } from "../../subscriptions/repositories/subscriptions.repository";
import { UserRepository } from "../../users/repositories/users.repository";
import { PaginationUtils } from "../../utils/providers/pagination.utils";
import { CreateDiscountDto } from "../DTO/create-discount.dto";
import { SearchDiscountsDto } from "../DTO/discount-search-query.dto";
import { DiscountRepository } from "../repositories/discount.repository";
@Injectable()
@@ -74,26 +76,64 @@ export class DiscountService {
/******************************************** */
async findDiscountsByUser(userId: string) {
async findDiscountsByUser(queryDto: SearchDiscountsDto, userId: string) {
const user = await this.userRepository.findOneBy({
id: userId,
});
if (!user) throw new BadRequestException(UserMessage.USER_NOT_FOUND);
const discounts = await this.discountRepository.find({
where: {
users: { id: user.id },
},
});
const { limit, skip } = PaginationUtils(queryDto);
return { discounts };
const queryBuilder = this.discountRepository.createQueryBuilder("discount");
queryBuilder
.leftJoin("discount.users", "user")
.where("user.id = :userId", { userId: user.id })
.leftJoinAndSelect("discount.subscriptionPlans", "subscriptionPlans")
.leftJoin("subscriptionPlans.service", "service")
.addSelect(["service.id", "service.name", "service.title", "service.link", "service.icon", "service.description"]);
if (queryDto.q) {
queryBuilder.andWhere("discount.code ILIKE :q", { q: `%${queryDto.q}%` });
}
queryBuilder.orderBy("discount.createdAt", "DESC").skip(skip).take(limit);
const [discounts, count] = await queryBuilder.getManyAndCount();
return {
discounts,
count,
paginate: true,
};
}
/******************************************** */
async findAll() {
const discounts = await this.discountRepository.find({ relations: ["subscriptionPlans"] });
return { discounts };
async findAll(queryDto: SearchDiscountsDto) {
const { limit, skip } = PaginationUtils(queryDto);
const queryBuilder = this.discountRepository.createQueryBuilder("discount");
queryBuilder
.leftJoinAndSelect("discount.subscriptionPlans", "subscriptionPlans")
.leftJoin("subscriptionPlans.service", "service")
.addSelect(["service.id", "service.name", "service.title", "service.link", "service.icon", "service.description"])
.leftJoinAndSelect("discount.users", "users");
if (queryDto.q) {
queryBuilder.andWhere("discount.code ILIKE :q", { q: `%${queryDto.q}%` });
}
queryBuilder.orderBy("discount.createdAt", "DESC").skip(skip).take(limit);
const [discounts, count] = await queryBuilder.getManyAndCount();
return {
discounts,
count,
paginate: true,
};
}
/******************************************** */