refactor: Move API-Endpoint-Functions to /api/talas_v5_DB/ folder for better organization

2024-06-14 14:06:32 +02:00
parent c8ac4ebdb7
commit d220d0baae
18 changed files with 117 additions and 96 deletions
--- a/components/MapComponent
+++ b/components/MapComponent
@@ -128,7 +128,9 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  };

  const fetchPoiData = async (idPoi) => {
-    const response = await fetch(`/api/getPoiById?idPoi=${idPoi}`);
+    const response = await fetch(
+      `/api/talas_v5_DB/pois/getPoiById?idPoi=${idPoi}`
+    );
    if (!response.ok) {
      console.error("Fehler beim Abrufen der POI-Daten");
      return;
@@ -227,7 +229,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  };
  // Funktion zum Aktualisieren der Position in der Datenbank
  const updateLocationInDatabase = async (id, newLatitude, newLongitude) => {
-    const response = await fetch("/api/updateLocation", {
+    const response = await fetch("/api/talas_v5_DB/pois/updateLocation", {
      method: "POST",
      headers: { "Content-Type": "application/json" },
      body: JSON.stringify({
@@ -1044,7 +1046,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  useEffect(() => {
    const fetchPoiTypData = async () => {
      try {
-        const response = await fetch("/api/readPoiTyp");
+        const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp");
        const data = await response.json();
        setPoiTypData(data); // Daten im Recoil State speichern
      } catch (error) {
@@ -1069,7 +1071,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  useEffect(() => {
    const fetchPoiTypData = async () => {
      try {
-        const response = await fetch("/api/readPoiTyp");
+        const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp");
        const data = await response.json();
        const map = new Map();
        data.forEach((item) => map.set(item.idPoiTyp, item.name));
@@ -1135,7 +1137,9 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {

  const fetchDeviceNameById = async (idLD) => {
    try {
-      const response = await fetch(`/api/locationDeviceNameById?idLD=${idLD}`);
+      const response = await fetch(
+        `/api/talas_v5_DB/locationDevice/locationDeviceNameById?idLD=${idLD}`
+      );
      const data = await response.json();
      if (response.ok) {
        return data.name;
@@ -1197,7 +1201,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {

  useEffect(() => {
    const fetchPoiData = async () => {
-      const response = await fetch("/api/poi-icons");
+      const response = await fetch("/api/talas_v5_DB/pois/poi-icons");
      const data = await response.json();
      setPoiData(data);
      //console.log("poiData icons:", data);
--- a/components/MapComponent.js
+++ b/components/MapComponent.js
@@ -128,7 +128,9 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  };

  const fetchPoiData = async (idPoi) => {
-    const response = await fetch(`/api/getPoiById?idPoi=${idPoi}`);
+    const response = await fetch(
+      `/api/talas_v5_DB/pois/getPoiById?idPoi=${idPoi}`
+    );
    if (!response.ok) {
      console.error("Fehler beim Abrufen der POI-Daten");
      return;
@@ -227,7 +229,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  };
  // Funktion zum Aktualisieren der Position in der Datenbank
  const updateLocationInDatabase = async (id, newLatitude, newLongitude) => {
-    const response = await fetch("/api/updateLocation", {
+    const response = await fetch("/api/talas_v5_DB/pois/updateLocation", {
      method: "POST",
      headers: { "Content-Type": "application/json" },
      body: JSON.stringify({
@@ -1044,7 +1046,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  useEffect(() => {
    const fetchPoiTypData = async () => {
      try {
-        const response = await fetch("/api/readPoiTyp");
+        const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp");
        const data = await response.json();
        setPoiTypData(data); // Daten im Recoil State speichern
      } catch (error) {
@@ -1069,7 +1071,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {
  useEffect(() => {
    const fetchPoiTypData = async () => {
      try {
-        const response = await fetch("/api/readPoiTyp");
+        const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp");
        const data = await response.json();
        const map = new Map();
        data.forEach((item) => map.set(item.idPoiTyp, item.name));
@@ -1135,7 +1137,9 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {

  const fetchDeviceNameById = async (idLD) => {
    try {
-      const response = await fetch(`/api/locationDeviceNameById?idLD=${idLD}`);
+      const response = await fetch(
+        `/api/talas_v5_DB/locationDevice/locationDeviceNameById?idLD=${idLD}`
+      );
      const data = await response.json();
      if (response.ok) {
        return data.name;
@@ -1197,7 +1201,7 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => {

  useEffect(() => {
    const fetchPoiData = async () => {
-      const response = await fetch("/api/poi-icons");
+      const response = await fetch("/api/talas_v5_DB/pois/poi-icons");
      const data = await response.json();
      setPoiData(data);
      //console.log("poiData icons:", data);
--- a/components/PoiUpdateModal.js
+++ b/components/PoiUpdateModal.js
@@ -3,11 +3,9 @@
 import React, { useState, useEffect } from "react";
 import { useRecoilValue } from "recoil";
 import { selectedPoiState } from "../store/atoms/poiState";
-import { currentPoiState } from '../store/atoms/currentPoiState';
-
+import { currentPoiState } from "../store/atoms/currentPoiState";

 const PoiUpdateModal = ({ onClose, poiData }) => {
-
  const currentPoi = useRecoilValue(currentPoiState);
  const selectedPoi = useRecoilValue(selectedPoiState);
  const [poiId, setPoiId] = useState(poiData ? poiData.idPoi : "");
@@ -19,8 +17,6 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
  const [idLD, setIdLD] = useState(poiData ? poiData.idLD : "");
  const [idLocationDevice, setIdLocationDevice] = useState("");

-  
-
  const [description, setDescription] = useState(
    poiData ? poiData.description : ""
  );
@@ -44,7 +40,7 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
    }
  }, [poiData]);

-/*   const fetchDeviceNameById = async (idLD) => {
+  /*   const fetchDeviceNameById = async (idLD) => {
    try {
      const response = await fetch(`/api/getDeviceNameById?idLD=${idLD}`);
      const data = await response.json();
@@ -54,9 +50,9 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
    }
  }; */

-/*     const fetchDeviceNameById = async (idLD) => {
+  /*     const fetchDeviceNameById = async (idLD) => {
    try {
-      const response = await fetch(`/api/locationDeviceNameById?idLD=${idLD}`);
+      const response = await fetch(`/api/talas_v5_DB/locationDevice/locationDeviceNameById?idLD=${idLD}`);
      const data = await response.json();
      setDeviceName(data.deviceName);
    } catch (error) {
@@ -70,7 +66,7 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
      if (poiData && poiData.idLD) {
        try {
          const response = await fetch(
-            `/api/getDeviceIdById?idLD=${poiData.idLD}`
+            `/api/talas_v5_DB/locationDevice/getDeviceIdById?idLD=${poiData.idLD}`
          );
          const data = await response.json();
          if (data) setDeviceName(data.name);
@@ -87,9 +83,12 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
  const handleDeletePoi = async () => {
    if (confirm("Sind Sie sicher, dass Sie diesen POI löschen möchten?")) {
      try {
-        const response = await fetch(`/api/deletePoi?id=${poiId}`, {
+        const response = await fetch(
+          `/api/talas_v5_DB/pois/deletePoi?id=${poiId}`,
+          {
            method: "DELETE",
-        });
+          }
+        );
        if (response.ok) {
          alert("POI wurde erfolgreich gelöscht.");
          onClose(); // Close the modal
@@ -109,11 +108,11 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
  useEffect(() => {
    const fetchPoiTypData = async () => {
      try {
-        const response = await fetch("/api/readPoiTyp");
+        const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp");
        const data = await response.json();
        setPoiTypData(data);
        if (selectedPoi && data) {
-          const matchingType = data.find(pt => pt.name === selectedPoi.typ);
+          const matchingType = data.find((pt) => pt.name === selectedPoi.typ);
          if (matchingType) {
            setPoiTypeId(matchingType.idPoiTyp);
          }
@@ -151,43 +150,44 @@ const PoiUpdateModal = ({ onClose, poiData }) => {
    };
    fetchData();
  }, []);
-//--------------------------------------------------------------------------------------------
-// Fetch device name basierend auf der Geräte-ID
+  //--------------------------------------------------------------------------------------------
+  // Fetch device name basierend auf der Geräte-ID

-useEffect(() => {
+  useEffect(() => {
    console.log("currentPoi von PoiUpdateModal.js : ", currentPoi.idLD);
-  fetch('/api/locationDevices')
-    .then(response => response.json())
-    .then(data => {
+    fetch("/api/talas_v5_DB/locationDevice/locationDevices")
+      .then((response) => response.json())
+      .then((data) => {
        setLocationDeviceData(data);
        console.log("Standort- und Gerätedaten 3:", data);
        console.log("Standort- und Gerätedaten 3 poiData:", poiData);
        // Findet das Gerät, das der aktuellen IDLD entspricht
-      const currentDevice = data.find(device => device.idLD === currentPoi.idLD);
+        const currentDevice = data.find(
+          (device) => device.idLD === currentPoi.idLD
+        );
        if (currentDevice) {
          setDeviceName(currentDevice.name);
        }
      })
-    .catch(error => {
-      console.error('Fehler beim Abrufen der Gerätedaten:', error);
+      .catch((error) => {
+        console.error("Fehler beim Abrufen der Gerätedaten:", error);
        setLocationDeviceData([]);
      });
-}, [poiData?.idLD,currentPoi]);
+  }, [poiData?.idLD, currentPoi]);

-
-//--------------------------------------------------------------------------------------------
+  //--------------------------------------------------------------------------------------------
  // Angenommen, deviceName enthält die Geräte-ID
  //const idLD = deviceName; // Stellen Sie sicher, dass dies eine ID ist und kein Name

  const handleSubmit = async (event) => {
    event.preventDefault();
    const idLDResponse = await fetch(
-      `/api/getDeviceId?deviceName=${encodeURIComponent(deviceName)}`
+      `/api/talas_v5_DB/locationDevice/getDeviceId?deviceName=${encodeURIComponent(deviceName)}`
    );
    const idLDData = await idLDResponse.json();
    const idLD = idLDData.idLD;
    try {
-      const response = await fetch("/api/updatePoi", {
+      const response = await fetch("/api/talas_v5_DB/pois/updatePoi", {
        method: "POST",
        headers: {
          "Content-Type": "application/json",
@@ -220,9 +220,15 @@ useEffect(() => {
  //ausgewählte poi Informationen in Console anzeigen
  console.log("Selected POI:", selectedPoi);
  console.log("Selected POI Gerät id in poiUpdateModal.js:", selectedPoi.id);
-  console.log("Selected POI Typ name in poiUpdateModal.js:", selectedPoi.typ);//als Typ in dropdown menu
-  console.log("Selected POI Beschreibung in poiUpdateModal.js:", selectedPoi.description);
-  console.log("Selected POI Gerät deviceId in poiUpdateModal.js:", selectedPoi.deviceId);
+  console.log("Selected POI Typ name in poiUpdateModal.js:", selectedPoi.typ); //als Typ in dropdown menu
+  console.log(
+    "Selected POI Beschreibung in poiUpdateModal.js:",
+    selectedPoi.description
+  );
+  console.log(
+    "Selected POI Gerät deviceId in poiUpdateModal.js:",
+    selectedPoi.deviceId
+  );

  return (
    <form onSubmit={handleSubmit} className="m-0 p-2 w-full">
@@ -252,12 +258,16 @@ useEffect(() => {
          onChange={(e) => setDeviceName(e.target.value)}
          className="block p-2 w-full border-2 border-gray-200 rounded-md text-sm"
        >
-          {locationDeviceData.map((device, index) => (
+          {locationDeviceData.map(
+            (device, index) => (
              console.log("device.id und name:", device),
+              (
                <option key={index} value={device.id}>
                  {device.name}
                </option>
-          ))}
+              )
+            )
+          )}
        </select>
      </div>

--- a/components/PoiUtils.js
+++ b/components/PoiUtils.js
@@ -37,7 +37,7 @@ export const updateLocationInDatabase = async (
  newLatitude,
  newLongitude
 ) => {
-  const response = await fetch("/api/updateLocation", {
+  const response = await fetch("/api/talas_v5_DB/pois/updateLocation", {
    method: "POST",
    headers: { "Content-Type": "application/json" },
    body: JSON.stringify({
--- a/components/ShowAddStationPopup.js
+++ b/components/ShowAddStationPopup.js
@@ -5,7 +5,6 @@ import { useRecoilValue, useRecoilState, useSetRecoilState } from "recoil";
 import { readPoiMarkersStore } from "../store/selectors/readPoiMarkersStore";
 import { poiReadFromDbTriggerAtom } from "../store/atoms/poiReadFromDbTriggerAtom";

-
 const ShowAddStationPopup = ({ onClose, map, latlng }) => {
  const [poiTypData, setpoiTypData] = useState(); // Recoil State verwenden
  const [name, setName] = useState("");
@@ -21,7 +20,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => {
  useEffect(() => {
    const fetchpoiTypData = async () => {
      try {
-        const response = await fetch("/api/readPoiTyp");
+        const response = await fetch("/api/talas_v5_DB/poiTyp/readPoiTyp");
        const data = await response.json();
        setpoiTypData(data);
        if (data && data.length > 0) {
@@ -96,7 +95,7 @@ const ShowAddStationPopup = ({ onClose, map, latlng }) => {
        .idLD,
    };

-    const response = await fetch("/api/addLocation", {
+    const response = await fetch("/api/talas_v5_DB/pois/addLocation", {
      method: "POST",
      headers: { "Content-Type": "application/json" },
      body: JSON.stringify(formData),
--- a/pages/api/talas_v5_DB/gisLines/readGisLines.js
+++ b/pages/api/talas_v5_DB/gisLines/readGisLines.js
@@ -1,4 +1,5 @@
-import mysql from 'mysql';
+// /pages/api/talas_v5_DB/gisLines/readGisLines.js
+import mysql from "mysql";

 const dbConfig = {
  host: process.env.DB_HOST,
@@ -11,26 +12,28 @@ const dbConfig = {
 const connection = mysql.createConnection(dbConfig);
 connection.connect((err) => {
  if (err) {
-    console.error('Fehler beim Verbinden:', err.stack);
+    console.error("Fehler beim Verbinden:", err.stack);
    return;
  }
-  console.log('Database connected successfully.');
+  console.log("Database connected successfully.");
 });

 export default function handler(req, res) {
-  if (req.method !== 'GET') {
-    return res.status(405).json({ error: 'Nur GET Methode erlaubt' });
+  if (req.method !== "GET") {
+    return res.status(405).json({ error: "Nur GET Methode erlaubt" });
  }
-  const query = 'SELECT * FROM talas_v5.gis_lines;';
+  const query = "SELECT * FROM talas_v5.gis_lines;";
  connection.query(query, (error, results) => {
    if (error) {
-      console.error('Fehler beim Abrufen der gis_lines:', error);
-      return res.status(500).json({ error: 'Fehler beim Abrufen der gis_lines' });
+      console.error("Fehler beim Abrufen der gis_lines:", error);
+      return res
+        .status(500)
+        .json({ error: "Fehler beim Abrufen der gis_lines" });
    }
    if (results.length > 0) {
      res.json(results);
    } else {
-      res.status(404).json({ error: 'Gerät nicht gefunden' });
+      res.status(404).json({ error: "Gerät nicht gefunden" });
    }
  });
 }
--- a/pages/api/talas_v5_DB/locationDevice/getDeviceId.js
+++ b/pages/api/talas_v5_DB/locationDevice/getDeviceId.js
@@ -1,4 +1,4 @@
-// API in /api/getDeviceId.js
+// API in /api/talas_v5_DB/locationDevice/getDeviceId.js
 import mysql from "mysql";

 const dbConfig = {
--- a/pages/api/talas_v5_DB/locationDevice/locationDeviceNameById.js
+++ b/pages/api/talas_v5_DB/locationDevice/locationDeviceNameById.js
@@ -1,7 +1,6 @@
-// API in /api/locationDeviceNameById.js
+// API in /api/talas_v5_DB/locationDevice/locationDeviceNameById.js
 import mysql from "mysql";

-
 const dbConfig = {
  host: process.env.DB_HOST,
  user: process.env.DB_USER,
@@ -28,7 +27,9 @@ export default function handler(req, res) {
  connection.query(query, [idLD], (error, results) => {
    if (error) {
      console.error("Fehler beim Abrufen des Gerätenamens:", error);
-      return res.status(500).json({ error: "Fehler beim Abrufen des Gerätenamens" });
+      return res
+        .status(500)
+        .json({ error: "Fehler beim Abrufen des Gerätenamens" });
    }
    if (results.length > 0) {
      res.json({ name: results[0].name });
--- a/pages/api/talas_v5_DB/locationDevice/locationDevices.js
+++ b/pages/api/talas_v5_DB/locationDevice/locationDevices.js
@@ -1,5 +1,5 @@
-// API in /api/locationDevices.js
-import mysql from 'mysql';
+// API in /api/talas_v5_DB/locationDevice/locationDevices.js
+import mysql from "mysql";

 const dbConfig = {
  host: process.env.DB_HOST,
@@ -26,7 +26,9 @@ export default function handler(req, res) {
  connection.query(query, (error, results) => {
    if (error) {
      console.error("Fehler beim Abrufen der Geräteinformationen:", error);
-      return res.status(500).json({ error: "Fehler beim Abrufen der Geräteinformationen" });
+      return res
+        .status(500)
+        .json({ error: "Fehler beim Abrufen der Geräteinformationen" });
    }
    res.json(results);
  });
--- a/pages/api/talas_v5_DB/poiTyp/readPoiTyp.js
+++ b/pages/api/talas_v5_DB/poiTyp/readPoiTyp.js
@@ -1,4 +1,4 @@
-// pages/api/readPoiTyp.js
+// pages/api/talas_v5_DB/poiTyp/readPoiTyp.js
 import mysql from "mysql";

 const pool = mysql.createPool({
--- a/pages/api/talas_v5_DB/pois/addLocation.js
+++ b/pages/api/talas_v5_DB/pois/addLocation.js
@@ -1,4 +1,4 @@
-// pages/api/addLocation.js
+// pages/api/talas_v5_DB/pois/addLocation.js
 import mysql from "mysql";

 const dbConfig = {
@@ -26,9 +26,7 @@ export default function handler(req, res) {
        console.error("Fehler beim Einfügen des Standorts:", error);
        return res.status(500).json({ error: "Ein Fehler ist aufgetreten" });
      }
-      res
-        .status(200)
-        .json({
+      res.status(200).json({
        id: results.insertId,
        message: "Standort erfolgreich hinzugefügt",
      });
--- a/pages/api/talas_v5_DB/pois/deletePoi.js
+++ b/pages/api/talas_v5_DB/pois/deletePoi.js
@@ -1,4 +1,4 @@
-// pages/api/deletePoi.js
+// pages/api/talas_v5_DB/pois/deletePoi.js
 import mysql from "mysql";

 // Datenbankkonfiguration
--- a/pages/api/talas_v5_DB/pois/getPoiById.js
+++ b/pages/api/talas_v5_DB/pois/getPoiById.js
@@ -1,4 +1,4 @@
-// pages/api/getPoiById.js
+// pages/api/talas_v5_DB/pois/getPoiById.js
 import mysql from "mysql";

 const dbConfig = {
--- a/pages/api/talas_v5_DB/pois/poi-icons.js
+++ b/pages/api/talas_v5_DB/pois/poi-icons.js
@@ -1,4 +1,4 @@
-// pages/api/poi-icons.js
+// pages/api/talas_v5_DB/pois/poi-icons.js
 import mysql from "mysql";

 const dbConfig = {
--- a/pages/api/talas_v5_DB/pois/readLocations.js
+++ b/pages/api/talas_v5_DB/pois/readLocations.js
@@ -1,4 +1,4 @@
-// pages/api/readLocations.js
+// pages/api/talas_v5_DB/pois/readLocations.js
 import mysql from "mysql";

 const dbConfig = {
--- a/pages/api/talas_v5_DB/pois/updateLocation.js
+++ b/pages/api/talas_v5_DB/pois/updateLocation.js
@@ -1,4 +1,4 @@
-// pages/api/updateLocation.js
+// pages/api/talas_v5_DB/pois/updateLocation.js
 import mysql from "mysql";
 import util from "util";

--- a/pages/api/talas_v5_DB/pois/updatePoi.js
+++ b/pages/api/talas_v5_DB/pois/updatePoi.js
@@ -1,4 +1,4 @@
-// pages/api/updatePoi.js
+// pages/api/talas_v5_DB/pois/updatePoi.js
 import mysql from "mysql";

 const dbConfig = {
--- a/pages/index.js
+++ b/pages/index.js
@@ -18,7 +18,7 @@ export default function Home() {

  const loadData = async () => {
    try {
-      const response = await fetch("/api/readLocations");
+      const response = await fetch("/api/talas_v5_DB/pois/readLocations");
      if (!response.ok) {
        throw new Error("Fehler beim Laden der Standortdaten");
      }
@@ -47,7 +47,7 @@ export default function Home() {

  const handleAddLocation = async (name, type, lat, lng) => {
    try {
-      const response = await fetch("/api/addLocation", {
+      const response = await fetch("/api/talas_v5_DB/pois/addLocation", {
        method: "POST",
        headers: { "Content-Type": "application/json" },
        body: JSON.stringify({ name, type, latitude: lat, longitude: lng }),