Browse Source

query node - predictable ids IV

ondratra 3 years ago
parent
commit
f0dfab79c4

+ 3 - 3
query-node/mappings/src/common.ts

@@ -45,9 +45,9 @@ export function invalidMetadata(extraInfo: string, data?: unknown): void {
 /*
   Creates a predictable and unique ID for the given content.
 */
-export async function createPredictableId(db: DatabaseManager): Promise<string> {
+export async function getNextId(db: DatabaseManager): Promise<string> {
   // load or create record
-  const existingRecord = await db.get(NextEntityId, {}) || new NextEntityId({id: '0', nextId: 0})
+  const existingRecord = await db.get(NextEntityId, {}) || new NextEntityId({id: '0', nextId: 1})
 
   // remember id
   const entityId = existingRecord.nextId
@@ -74,7 +74,7 @@ export async function prepareDataObject(
   const customContentParameters = new Custom_ContentParameters(registry, contentParameters.toJSON() as any)
 
   const dataObject = new DataObject({
-    id: await createPredictableId(db),
+    id: await getNextId(db),
     owner,
     createdInBlock: event.blockNumber,
     typeId: contentParameters.type_id.toNumber(),

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

@@ -34,7 +34,7 @@ import {
   inconsistentState,
   logger,
   prepareDataObject,
-  createPredictableId,
+  getNextId,
 } from '../common'
 
 
@@ -634,7 +634,7 @@ async function prepareLanguage(
 
   // create new language
   const newLanguage = new Language({
-    id: await createPredictableId(db),
+    id: await getNextId(db),
     iso: languageIso,
     createdInBlock: event.blockNumber,
 
@@ -669,7 +669,7 @@ async function prepareLicense(
   // crete new license
   const license = new License({
     ...licenseProtobuf,
-    id: await createPredictableId(db),
+    id: await getNextId(db),
 
     createdById: '1',
     updatedById: '1',

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

@@ -11,7 +11,7 @@ import {
 import {
   inconsistentState,
   logger,
-  createPredictableId,
+  getNextId,
 } from '../common'
 
 import {
@@ -469,10 +469,10 @@ async function integrateVideoMediaMetadata(
 
   // ensure predictable ids
   if (!mediaMetadata.encoding.id) {
-    mediaMetadata.encoding.id = await createPredictableId(db)
+    mediaMetadata.encoding.id = await getNextId(db)
   }
   if (!mediaMetadata.id) {
-    mediaMetadata.id = await createPredictableId(db)
+    mediaMetadata.id = await getNextId(db)
   }
 
   return {

+ 2 - 2
query-node/mappings/src/workingGroup.ts

@@ -6,7 +6,7 @@ import { Bytes } from '@polkadot/types'
 import {
   inconsistentState,
   logger,
-  createPredictableId,
+  getNextId,
 } from './common'
 
 import {
@@ -181,7 +181,7 @@ async function createWorker(
   event: SubstrateEvent,
 ): Promise<void> {
   const newWorker = new Worker({
-    id: await createPredictableId(db),
+    id: await getNextId(db),
     workerId: workerId.toString(),
     type: workerType,
     isActive: true,