diff --git a/src/modules/brand/brand.repository.ts b/src/modules/brand/brand.repository.ts index 6a2a743..2caa375 100644 --- a/src/modules/brand/brand.repository.ts +++ b/src/modules/brand/brand.repository.ts @@ -76,11 +76,11 @@ class BrandRepository extends BaseRepository { } async findWithName(name: string) { - return this.model.findOne({ title_en: name }, { _id: 1, title_en: 1, title_fa: 1, status: 1, image: 1, category: 1 }); + return this.model.findOne({ title_en: name, deleted: false }); } async getPendingBrandsCount() { - return this.model.countDocuments({ status: StatusEnum.Pending }); + return this.model.countDocuments({ status: StatusEnum.Pending, deleted: false }); } } function createBrandRepository(): BrandRepository { diff --git a/src/modules/product/Repository/product.ts b/src/modules/product/Repository/product.ts index 4c96e96..1d88f2b 100644 --- a/src/modules/product/Repository/product.ts +++ b/src/modules/product/Repository/product.ts @@ -2471,11 +2471,11 @@ export class ProductRepository extends BaseRepository { "variants.market_status": ProductMarketStatus.Marketable, }, }, - { - $match: { - variants: { $gt: [{ $size: "$variants" }, 0] }, // Ensure variants array has elements - }, - }, + // { + // $match: { + // variants: { $gt: [{ $size: "$variants" }, 0] }, // Ensure variants array has elements + // }, + // }, { $lookup: { from: "categories", @@ -2613,7 +2613,7 @@ export class ProductRepository extends BaseRepository { docs: docs[0]?.data || [], }; } - + //************************************************************** async getProductSpecification(productIds: string[] | string) { const matchQuery: { [k: string]: unknown } = { deleted: false, diff --git a/src/modules/product/providers/product.service.ts b/src/modules/product/providers/product.service.ts index a9135a8..85ecce6 100644 --- a/src/modules/product/providers/product.service.ts +++ b/src/modules/product/providers/product.service.ts @@ -1012,22 +1012,17 @@ class ProductService { //************************************************************** //************************************************************** async searchForCompareProductsS(queries: CompareSearchQueries) { - const product = await this.validateProduct(+queries.productId); + const product = await this.validateProduct(queries.productId); const { docs, count } = await this.productRepo.getProductsForCompareSearch(product.category.toString(), queries); const products = docs.map((doc: IProduct) => ProductDTO.transformProduct(doc)); - return { - count, - products, - }; + return { count, products }; } //************************************************************** //************************************************************** async compareProducts(productIds: string[] | string) { const docs = await this.productRepo.getProductSpecification(productIds); const products = docs.map((doc: IProduct) => ProductDTO.transformProduct(doc)); - return { - products, - }; + return { products }; } //###############################################################