fix: task 521; long response time of filters

package.json

@@ -1,6 +1,6 @@
 {
   "name": "unique-marketplace-backend",
-  "version": "3.0.241",
+  "version": "3.0.243",
   "description": "Backend project for unique marketplace",
   "author": "Unique Network",
   "private": true,

packages/common/modules/config/load.config.ts

@@ -11,6 +11,12 @@ export function loadFileStorageConfig(): FileStorageConfig {
   };
 }
 
+const createAppCacheConfig = () => {
+  return {
+    offersAttributesTtlMs: +process.env.OFFERS_ATTRIBUTES_TTL_MS || 3_600_000,
+  };
+};
+
 export const loadConfig = (): Config => ({
   environment: process.env.ENVIRONMENT || 'development',
   port: parseInt(process.env.PORT, 10) || 3000,
@@ -30,6 +36,7 @@ export const loadConfig = (): Config => ({
   signatureKey: process.env.SIGNATURE_KEY || '', // Sign and Verify key (sign the following data)
 
   cache: createCacheConfig(process.env),
+  appCache: createAppCacheConfig(),
 
   releaseVersion: process.env.npm_package_version,
 

packages/common/modules/config/types.ts

@@ -8,6 +8,10 @@ export interface FileStorageConfig {
   secretKey: string;
 }
 
+export type AppCacheConfig = {
+  offersAttributesTtlMs: number;
+};
+
 export type Config = {
   environment: string;
   port: number;
@@ -16,6 +20,7 @@ export type Config = {
 
   market: MarketSwaggerOptions;
   cache: CacheConfig;
+  appCache: AppCacheConfig;
 
   signer?: SignerConfig;
   signatureKey?: string;

packages/market/src/offers/dto/offers.dto.ts

@@ -140,10 +140,13 @@ export class OffersResultDto {
   itemsCount: number;
   @ApiProperty({ required: false })
   items: OfferEntityDto[];
+}
+
+export class OffersAttributesResultDto {
   @ApiProperty({ required: false, type: 'array' })
   attributes?: Array<any>;
   @ApiProperty({ required: false, type: 'array' })
-  attributesCount?: Array<any>;
+  counts?: Array<any>;
 }
 
 export class OfferAttributes {

packages/market/src/offers/offers.controller.ts

@@ -3,7 +3,7 @@ import { ApiOperation, ApiQuery, ApiResponse, ApiTags } from '@nestjs/swagger';
 import { OffersService } from './offers.service';
 import { readApiDocs } from '../utils/utils';
 import { PaginationRouting } from '@app/common/src/lib/base.constants';
-import { OfferEntityDto, OffersFilter, OffersResultDto } from './dto/offers.dto';
+import { OfferEntityDto, OffersAttributesResultDto, OffersFilter, OffersResultDto } from './dto/offers.dto';
 import { ParseOffersFilterPipe } from './pipes/offer-filter.pipe';
 import { SortingOfferRequest } from '@app/common/modules/types/requests';
 import { ParseSortFilterPipe } from './pipes/sort-order.pipe';
@@ -32,6 +32,15 @@ export class OffersController {
     return await this.offersService.getOffers(offerFilter, pagination, sortFilter);
   }
 
+  @Get('/attributes')
+  @ApiOperation({
+    summary: 'Get offers attributes',
+  })
+  @ApiResponse({ type: OffersAttributesResultDto, status: HttpStatus.OK })
+  async getAttributes() {
+    return await this.offersService.getOfferAttributes();
+  }
+
   @Get(':id')
   @ApiOperation({
     summary: 'Get offer by ID',

packages/market/src/offers/offers.service.ts

@@ -48,6 +48,7 @@ export class OffersService extends BaseService<OfferEntity, OffersDto> {
 
       items = this.parseItems(offers.items, propertiesFilter, collections) as any as Array<ViewOffers>;
     } catch (e) {
+      console.log(e);
       this.logger.error(e.message);
 
       throw new BadRequestException({
@@ -60,11 +61,26 @@ export class OffersService extends BaseService<OfferEntity, OffersDto> {
     return {
       ...offers.meta,
       items: items.map(OfferEntityDto.fromOffersEntity),
-      attributes: offers.attributes as Array<TraitDto>,
-      attributesCount: offers.attributesCount,
     };
   }
 
+  async getOfferAttributes(): Promise<any> {
+    let attributes;
+    try {
+      attributes = await this.viewOffersService.getAttributes();
+    } catch (e) {
+      this.logger.error(e.message);
+
+      throw new BadRequestException({
+        statusCode: HttpStatus.BAD_REQUEST,
+        message: 'Something went wrong!',
+        error: e.message,
+      });
+    }
+
+    return attributes;
+  }
+
   /**
    * Show one selected offer
    * @param { collectionId: number; tokenId: number } filter - The ID of the collection and token

packages/market/src/offers/view-offers.service.ts

@@ -1,4 +1,4 @@
-import { BadRequestException, HttpStatus, Injectable, Logger } from '@nestjs/common';
+import { BadRequestException, CACHE_MANAGER, HttpStatus, Inject, Injectable, Logger } from '@nestjs/common';
 import { InjectRepository } from '@nestjs/typeorm';
 import { OfferEntity, ViewOffers } from '@app/common/modules/database';
 import { DataSource, Repository, SelectQueryBuilder, ValueTransformer } from 'typeorm';
@@ -11,6 +11,9 @@ import { GetOneFilter, SortingOrder, SortingParameter } from './interfaces/offer
 import { HelperService } from '@app/common/src/lib/helper.service';
 import { PaginationRouting } from '@app/common/src/lib/base.constants';
 import { SortingOfferRequest } from '@app/common/modules/types/requests';
+import { Cache } from 'cache-manager';
+import { ConfigService } from '@nestjs/config';
+import { AppCacheConfig } from '@app/common/modules/config/types';
 
 const offersMapping = {
   priceRaw: 'price_raw',
@@ -36,13 +39,18 @@ const priceTransformer: ValueTransformer = {
 export class ViewOffersService {
   private logger = new Logger(ViewOffersService.name);
   private readonly offersSorts: Record<string, string>;
+  private appCache: AppCacheConfig;
 
   constructor(
+    configService: ConfigService,
     private connection: DataSource,
     @InjectRepository(ViewOffers) private viewOffersRepository: Repository<ViewOffers>,
     private readonly bundleService: BundleService,
+    @Inject(CACHE_MANAGER)
+    private readonly cache: Cache,
   ) {
     this.offersSorts = this.prepareMapping(offersMapping, connection.getMetadata(OfferEntity).columns);
+    this.appCache = configService.getOrThrow<AppCacheConfig>('appCache');
   }
 
   prepareMapping = (input: Record<string, string>, columnMetadata: ColumnMetadata[]): Record<string, string> => {
@@ -166,39 +174,61 @@ export class ViewOffersService {
     return this.bundleService.bundle(collectionId, tokenId);
   }
 
+  public async getAttributes(): Promise<any> {
+    let response = await this.cache.get('offers-attributes');
+
+    if (response) {
+      return response;
+    } else {
+      const queryFilter = this.viewOffersRepository.createQueryBuilder('view_offers');
+      const counts = await this.byAttributesCount(queryFilter);
+      const attributes = await this.byAttributes(queryFilter).getRawMany();
+      const attributesParsed = this.parseAttributes(attributes);
+
+      response = {
+        counts,
+        attributes: attributesParsed,
+      };
+
+      await this.cache.set('offers-attributes', response, this.appCache.offersAttributesTtlMs);
+
+      return response;
+    }
+  }
+
   public async filter(offersFilter: OffersFilter, pagination: PaginationRouting, sort: SortingOfferRequest): Promise<any> {
     let queryFilter = this.viewOffersRepository.createQueryBuilder('view_offers');
+
     // Filert by collection id
     queryFilter = this.byCollectionId(queryFilter, offersFilter.collectionId);
+
     // Filter by max price
     queryFilter = this.byMaxPrice(queryFilter, offersFilter.maxPrice);
+
     // Filter by min price
     queryFilter = this.byMinPrice(queryFilter, offersFilter.minPrice);
+
     // Filter by seller address
     queryFilter = this.bySeller(queryFilter, offersFilter.seller);
+
     // Filter by search
     queryFilter = this.bySearch(queryFilter, offersFilter.searchText, offersFilter.searchLocale);
 
     // Filter by traits
     queryFilter = this.byFindAttributes(queryFilter, offersFilter.collectionId, offersFilter.attributes);
-    // Does not contain a search by the number of attributes
-    const attributesCount = await this.byAttributesCount(queryFilter);
+
     // Exceptions to the influence of the search by the number of attributes
     queryFilter = this.byNumberOfAttributes(queryFilter, offersFilter.numberOfAttributes);
 
-    const attributes = await this.byAttributes(queryFilter).getRawMany();
-
     queryFilter = this.prepareQuery(queryFilter);
+
     queryFilter = this.sortBy(queryFilter, sort);
-    //
+
     const itemQuery = await paginateRaw(queryFilter, pagination);
-    //
 
     return {
       meta: itemQuery.meta,
       items: itemQuery.items,
-      attributes: this.parseAttributes(attributes),
-      attributesCount,
     };
   }