Merge pull request #1031 from multiversx/SERVICES-1856-fix-assets-que…

…ry-filter-by-collections

Services 1856 fix assets query filter by collections

schema.gql

@@ -628,6 +628,7 @@ input CollectionsFilter {
 
   """The owner of the collection"""
   ownerAddress: String
+  searchTerm: String
   type: NftTypeEnum
 
   """Flag for verified collections"""

src/modules/artists/smart-contract-artist.service.ts

@@ -23,11 +23,19 @@ export class SmartContractArtistsService {
   }
 
   public async getArtistForScAddress(scAddress: string): Promise<{ address: string; owner: string }> {
-    const account = await this.mxApiService.getSmartContractOwner(scAddress);
-    if (account.owner === XOXNO_MINTING_MANAGER) {
-      return await this.getXoxnoMinterOwner(scAddress);
+    try {
+      const account = await this.mxApiService.getSmartContractOwner(scAddress);
+      if (account.owner === XOXNO_MINTING_MANAGER) {
+        return await this.getXoxnoMinterOwner(scAddress);
+      }
+      return account;
+    } catch (error) {
+      this.logger.error('There was an error while getting the smartcontract owner', scAddress, error);
+      return {
+        address: scAddress,
+        owner: scAddress,
+      };
     }
-    return account;
   }
 
   private async getXoxnoMinterOwner(scAddress: string): Promise<{ address: string; owner: string }> {

src/modules/assets/assets-getter.service.ts

@@ -73,8 +73,8 @@ export class AssetsGetterService {
       const ticketCollectionIdentifiers = ticketsCollections.map((x) => x.collection).toString();
       return await this.getAssetsForUser(
         filters.ownerAddress,
-        `?collections=${ticketCollectionIdentifiers}&from=${offset}&size=${limit}`,
-        `?collections=${ticketCollectionIdentifiers}`,
+        `?identifiers=${ticketCollectionIdentifiers}&from=${offset}&size=${limit}`,
+        `?identifiers=${ticketCollectionIdentifiers}`,
       );
     }
 

src/modules/assets/assets-query.ts

@@ -44,7 +44,7 @@ export class AssetsQuery {
   }
 
   addCollections(collections: string[]): this {
-    return this.addParamToQuery('collections', collections?.toString());
+    return this.addParamToQuery('identifiers', collections?.toString());
   }
 
   addType(type: NftTypeEnum): this {

src/modules/nftCollections/collection-query.ts

@@ -24,6 +24,13 @@ export class CollectionQuery {
     return this;
   }
 
+  addSearchTerm(searchTerm: string): this {
+    if (searchTerm === undefined) return this;
+    if (this.query === '') this.query = `?search=${encodeURIComponent(searchTerm)}`;
+    else this.query = `${this.query}&search=${encodeURIComponent(searchTerm)}`;
+    return this;
+  }
+
   addPageSize(from: number, size: number): this {
     if ((!from && from < 0) || !size) {
       return this;

src/modules/nftCollections/collections-getter.service.ts

@@ -195,6 +195,16 @@ export class CollectionsGetterService {
     if (filters?.type) {
       collections = collections?.filter((token) => token.type === filters?.type);
     }
+    if (filters?.searchTerm) {
+      collections = collections.filter(
+        (x) =>
+          x.verified &&
+          (x.name?.toLowerCase()?.includes(filters.searchTerm.toLowerCase()) ||
+            x.collection?.toLowerCase()?.includes(filters.searchTerm.toLowerCase())),
+      );
+      collections = collections?.filter((token) => token.type === filters?.type);
+    }
+
     return collections;
   }
 
@@ -360,6 +370,7 @@ export class CollectionsGetterService {
       .addCreator(filters?.creatorAddress)
       .addType(filters?.type)
       .addCanCreate(filters?.canCreate)
+      .addSearchTerm(filters?.searchTerm)
       .addPageSize(offset, limit)
       .build();
     if (filters?.collection) {

src/modules/nftCollections/models/Collections-Filters.ts

@@ -1,5 +1,5 @@
 import { InputType, Field, registerEnumType } from '@nestjs/graphql';
-import { IsOptional, Matches } from 'class-validator';
+import { IsOptional, Matches, MinLength } from 'class-validator';
 import { NftTypeEnum } from 'src/modules/assets/models';
 import { ADDRESS_RGX, ADDRESS_ERROR, COLLECTION_IDENTIFIER_RGX, COLLECTION_IDENTIFIER_ERROR } from 'src/utils/constants';
 
@@ -63,6 +63,13 @@ export class CollectionsFilter {
     description: 'Flag for active last 30 days',
   })
   activeLast30Days: boolean;
+
+  @IsOptional()
+  @Field(() => String, { nullable: true })
+  @MinLength(3, {
+    message: 'The search term should contain at least 3 characters',
+  })
+  searchTerm: string;
 }
 @InputType()
 export class AssetsCollectionFilter {