From a624a8d8b5905d0167f662a5bcf4e6ba80a300a6 Mon Sep 17 00:00:00 2001
From: Ali BARIN <ali.barin53@gmail.com>
Date: Thu, 4 Aug 2022 21:18:18 +0200
Subject: [PATCH] refactor: add version in app config

---
 packages/backend/src/config/app.ts                  | 2 ++
 packages/backend/src/graphql/queries/healthcheck.ts | 4 +++-
 packages/backend/src/helpers/telemetry/index.ts     | 2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/packages/backend/src/config/app.ts b/packages/backend/src/config/app.ts
index d1e7b61a..badd3ad3 100644
--- a/packages/backend/src/config/app.ts
+++ b/packages/backend/src/config/app.ts
@@ -13,6 +13,7 @@ type AppConfig = {
   postgresHost: string;
   postgresUsername: string;
   postgresPassword?: string;
+  version: string;
   postgresEnableSsl: boolean;
   baseUrl: string;
   encryptionKey: string;
@@ -44,6 +45,7 @@ const appConfig: AppConfig = {
   port,
   appEnv: appEnv,
   isDev: appEnv === 'development',
+  version: process.env.npm_package_version,
   postgresDatabase: process.env.POSTGRES_DATABASE || 'automatisch_development',
   postgresPort: parseInt(process.env.POSTGRES_PORT || '5432'),
   postgresHost: process.env.POSTGRES_HOST || 'localhost',
diff --git a/packages/backend/src/graphql/queries/healthcheck.ts b/packages/backend/src/graphql/queries/healthcheck.ts
index 5606fd79..57184eba 100644
--- a/packages/backend/src/graphql/queries/healthcheck.ts
+++ b/packages/backend/src/graphql/queries/healthcheck.ts
@@ -1,6 +1,8 @@
+import appConfig from '../../config/app';
+
 const healthcheck = () => {
   return {
-    version: process.env.npm_package_version,
+    version: appConfig.version,
   }
 };
 
diff --git a/packages/backend/src/helpers/telemetry/index.ts b/packages/backend/src/helpers/telemetry/index.ts
index ccb2125e..c5173786 100644
--- a/packages/backend/src/helpers/telemetry/index.ts
+++ b/packages/backend/src/helpers/telemetry/index.ts
@@ -125,7 +125,7 @@ class Telemetry {
 
   diagnosticInfo() {
     this.track('diagnosticInfo', {
-      automatischVersion: process.env.npm_package_version,
+      automatischVersion: appConfig.version,
       serveWebAppSeparately: appConfig.serveWebAppSeparately,
       operatingSystem: {
         type: os.type(),