Merge branch 'main' into feature/c2d_docker

Author: paulo-ocean

.github/CODEOWNERS

@@ -1 +1 @@
-* @alexcos20 @bogdanfazakas @jamiehewitt15 @mariacarmina @paulo-ocean
+* @alexcos20 @bogdanfazakas @jamiehewitt15 @mariacarmina @paulo-ocean @giurgiur99

src/components/database/ElasticSearchDatabase.ts

@@ -587,6 +587,8 @@ export class ElasticsearchDdoDatabase extends AbstractDdoDatabase {
       throw new Error(`Schema for version ${ddo.version} not found`)
     }
     try {
+      // avoid issue with nft fields, due to schema
+      if (ddo?.indexedMetadata?.nft) delete ddo.nft
       const validation = await this.validateDDO(ddo)
       if (validation === true) {
         const response = await this.client.index({
@@ -655,6 +657,8 @@ export class ElasticsearchDdoDatabase extends AbstractDdoDatabase {
       throw new Error(`Schema for version ${ddo.version} not found`)
     }
     try {
+      // avoid issue with nft fields, due to schema
+      if (ddo?.indexedMetadata?.nft) delete ddo.nft
       const validation = await this.validateDDO(ddo)
       if (validation === true) {
         const response: any = await this.client.update({

src/components/database/TypenseDatabase.ts

@@ -471,6 +471,8 @@ export class TypesenseDdoDatabase extends AbstractDdoDatabase {
       throw new Error(`Schema for version ${ddo.version} not found`)
     }
     try {
+      // avoid failure because of schema
+      if (ddo?.indexedMetadata?.nft) delete ddo.nft
       const validation = await this.validateDDO(ddo)
       if (validation === true) {
         return await this.provider
@@ -532,6 +534,8 @@ export class TypesenseDdoDatabase extends AbstractDdoDatabase {
       throw new Error(`Schema for version ${ddo.version} not found`)
     }
     try {
+      // avoid issue with nft fields, due to schema
+      if (ddo?.indexedMetadata?.nft) delete ddo.nft
       const validation = await this.validateDDO(ddo)
       if (validation === true) {
         return await this.provider

src/test/integration/indexer.test.ts

@@ -348,7 +348,7 @@ describe('Indexer stores a new metadata events and orders.', () => {
     const retrievedDDO: any = ddo
     if (retrievedDDO) {
       expect(retrievedDDO.indexedMetadata.nft).to.not.equal(undefined)
-      expect(retrievedDDO).to.have.nested.property('nft.state')
+      expect(retrievedDDO).to.have.nested.property('indexedMetadata.nft.state')
       // Expect the result from contract
       expect(retrievedDDO.indexedMetadata.nft.state).to.equal(
         parseInt(result[2].toString())