fix config

gear-foundation · Feb 26, 2024 · fe06159 · fe06159
1 parent 1debac7
commit fe06159
Show file tree

Hide file tree

Showing 5 changed files with 68 additions and 40 deletions.
diff --git a/indexer/db/migrations/1708938587449-Data.js b/indexer/db/migrations/1708938587449-Data.js
diff --git a/indexer/schema.graphql b/indexer/schema.graphql
@@ -11,17 +11,17 @@ type Marketplace @entity {
 }
 
 type MarketplaceConfig @entity {
-  gasForCreation: Int
-  gasForTransferToken: Int
-  gasForCloseAuction: Int
-  gasForDeleteCollection: Int
-  gasForGetTokenInfo: Int
-  timeBetweenCreateCollections: Int
-  royaltyToMarketplaceForMint: Int
-  royaltyToMarketplaceForTrade: Int
-  feePerUploadedFile: BigInt
-  minimumTransferValue: BigInt
-  msInBlock: Int
+  gasForCreation: Int!
+  gasForTransferToken: Int!
+  gasForCloseAuction: Int!
+  gasForDeleteCollection: Int!
+  gasForGetTokenInfo: Int!
+  timeBetweenCreateCollections: Int!
+  royaltyToMarketplaceForMint: Int!
+  royaltyToMarketplaceForTrade: Int!
+  feePerUploadedFile: BigInt!
+  minimumTransferValue: BigInt!
+  msInBlock: Int!
   marketplace: Marketplace!
 }
 

diff --git a/indexer/src/model/generated/marketplaceConfig.model.ts b/indexer/src/model/generated/marketplaceConfig.model.ts
@@ -17,44 +17,44 @@ export class MarketplaceConfig {
   @PrimaryColumn_()
   id!: string;
 
-  @Column_('int4', { nullable: true })
-  gasForCreation!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  gasForCreation!: number;
 
-  @Column_('int4', { nullable: true })
-  gasForTransferToken!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  gasForTransferToken!: number;
 
-  @Column_('int4', { nullable: true })
-  gasForCloseAuction!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  gasForCloseAuction!: number;
 
-  @Column_('int4', { nullable: true })
-  gasForDeleteCollection!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  gasForDeleteCollection!: number;
 
-  @Column_('int4', { nullable: true })
-  gasForGetTokenInfo!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  gasForGetTokenInfo!: number;
 
-  @Column_('int4', { nullable: true })
-  timeBetweenCreateCollections!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  timeBetweenCreateCollections!: number;
 
-  @Column_('int4', { nullable: true })
-  royaltyToMarketplaceForMint!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  royaltyToMarketplaceForMint!: number;
 
-  @Column_('int4', { nullable: true })
-  royaltyToMarketplaceForTrade!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  royaltyToMarketplaceForTrade!: number;
 
   @Column_('numeric', {
     transformer: marshal.bigintTransformer,
-    nullable: true,
+    nullable: false,
   })
-  feePerUploadedFile!: bigint | undefined | null;
+  feePerUploadedFile!: bigint;
 
   @Column_('numeric', {
     transformer: marshal.bigintTransformer,
-    nullable: true,
+    nullable: false,
   })
-  minimumTransferValue!: bigint | undefined | null;
+  minimumTransferValue!: bigint;
 
-  @Column_('int4', { nullable: true })
-  msInBlock!: number | undefined | null;
+  @Column_('int4', { nullable: false })
+  msInBlock!: number;
 
   @Index_()
   @ManyToOne_(() => Marketplace, { nullable: true })

diff --git a/indexer/src/processing/marketplace/initialized.handler.ts b/indexer/src/processing/marketplace/initialized.handler.ts
@@ -4,7 +4,9 @@ import { MarketplaceConfig } from '../../model';
 import { EventInfo } from '../event-info.type';
 import { Initialized } from '../../types/marketplace.events';
 
-export class MarketplaceInitializedHandler implements INftMarketplaceEventHandler {
+export class MarketplaceInitializedHandler
+  implements INftMarketplaceEventHandler
+{
   async handle(
     event: Initialized,
     eventInfo: EventInfo,

diff --git a/indexer/src/processing/marketplace/new-collection-added.handler.ts b/indexer/src/processing/marketplace/new-collection-added.handler.ts
@@ -12,12 +12,6 @@ export class NewCollectionAddedHandler implements INftMarketplaceEventHandler {
   ): Promise<void> {
     const { codeId, metaLink, typeName, typeDescription } = event;
     const existingCollectionType = await storage.getCollectionType(typeName);
-    if (existingCollectionType !== undefined) {
-      console.warn(
-        `[NewCollectionAddedHandler]: Collection type ${typeName} already exists`,
-      );
-      return;
-    }
     if (!typeName) {
       console.warn(
         `[NewCollectionAddedHandler]: Collection type ${typeName} is not valid`,
@@ -26,6 +20,7 @@ export class NewCollectionAddedHandler implements INftMarketplaceEventHandler {
     }
     await storage.setCollectionType(
       new CollectionType({
+        ...(existingCollectionType ?? {}),
         id: codeId,
         description: typeDescription,
         type: typeName,