From fb87e7b3aea15e6587a22444814fa359db4405b0 Mon Sep 17 00:00:00 2001 From: Ismail Ali Date: Tue, 15 Apr 2025 08:35:44 +0200 Subject: [PATCH] refactor: API-Dateien konsequent auf *APIHandler.ts umbenannt und MockData-Handling optimiert MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Einheitliches Naming für API-Routen: *APIHandler.ts - Mock-Daten aus /apiMockData/SERVICE/ werden über API bereitgestellt - API-Endpoints sofort erkennbar und verständlich - Projektstruktur deutlich klarer und wartungsfreundlicher --- .../SERVICE/{System.js => SystemMockData.js} | 1 + .../{ae.js => analogeEingaengeMockData.js} | 2 +- .../{da.js => digitaleAusgaengeMockData.js} | 2 +- .../{de.js => digitaleEingaengeMockData.js} | 2 +- ...ueData.js => kabelueberwachungMockData.js} | 2 +- ...0Messages.js => last20MessagesMockData.js} | 2 +- .../SERVICE/{opcua.js => opcuaMockData.js} | 2 +- config/webVersion.ts | 2 +- pages/api/cpl/analogeEingaengeAPIHandler.ts | 26 +++++++++++++++++++ pages/api/cpl/digitalOutputs.ts | 19 -------------- ...kueData.ts => digitalOutputsAPIHandler.ts} | 4 +-- pages/api/cpl/digitaleEingaenge.ts | 21 --------------- pages/api/cpl/digitaleEingaengeAPIHandler.ts | 26 +++++++++++++++++++ pages/api/cpl/kabelueberwachungAPIHandler.ts | 24 +++++++++++++++++ ...essages.ts => last20MessagesAPIHandler.ts} | 4 +-- ...Settings.ts => opcuaSettingsAPIHandler.ts} | 4 +-- .../{slotData.ts => slotDataAPIHandler.ts} | 2 +- ...ettings.ts => systemSettingsAPIHandler.ts} | 4 +-- .../cpl/{tdmData.ts => tdmDataAPIHandler.ts} | 2 +- .../cpl/{tdrData.ts => tdrDataAPIHandler.ts} | 2 +- 20 files changed, 95 insertions(+), 58 deletions(-) rename apiMockData/SERVICE/{System.js => SystemMockData.js} (93%) rename apiMockData/SERVICE/{ae.js => analogeEingaengeMockData.js} (94%) rename apiMockData/SERVICE/{da.js => digitaleAusgaengeMockData.js} (65%) rename apiMockData/SERVICE/{de.js => digitaleEingaengeMockData.js} (98%) rename apiMockData/SERVICE/{kueData.js => kabelueberwachungMockData.js} (99%) rename apiMockData/SERVICE/{last20Messages.js => last20MessagesMockData.js} (97%) rename apiMockData/SERVICE/{opcua.js => opcuaMockData.js} (81%) create mode 100644 pages/api/cpl/analogeEingaengeAPIHandler.ts delete mode 100644 pages/api/cpl/digitalOutputs.ts rename pages/api/cpl/{kueData.ts => digitalOutputsAPIHandler.ts} (85%) delete mode 100644 pages/api/cpl/digitaleEingaenge.ts create mode 100644 pages/api/cpl/digitaleEingaengeAPIHandler.ts create mode 100644 pages/api/cpl/kabelueberwachungAPIHandler.ts rename pages/api/cpl/{last20Messages.ts => last20MessagesAPIHandler.ts} (87%) rename pages/api/cpl/{systemSettings.ts => opcuaSettingsAPIHandler.ts} (87%) rename pages/api/cpl/{slotData.ts => slotDataAPIHandler.ts} (97%) rename pages/api/cpl/{opcuaSettings.ts => systemSettingsAPIHandler.ts} (86%) rename pages/api/cpl/{tdmData.ts => tdmDataAPIHandler.ts} (94%) rename pages/api/cpl/{tdrData.ts => tdrDataAPIHandler.ts} (93%) diff --git a/apiMockData/SERVICE/System.js b/apiMockData/SERVICE/SystemMockData.js similarity index 93% rename from apiMockData/SERVICE/System.js rename to apiMockData/SERVICE/SystemMockData.js index a52f715..4572028 100644 --- a/apiMockData/SERVICE/System.js +++ b/apiMockData/SERVICE/SystemMockData.js @@ -1,3 +1,4 @@ +// /apiMockData/SERVICE/SystemMockData.js var win_appVersion = "0.02"; var win_deviceName = "CPLV4_Maschen"; var win_mac1 = "0 48 86 81 46 143"; diff --git a/apiMockData/SERVICE/ae.js b/apiMockData/SERVICE/analogeEingaengeMockData.js similarity index 94% rename from apiMockData/SERVICE/ae.js rename to apiMockData/SERVICE/analogeEingaengeMockData.js index 6a181ef..7216151 100644 --- a/apiMockData/SERVICE/ae.js +++ b/apiMockData/SERVICE/analogeEingaengeMockData.js @@ -1,4 +1,4 @@ -// public/CPLmockData/SERVICE/ae.js +// /apiMockData/SERVICE/analogeEingaengeMockData.js var win_analogeEingaenge1 = [1, 0, "Sensor2", 1, 1, 0, 1]; // Eingang 1 var win_analogeEingaenge2 = [2, 22.91, "Feuchtigkeit", 1, 1, 1, 0]; // Eingang 2 var win_analogeEingaenge3 = [3, 0, "Test", 1, 1, 0, 1]; // Eingang 3 diff --git a/apiMockData/SERVICE/da.js b/apiMockData/SERVICE/digitaleAusgaengeMockData.js similarity index 65% rename from apiMockData/SERVICE/da.js rename to apiMockData/SERVICE/digitaleAusgaengeMockData.js index 33075d3..e19d266 100644 --- a/apiMockData/SERVICE/da.js +++ b/apiMockData/SERVICE/digitaleAusgaengeMockData.js @@ -1,3 +1,3 @@ -// public/CPLmockData/SERVICE/da.js +// /apiMockData/SERVICE/digitaleAusgaengeMockData.js win_da_state = [1, 0, 1, 0]; win_da_bezeichnung = ["Ausgang1", "Ausgang2", "Ausgang3", "Ausgang4"]; diff --git a/apiMockData/SERVICE/de.js b/apiMockData/SERVICE/digitaleEingaengeMockData.js similarity index 98% rename from apiMockData/SERVICE/de.js rename to apiMockData/SERVICE/digitaleEingaengeMockData.js index d7ec58d..8fde6a7 100644 --- a/apiMockData/SERVICE/de.js +++ b/apiMockData/SERVICE/digitaleEingaengeMockData.js @@ -1,4 +1,4 @@ -// apiMockData/SERVICE/de.js +// apiMockData/SERVICE/digitaleEingaengeMockData.js // Zustand -> DESxx xx =Nr Eingang 1-32 80-83 = BGT 1 bis 4 var win_de_state = [ diff --git a/apiMockData/SERVICE/kueData.js b/apiMockData/SERVICE/kabelueberwachungMockData.js similarity index 99% rename from apiMockData/SERVICE/kueData.js rename to apiMockData/SERVICE/kabelueberwachungMockData.js index d0250f6..bc18770 100644 --- a/apiMockData/SERVICE/kueData.js +++ b/apiMockData/SERVICE/kabelueberwachungMockData.js @@ -1,4 +1,4 @@ -// /public/CPLmockData/SERVICE/kueData.js +// /apiMockData/SERVICE/kabelueberwachungMockData.js //Modul vorhanden 1 = vorhanden, 0 = nicht vorhanden var win_kueOnline = [ 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, diff --git a/apiMockData/SERVICE/last20Messages.js b/apiMockData/SERVICE/last20MessagesMockData.js similarity index 97% rename from apiMockData/SERVICE/last20Messages.js rename to apiMockData/SERVICE/last20MessagesMockData.js index 76f8c41..4e68d61 100644 --- a/apiMockData/SERVICE/last20Messages.js +++ b/apiMockData/SERVICE/last20MessagesMockData.js @@ -1,4 +1,4 @@ -// /apiMockData/SERVICE/last20Messages.js +// /apiMockData/SERVICE/last20MessagesMockData.js var win_last20Messages = ` 16750035012024-10-23 15:08:58:000Modul 26 Isofehler kommend1 16749032012024-10-23 15:07:24:000Modul 23 Isofehler gehend0 diff --git a/apiMockData/SERVICE/opcua.js b/apiMockData/SERVICE/opcuaMockData.js similarity index 81% rename from apiMockData/SERVICE/opcua.js rename to apiMockData/SERVICE/opcuaMockData.js index 0743d60..601b9ca 100644 --- a/apiMockData/SERVICE/opcua.js +++ b/apiMockData/SERVICE/opcuaMockData.js @@ -1,4 +1,4 @@ -// public/CPL/SERVICE/opcua.js +// /apiMockData/SERVICE/opcuaMockData.js //-------OPCUA Information Lesen---------------- var win_opcUaZustand = "1"; var win_opcUaActiveClientCount = "0"; diff --git a/config/webVersion.ts b/config/webVersion.ts index 42341e4..cdf4d12 100644 --- a/config/webVersion.ts +++ b/config/webVersion.ts @@ -6,5 +6,5 @@ 2: Patch oder Hotfix (Bugfixes oder kleine Änderungen). */ -const webVersion = "1.6.221"; +const webVersion = "1.6.222"; export default webVersion; diff --git a/pages/api/cpl/analogeEingaengeAPIHandler.ts b/pages/api/cpl/analogeEingaengeAPIHandler.ts new file mode 100644 index 0000000..517c143 --- /dev/null +++ b/pages/api/cpl/analogeEingaengeAPIHandler.ts @@ -0,0 +1,26 @@ +// /pages/api/cpl/analogeEingaengeAPIHandler.ts + +import { NextApiRequest, NextApiResponse } from "next"; +import path from "path"; +import fs from "fs/promises"; + +export default async function handler( + req: NextApiRequest, + res: NextApiResponse +) { + const filePath = path.join( + process.cwd(), + "apiMockData", + "SERVICE", + "analogeEingaengeMockData.js" + ); + + try { + const data = await fs.readFile(filePath, "utf-8"); + + res.setHeader("Content-Type", "text/javascript"); + res.status(200).send(data); + } catch (error) { + res.status(404).json({ error: "File not found" }); + } +} diff --git a/pages/api/cpl/digitalOutputs.ts b/pages/api/cpl/digitalOutputs.ts deleted file mode 100644 index d636163..0000000 --- a/pages/api/cpl/digitalOutputs.ts +++ /dev/null @@ -1,19 +0,0 @@ -// /pages/api/cpl/digitalOutputs.ts - -import { NextApiRequest, NextApiResponse } from "next"; -import path from "path"; -import fs from "fs/promises"; - -export default async function handler( - req: NextApiRequest, - res: NextApiResponse -) { - const filePath = path.join(process.cwd(), "apiMockData", "SERVICE", "da.js"); - - try { - const data = await fs.readFile(filePath, "utf-8"); - res.status(200).send(data); - } catch (error) { - res.status(404).json({ error: "File not found" }); - } -} diff --git a/pages/api/cpl/kueData.ts b/pages/api/cpl/digitalOutputsAPIHandler.ts similarity index 85% rename from pages/api/cpl/kueData.ts rename to pages/api/cpl/digitalOutputsAPIHandler.ts index 2890b0b..adcf092 100644 --- a/pages/api/cpl/kueData.ts +++ b/pages/api/cpl/digitalOutputsAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/kueData.ts +// /pages/api/cpl/digitalOutputsAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; @@ -12,7 +12,7 @@ export default async function handler( process.cwd(), "apiMockData", "SERVICE", - "kueData.js" + "digitaleAusgaengeMockData.js" ); try { diff --git a/pages/api/cpl/digitaleEingaenge.ts b/pages/api/cpl/digitaleEingaenge.ts deleted file mode 100644 index 548e021..0000000 --- a/pages/api/cpl/digitaleEingaenge.ts +++ /dev/null @@ -1,21 +0,0 @@ -// /pages/api/cpl/digitaleEingaenge.ts - -import { NextApiRequest, NextApiResponse } from "next"; -import path from "path"; -import fs from "fs/promises"; - -export default async function handler( - req: NextApiRequest, - res: NextApiResponse -) { - const filePath = path.join(process.cwd(), "apiMockData", "SERVICE", "de.js"); - - try { - const data = await fs.readFile(filePath, "utf-8"); - - res.setHeader("Content-Type", "text/javascript"); // wichtig! - res.status(200).send(data); - } catch (error) { - res.status(404).json({ error: "File not found" }); - } -} diff --git a/pages/api/cpl/digitaleEingaengeAPIHandler.ts b/pages/api/cpl/digitaleEingaengeAPIHandler.ts new file mode 100644 index 0000000..9a517af --- /dev/null +++ b/pages/api/cpl/digitaleEingaengeAPIHandler.ts @@ -0,0 +1,26 @@ +// /pages/api/cpl/digitaleEingaengeAPIHandler.ts + +import { NextApiRequest, NextApiResponse } from "next"; +import path from "path"; +import fs from "fs/promises"; + +export default async function handler( + req: NextApiRequest, + res: NextApiResponse +) { + const filePath = path.join( + process.cwd(), + "apiMockData", + "SERVICE", + "digitaleEingaengeMockData.js" + ); + + try { + const data = await fs.readFile(filePath, "utf-8"); + + res.setHeader("Content-Type", "text/javascript"); // wichtig! + res.status(200).send(data); + } catch (error) { + res.status(404).json({ error: "File not found" }); + } +} diff --git a/pages/api/cpl/kabelueberwachungAPIHandler.ts b/pages/api/cpl/kabelueberwachungAPIHandler.ts new file mode 100644 index 0000000..ed617aa --- /dev/null +++ b/pages/api/cpl/kabelueberwachungAPIHandler.ts @@ -0,0 +1,24 @@ +// /pages/api/cpl/kabelueberwachungAPIHandler.ts + +import { NextApiRequest, NextApiResponse } from "next"; +import path from "path"; +import fs from "fs/promises"; + +export default async function handler( + req: NextApiRequest, + res: NextApiResponse +) { + const filePath = path.join( + process.cwd(), + "apiMockData", + "SERVICE", + "kabelueberwachungMockData.js" + ); + + try { + const data = await fs.readFile(filePath, "utf-8"); + res.status(200).send(data); + } catch (error) { + res.status(404).json({ error: "File not found" }); + } +} diff --git a/pages/api/cpl/last20Messages.ts b/pages/api/cpl/last20MessagesAPIHandler.ts similarity index 87% rename from pages/api/cpl/last20Messages.ts rename to pages/api/cpl/last20MessagesAPIHandler.ts index 229fec4..4c96337 100644 --- a/pages/api/cpl/last20Messages.ts +++ b/pages/api/cpl/last20MessagesAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/last20Messages.ts +// /pages/api/cpl/last20MessagesAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; import fs from "fs/promises"; @@ -11,7 +11,7 @@ export default async function handler( process.cwd(), "apiMockData", "SERVICE", - "last20Messages.js" + "last20MessagesMockData.js" ); try { diff --git a/pages/api/cpl/systemSettings.ts b/pages/api/cpl/opcuaSettingsAPIHandler.ts similarity index 87% rename from pages/api/cpl/systemSettings.ts rename to pages/api/cpl/opcuaSettingsAPIHandler.ts index 3efce19..3a345c5 100644 --- a/pages/api/cpl/systemSettings.ts +++ b/pages/api/cpl/opcuaSettingsAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/systemSettings.ts +// /pages/api/cpl/opcuaSettingsAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; @@ -12,7 +12,7 @@ export default async function handler( process.cwd(), "apiMockData", "SERVICE", - "system.js" + "opcuaMockData.js" ); try { diff --git a/pages/api/cpl/slotData.ts b/pages/api/cpl/slotDataAPIHandler.ts similarity index 97% rename from pages/api/cpl/slotData.ts rename to pages/api/cpl/slotDataAPIHandler.ts index 28ff199..9e4cf1c 100644 --- a/pages/api/cpl/slotData.ts +++ b/pages/api/cpl/slotDataAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/slotData.ts +// /pages/api/cpl/slotDataAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; import fs from "fs/promises"; diff --git a/pages/api/cpl/opcuaSettings.ts b/pages/api/cpl/systemSettingsAPIHandler.ts similarity index 86% rename from pages/api/cpl/opcuaSettings.ts rename to pages/api/cpl/systemSettingsAPIHandler.ts index 3810a55..94281c4 100644 --- a/pages/api/cpl/opcuaSettings.ts +++ b/pages/api/cpl/systemSettingsAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/opcuaSettings.ts +// /pages/api/cpl/systemSettingsAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; @@ -12,7 +12,7 @@ export default async function handler( process.cwd(), "apiMockData", "SERVICE", - "opcua.js" + "systemMockData.js" ); try { diff --git a/pages/api/cpl/tdmData.ts b/pages/api/cpl/tdmDataAPIHandler.ts similarity index 94% rename from pages/api/cpl/tdmData.ts rename to pages/api/cpl/tdmDataAPIHandler.ts index 0da1536..295256a 100644 --- a/pages/api/cpl/tdmData.ts +++ b/pages/api/cpl/tdmDataAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/tdmData.ts +// /pages/api/cpl/tdmDataAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path"; diff --git a/pages/api/cpl/tdrData.ts b/pages/api/cpl/tdrDataAPIHandler.ts similarity index 93% rename from pages/api/cpl/tdrData.ts rename to pages/api/cpl/tdrDataAPIHandler.ts index 5fa8cc9..84e7ce9 100644 --- a/pages/api/cpl/tdrData.ts +++ b/pages/api/cpl/tdrDataAPIHandler.ts @@ -1,4 +1,4 @@ -// /pages/api/cpl/tdrData.ts +// /pages/api/cpl/tdrDataAPIHandler.ts import { NextApiRequest, NextApiResponse } from "next"; import path from "path";