query node - processor setup II

query-node/generated/graphql-server/package.json

@@ -3,6 +3,8 @@
   "version": "0.1.0",
   "description": "Generated Warthog Project",
   "license": "MIT",
+  "main": "dist/model/index.js",
+  "types": "dist/model/index.d.ts",
   "scripts": {
     "bootstrap": "yarn bootstrap:dev",
     "bootstrap:dev": "yarn && yarn build:dev && yarn db:drop && yarn db:create && yarn db:migrate && yarn db:seed",

query-node/manifest.yml

@@ -136,16 +136,15 @@ mappings:
       handler: content_ChannelUpdated(DatabaseManager, SubstrateEvent)
     - event: content.ChannelAssetsRemoved
       handler: content_ChannelAssetsRemoved(DatabaseManager, SubstrateEvent)
-    - event: content.ChannelCensored
-      handler: content_ChannelCensored(DatabaseManager, SubstrateEvent)
-    - event: content.ChannelUncensored
-      handler: content_ChannelUncensored(DatabaseManager, SubstrateEvent)
-    - event: content.ChannelOwnershipTransferRequested
-      handler: content_ChannelOwnershipTransferRequested(DatabaseManager, SubstrateEvent)
-    - event: content.ChannelOwnershipTransferRequestWithdrawn
-      handler: content_ChannelOwnershipTransferRequestWithdrawn(DatabaseManager, SubstrateEvent)
-    - event: content.ChannelOwnershipTransferred
-      handler: content_ChannelOwnershipTransferred(DatabaseManager, SubstrateEvent)
+    - event: content.ChannelCensorshipStatusUpdated
+      handler: content_ChannelCensorshipStatusUpdated(DatabaseManager, SubstrateEvent)
+    # these events are defined in runtime but never calles (at the time of writing)
+    #- event: content.ChannelOwnershipTransferRequested
+    #  handler: content_ChannelOwnershipTransferRequested(DatabaseManager, SubstrateEvent)
+    #- event: content.ChannelOwnershipTransferRequestWithdrawn
+    #  handler: content_ChannelOwnershipTransferRequestWithdrawn(DatabaseManager, SubstrateEvent)
+    #- event: content.ChannelOwnershipTransferred
+    #  handler: content_ChannelOwnershipTransferred(DatabaseManager, SubstrateEvent)
     - event: content.ChannelCategoryCreated
       handler: content_ChannelCategoryCreated(DatabaseManager, SubstrateEvent)
     - event: content.ChannelCategoryUpdated
@@ -176,8 +175,9 @@ mappings:
       handler: data_directory_ContentRemoved(DatabaseManager, SubstrateEvent)
     - event: data_directory.ContentAccepted
       handler: data_directory_ContentAccepted(DatabaseManager, SubstrateEvent)
-    - event: data_directory.ContentUploadingStatusUpdated
-      handler: data_directory_ContentUploadingStatusUpdated(DatabaseManager, SubstrateEvent)
+    # not handled at the moment
+    #- event: data_directory.ContentUploadingStatusUpdated
+    #  handler: data_directory_ContentUploadingStatusUpdated(DatabaseManager, SubstrateEvent)
 
   extrinsicHandlers:
     # infer defaults here

query-node/mappings/src/common.ts

@@ -3,16 +3,13 @@ import { SubstrateEvent } from '@dzlzv/hydra-common'
 import { DatabaseManager } from '@dzlzv/hydra-db-utils'
 import { u64 } from '@polkadot/types/primitive';
 
-import { Network } from 'query-node/src/modules/enums/enums'
-
 // Asset
 import {
   DataObjectOwner,
-} from 'query-node/src/modules/variants/variants.model'
-import {
   DataObject,
   LiaisonJudgement,
-} from 'query-node/src/modules/data-object/data-object.model'
+  Network,
+} from 'query-node'
 import {
   ContentParameters
 } from '@joystream/types/augment'

query-node/mappings/src/content/channel.ts

@@ -13,17 +13,15 @@ import {
 } from './utils'
 
 import {
+  Channel,
+  ChannelCategory,
   DataObject,
-} from 'query-node/src/modules/data-object/data-object.model'
+} from 'query-node'
 import {
   inconsistentState,
   logger,
 } from '../common'
 
-// primary entities
-import { Channel } from 'query-node/src/modules/channel/channel.model'
-import { ChannelCategory } from 'query-node/src/modules/channel-category/channel-category.model'
-
 // eslint-disable-next-line @typescript-eslint/naming-convention
 export async function content_ChannelCreated(db: DatabaseManager, event: SubstrateEvent): Promise<void> {
   // read event data

query-node/mappings/src/content/curatorGroup.ts

@@ -2,7 +2,7 @@ import { SubstrateEvent } from '@dzlzv/hydra-common'
 import { DatabaseManager } from '@dzlzv/hydra-db-utils'
 import { FindConditions } from 'typeorm'
 
-import { CuratorGroup } from 'query-node/src/modules/curator-group/curator-group.model'
+import { CuratorGroup } from 'query-node'
 import { Content } from '../../../generated/types'
 
 import {

query-node/mappings/src/content/utils.ts

@@ -34,30 +34,29 @@ import {
   prepareDataObject,
 } from '../common'
 
-// primary entities
-import { CuratorGroup } from 'query-node/src/modules/curator-group/curator-group.model'
-import { Channel } from 'query-node/src/modules/channel/channel.model'
-import { ChannelCategory } from 'query-node/src/modules/channel-category/channel-category.model'
-import { Video } from 'query-node/src/modules/video/video.model'
-import { VideoCategory } from 'query-node/src/modules/video-category/video-category.model'
-
-// secondary entities
-import { Language } from 'query-node/src/modules/language/language.model'
-import { License } from 'query-node/src/modules/license/license.model'
-import { VideoMediaEncoding } from 'query-node/src/modules/video-media-encoding/video-media-encoding.model'
-import { VideoMediaMetadata } from 'query-node/src/modules/video-media-metadata/video-media-metadata.model'
-
-// Asset
-import { AssetAvailability } from 'query-node/src/modules/enums/enums';
-import {
-  DataObject,
-  LiaisonJudgement
-} from 'query-node/src/modules/data-object/data-object.model'
+
 import {
+  // primary entities
+  CuratorGroup,
+  Channel,
+  ChannelCategory,
+  Video,
+  VideoCategory,
+
+  // secondary entities
+  Language,
+  License,
+  VideoMediaEncoding,
+  VideoMediaMetadata,
+
+  // asset
   DataObjectOwner,
   DataObjectOwnerMember,
   DataObjectOwnerChannel,
-} from 'query-node/src/modules/variants/variants.model'
+  DataObject,
+  LiaisonJudgement,
+  AssetAvailability,
+} from 'query-node'
 
 // Joystream types
 import {

query-node/mappings/src/content/video.ts

@@ -19,12 +19,12 @@ import {
 } from './utils'
 
 // primary entities
-import { Channel } from 'query-node/src/modules/channel/channel.model'
-import { Video } from 'query-node/src/modules/video/video.model'
-import { VideoCategory } from 'query-node/src/modules/video-category/video-category.model'
+import { Channel } from 'query-node'
+import { Video } from 'query-node'
+import { VideoCategory } from 'query-node'
 
 // secondary entities
-import { License } from 'query-node/src/modules/license/license.model'
+import { License } from 'query-node'
 
 // Joystream types
 import {

query-node/mappings/src/membership.ts

@@ -10,7 +10,7 @@ import {
   logger,
 } from './common'
 import { Members } from '../../generated/types'
-import { MembershipEntryMethod, Membership } from 'query-node/src/modules/membership/membership.model'
+import { MembershipEntryMethod, Membership } from 'query-node'
 import { EntryMethod } from '@joystream/types/augment'
 
 // eslint-disable-next-line @typescript-eslint/naming-convention

query-node/mappings/src/storage.ts

@@ -16,17 +16,16 @@ import {
   ContentParameters,
   StorageObjectOwner,
 } from '@joystream/types/augment'
-import { LiaisonJudgement } from 'query-node/src/modules/enums/enums'
-
 import {
+  DataObject,
   DataObjectOwner,
   DataObjectOwnerMember,
   DataObjectOwnerChannel,
   DataObjectOwnerDao,
   DataObjectOwnerCouncil,
   DataObjectOwnerWorkingGroup,
-} from 'query-node/src/modules/variants/variants.model'
-import { DataObject } from 'query-node/src/modules/data-object/data-object.model'
+  LiaisonJudgement,
+} from 'query-node'
 
 export async function data_directory_ContentAdded(db: DatabaseManager, event: SubstrateEvent): Promise<void> {
   // read event data