Fix: updating the versions doc and versions endpoints on version tables

Author: LukaAvbreht

src/entity/utxo-entity-definitions.ts

@@ -377,19 +377,18 @@ export class DBIndexerVersion {
   @Column()
   history_seconds: number;
 
-  toApiDBVersion(): ApiDBVersion {
-    const indexerVersion: IndexerVersion = {
+  toIndexerVersion(): IndexerVersion {
+    return {
       gitTag: this.git_tag,
       gitHash: this.git_hash,
       buildDate: this.build_date,
       numConfirmations: this.num_confirmations,
       historySeconds: this.history_seconds,
     };
-    return {
-      nodeVersion: this.node_version,
-      indexer: indexerVersion,
-      apiServer: null,
-    };
+  }
+
+  toNodeVersion(): string {
+    return this.node_version;
   }
 }
 

src/entity/xrp-entity-definitions.ts

@@ -193,19 +193,18 @@ export class DBXrpIndexerVersion {
   @Column()
   history_seconds: number;
 
-  toApiDBVersion(): ApiDBVersion {
-    const indexerVersion: IndexerVersion = {
+  toIndexerVersion(): IndexerVersion {
+    return {
       gitTag: this.git_tag,
       gitHash: this.git_hash,
       buildDate: this.build_date,
       numConfirmations: this.num_confirmations,
       historySeconds: this.history_seconds,
     };
-    return {
-      nodeVersion: this.node_version,
-      indexer: indexerVersion,
-      apiServer: null,
-    };
+  }
+
+  toNodeVersion(): string {
+    return this.node_version;
   }
 }
 

src/services/common/base-indexer-engine-service.ts

@@ -1,6 +1,6 @@
 import { readFile } from 'fs/promises';
 import { join } from 'path';
-import { ApiDBVersion } from '../../dtos/indexer/ApiDbVersion.dto';
+import { ApiDBVersion, Version } from '../../dtos/indexer/ApiDbVersion.dto';
 import { ApiDBBlock } from '../../dtos/indexer/ApiDbBlock.dto';
 import { ApiDBState } from '../../dtos/indexer/ApiDbState.dto';
 import { ApiDBTransaction } from '../../dtos/indexer/ApiDbTransaction.dto';
@@ -17,7 +17,9 @@ export abstract class IIndexerEngineService {
   /**
    * Reads the version file from the file system.
    */
-  public static async readVersionFile(filePath: string): Promise<string> {
+  public static async readVersionFile(
+    filePath: string,
+  ): Promise<string | null> {
     return readFile(join(__dirname, filePath), 'utf-8')
       .then((data) => data)
       .catch((error) => {
@@ -28,6 +30,20 @@ export abstract class IIndexerEngineService {
       });
   }
 
+  public async getServiceVersion(): Promise<Version> {
+    const [gitTag, gitHash, buildDate] = await Promise.all([
+      IIndexerEngineService.readVersionFile('../../../PROJECT_VERSION'),
+      IIndexerEngineService.readVersionFile('../../../PROJECT_COMMIT_HASH'),
+      IIndexerEngineService.readVersionFile('../../../PROJECT_BUILD_DATE'),
+    ]);
+    const apiServerVersion: Version = {
+      gitTag: gitTag || 'local',
+      gitHash: gitHash || 'local',
+      buildDate: Number(buildDate) || Math.floor(Date.now() / 1000),
+    };
+    return apiServerVersion;
+  }
+
   /**
    * Gets the range of available confirmed blocks in the indexer database.
    * @returns

src/services/indexer-services/utxo-indexer.service.ts

@@ -123,27 +123,15 @@ abstract class UtxoExternalIndexerEngineService extends IIndexerEngineService {
       throw new Error('No versions state found in the indexer database');
     }
 
-    let versions = resVersion.toApiDBVersion();
+    const nodeVersion = resVersion.toNodeVersion()
+    const indexerVersion = resVersion.toIndexerVersion()
+    const apiServerVersion = await this.getServiceVersion();
 
-    const [gitTag, gitHash, buildDate] = await Promise.all([
-      UtxoExternalIndexerEngineService.readVersionFile(
-        '../../../PROJECT_VERSION',
-      ),
-      UtxoExternalIndexerEngineService.readVersionFile(
-        '../../../PROJECT_COMMIT_HASH',
-      ),
-      UtxoExternalIndexerEngineService.readVersionFile(
-        '../../../PROJECT_BUILD_DATE',
-      ),
-    ]);
-    const apiServerVersion: Version = {
-      gitTag: gitTag || 'local',
-      gitHash: gitHash || 'local',
-      buildDate: Number(buildDate) || Math.floor(Date.now() / 1000),
+    return {
+      nodeVersion,
+      indexer: indexerVersion,
+      apiServer: apiServerVersion,
     };
-    versions.apiServer = apiServerVersion;
-
-    return versions;
   }
 
   /**

src/services/indexer-services/xrp-indexer.service.ts

@@ -87,27 +87,15 @@ export class XrpExternalIndexerEngineService extends IIndexerEngineService {
       throw new Error('No versions state found in the indexer database');
     }
 
-    let versions = resVersion.toApiDBVersion();
-
-    const [gitTag, gitHash, buildDate] = await Promise.all([
-      XrpExternalIndexerEngineService.readVersionFile(
-        '../../../PROJECT_VERSION',
-      ),
-      XrpExternalIndexerEngineService.readVersionFile(
-        '../../../PROJECT_COMMIT_HASH',
-      ),
-      XrpExternalIndexerEngineService.readVersionFile(
-        '../../../PROJECT_BUILD_DATE',
-      ),
-    ]);
-    const apiServerVersion: Version = {
-      gitTag: gitTag || 'local',
-      gitHash: gitHash || 'local',
-      buildDate: Number(buildDate) || Math.floor(Date.now() / 1000),
+    const nodeVersion = resVersion.toNodeVersion()
+    const indexerVersion = resVersion.toIndexerVersion()
+    const apiServerVersion = await this.getServiceVersion();
+
+    return {
+      nodeVersion,
+      indexer: indexerVersion,
+      apiServer: apiServerVersion,
     };
-    versions.apiServer = apiServerVersion;
-
-    return versions;
   }
 
   public async confirmedBlockAt(