refactor: move charging station helper to its right place

Signed-off-by: Jérôme Benoit <jerome.benoit@sap.com>

diff --git a/src/charging-station/Bootstrap.ts b/src/charging-station/Bootstrap.ts
index bd7fda2da58b59f5dad6973a5e2240437d54a7c8..0c1eeeecb0386a009fba09797b02db651b15ea6e 100644 (file)
--- a/src/charging-station/Bootstrap.ts
+++ b/src/charging-station/Bootstrap.ts
@@ -10,7 +10,7 @@ import type { Worker } from 'worker_threads'
 import chalk from 'chalk'
 import { type MessageHandler, availableParallelism } from 'poolifier'
 
-import { waitChargingStationEvents } from './Helpers.js'
+import { buildTemplateName, waitChargingStationEvents } from './Helpers.js'
 import type { AbstractUIServer } from './ui-server/AbstractUIServer.js'
 import { UIServerFactory } from './ui-server/UIServerFactory.js'
 import { version } from '../../package.json'
@@ -36,7 +36,6 @@ import {
 import {
   Configuration,
   Constants,
-  buildTemplateName,
   buildTemplateStatisticsPayload,
   formatDurationMilliSeconds,
   generateUUID,

diff --git a/src/charging-station/ChargingStation.ts b/src/charging-station/ChargingStation.ts
index f79a59cea3943c2c9a79ca7c6cde8b37582b3d85..5a724e53672d93ee2ea90355184cd3001d48e918 100644 (file)
--- a/src/charging-station/ChargingStation.ts
+++ b/src/charging-station/ChargingStation.ts
@@ -21,6 +21,7 @@ import {
 } from './ConfigurationKeyUtils.js'
 import {
   buildConnectorsMap,
+  buildTemplateName,
   checkChargingStation,
   checkConfiguration,
   checkConnectorsConfiguration,
@@ -131,7 +132,6 @@ import {
   buildEvsesStatus,
   buildStartedMessage,
   buildStoppedMessage,
-  buildTemplateName,
   buildUpdatedMessage,
   clone,
   convertToBoolean,

diff --git a/src/charging-station/Helpers.ts b/src/charging-station/Helpers.ts
index 22ed5041e0515cc6b0769b3acb85df2d54525287..9c790268b70100f2b749cf3b04d4d4372f429906 100644 (file)
--- a/src/charging-station/Helpers.ts
+++ b/src/charging-station/Helpers.ts
@@ -1,6 +1,6 @@
 import { createHash, randomBytes } from 'node:crypto'
 import type { EventEmitter } from 'node:events'
-import { basename, dirname, join } from 'node:path'
+import { basename, dirname, isAbsolute, join, parse, relative, resolve } from 'node:path'
 import { env } from 'node:process'
 import { fileURLToPath } from 'node:url'
 
@@ -73,6 +73,17 @@ import {
 
 const moduleName = 'Helpers'
 
+export const buildTemplateName = (templateFile: string): string => {
+  if (isAbsolute(templateFile)) {
+    templateFile = relative(
+      resolve(join(dirname(fileURLToPath(import.meta.url)), 'assets', 'station-templates')),
+      templateFile
+    )
+  }
+  const templateFileParsedPath = parse(templateFile)
+  return join(templateFileParsedPath.dir, templateFileParsedPath.name)
+}
+
 export const getChargingStationId = (
   index: number,
   stationTemplate: ChargingStationTemplate | undefined

diff --git a/src/utils/Utils.ts b/src/utils/Utils.ts
index c39c95e67a35503c2e237efe2eca78ae8e287e3f..abfac5e4873c98af8a4afa225ed1568fa4c9cec8 100644 (file)
--- a/src/utils/Utils.ts
+++ b/src/utils/Utils.ts
@@ -1,7 +1,5 @@
 import { getRandomValues, randomBytes, randomInt, randomUUID } from 'node:crypto'
-import { dirname, isAbsolute, join, parse, relative, resolve } from 'node:path'
 import { env, nextTick } from 'node:process'
-import { fileURLToPath } from 'node:url'
 
 import {
   formatDuration,
@@ -209,17 +207,6 @@ export const getRandomFloatFluctuatedRounded = (
   )
 }
 
-export const buildTemplateName = (templateFile: string): string => {
-  if (isAbsolute(templateFile)) {
-    templateFile = relative(
-      resolve(join(dirname(fileURLToPath(import.meta.url)), 'assets', 'station-templates')),
-      templateFile
-    )
-  }
-  const templateFileParsedPath = parse(templateFile)
-  return join(templateFileParsedPath.dir, templateFileParsedPath.name)
-}
-
 export const extractTimeSeriesValues = (timeSeries: TimestampedData[]): number[] => {
   return timeSeries.map(timeSeriesItem => timeSeriesItem.value)
 }

diff --git a/src/utils/index.ts b/src/utils/index.ts
index fdcb6fa28545a84c272123ca31fe4ac05e592008..1bc4fe7e0d64d5b4a161b476194d56d863eaa3b6 100644 (file)
--- a/src/utils/index.ts
+++ b/src/utils/index.ts
@@ -29,7 +29,6 @@ export {
 } from './MessageChannelUtils.js'
 export {
   JSONStringifyWithMapSupport,
-  buildTemplateName,
   clone,
   convertToBoolean,
   convertToDate,