From 0f899e6465d3c0b8bb1eb861807ca403f240f112 Mon Sep 17 00:00:00 2001 From: ISA Date: Tue, 20 May 2025 13:58:53 +0200 Subject: [PATCH] =?UTF-8?q?refactor:=20Quellcode=20aufr=C3=A4umen?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- components/mainComponent/MapComponent.js | 22 +++++++++++++++++-- .../hooks/useFetchWebServiceMap.js | 6 ++--- .../mainComponent/hooks/useLoadUserRights.js | 4 ++-- config/appVersion.js | 2 +- .../database/fetchDeviceNameByIdService.js | 2 +- ...fetchPoiData.js => fetchPoiDataService.js} | 4 ++-- ....js => updateLocationInDatabaseService.js} | 4 ++-- services/utils/fetchWithTimeout.js | 2 +- .../fetchGisStationsMeasurementsService.js | 2 +- .../fetchGisStationsStaticDistrictService.js | 2 +- .../fetchGisStationsStatusDistrictService.js | 2 +- ...ns.js => fetchGisStatusStationsService.js} | 4 ++-- ...atic.js => fetchGisSystemStaticService.js} | 4 ++-- ...serRights.js => fetchUserRightsService.js} | 4 ++-- utils/polylines/setupPolylines.js | 11 +--------- utils/setupPOIs.js | 4 ++-- 16 files changed, 44 insertions(+), 35 deletions(-) rename services/database/{fetchPoiData.js => fetchPoiDataService.js} (81%) rename services/database/{updateLocationInDatabase.js => updateLocationInDatabaseService.js} (68%) rename services/webservice/{fetchGisStatusStations.js => fetchGisStatusStationsService.js} (85%) rename services/webservice/{fetchGisSystemStatic.js => fetchGisSystemStaticService.js} (74%) rename services/webservice/{fetchUserRights.js => fetchUserRightsService.js} (88%) diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 4290f344d..95bad2565 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -36,7 +36,7 @@ import CoordinateInput from "../CoordinateInput.js"; import CoordinateModal from "../CoordinateModal.js"; import CoordinatePopup from "../CoordinatePopup.js"; //------------------------Daten aus API-------------------- -import { fetchPoiData } from "../../services/database/fetchPoiData.js"; +import { fetchPoiDataService } from "../../services/database/fetchPoiDataService.js"; import { fetchGisStationsMeasurementsService } from "../../services/webservice/fetchGisStationsMeasurementsService.js"; import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js"; import { fetchLocationDevicesFromDB } from "../../redux/slices/db/locationDevicesFromDBSlice"; @@ -272,7 +272,25 @@ const MapComponent = ({ locations, onLocationUpdate, lineCoordinates }) => { useEffect(() => { if (poiData.length === 0) return; - setupPOIs(map, locations, poiData, poiTypMap, userRights, poiLayerRef, setSelectedPoi, setLocationDeviceData, setDeviceName, setCurrentPoi, poiLayerVisible, fetchPoiData, toast, setShowPoiUpdateModal, setCurrentPoiData, deviceName, dispatch); + setupPOIs( + map, + locations, + poiData, + poiTypMap, + userRights, + poiLayerRef, + setSelectedPoi, + setLocationDeviceData, + setDeviceName, + setCurrentPoi, + poiLayerVisible, + fetchPoiDataService, + toast, + setShowPoiUpdateModal, + setCurrentPoiData, + deviceName, + dispatch + ); }, [map, locations, onLocationUpdate, poiReadTrigger, isPoiTypLoaded, userRights, poiLayerVisible, poiData, poiTypMap, dispatch]); //--------------------------------------------- diff --git a/components/mainComponent/hooks/useFetchWebServiceMap.js b/components/mainComponent/hooks/useFetchWebServiceMap.js index 924f3bbe8..05e8a46e4 100644 --- a/components/mainComponent/hooks/useFetchWebServiceMap.js +++ b/components/mainComponent/hooks/useFetchWebServiceMap.js @@ -2,7 +2,7 @@ import { useEffect } from "react"; import { fetchGisStationsStatusDistrictService } from "../../../services/webservice/fetchGisStationsStatusDistrictService"; import { fetchGisStationsMeasurementsService } from "../../../services/webservice/fetchGisStationsMeasurementsService"; -import { fetchGisSystemStatic } from "../../../services/webservice/fetchGisSystemStatic"; +import { fetchGisSystemStaticService } from "../../../services/webservice/fetchGisSystemStaticService"; const useFetchWebServiceMap = (mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded) => { useEffect(() => { @@ -36,8 +36,8 @@ const useFetchWebServiceMap = (mapGisStationsStatusDistrictUrl, mapGisStationsMe // GIS System Static abrufen //console.log("⏳ Abrufen von GIS System Static..."); - await fetchGisSystemStatic(mapGisSystemStaticUrl, setGisSystemStatic, setGisSystemStaticLoaded, fetchOptions); - //console.log("✅ fetchGisSystemStatic erfolgreich!"); + await fetchGisSystemStaticService(mapGisSystemStaticUrl, setGisSystemStatic, setGisSystemStaticLoaded, fetchOptions); + //console.log("✅ fetchGisSystemStaticService erfolgreich!"); requestCount++; localStorage.setItem("fetchWebServiceMap", requestCount); } catch (error) { diff --git a/components/mainComponent/hooks/useLoadUserRights.js b/components/mainComponent/hooks/useLoadUserRights.js index 69d744d0e..9ae56b705 100644 --- a/components/mainComponent/hooks/useLoadUserRights.js +++ b/components/mainComponent/hooks/useLoadUserRights.js @@ -1,11 +1,11 @@ // /components/mainComponent/hooks/useLoadUserRights.js import { useEffect } from "react"; -import { fetchUserRights } from "../../../services/webservice/fetchUserRights"; +import { fetchUserRightsService } from "../../../services/webservice/fetchUserRightsService"; const useLoadUserRights = (setUserRights, setIsRightsLoaded, setHasRights) => { useEffect(() => { const fetchAndSetUserRights = async () => { - const rights = await fetchUserRights(); + const rights = await fetchUserRightsService(); setUserRights(rights); setIsRightsLoaded(true); diff --git a/config/appVersion.js b/config/appVersion.js index 172e5f540..80bddb66d 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.118"; +export const APP_VERSION = "1.1.119"; diff --git a/services/database/fetchDeviceNameByIdService.js b/services/database/fetchDeviceNameByIdService.js index 813e53672..a5ffda749 100644 --- a/services/database/fetchDeviceNameByIdService.js +++ b/services/database/fetchDeviceNameByIdService.js @@ -1,4 +1,4 @@ -// /services/api/fetchDeviceNameById.js +// /services/database/fetchDeviceNameById.js export const fetchDeviceNameById = async (idLD) => { try { const response = await fetch(`/api/talas_v5_DB/locationDevice/locationDeviceNameById?idLD=${idLD}`); diff --git a/services/database/fetchPoiData.js b/services/database/fetchPoiDataService.js similarity index 81% rename from services/database/fetchPoiData.js rename to services/database/fetchPoiDataService.js index fc5c61b1d..f7723b783 100644 --- a/services/database/fetchPoiData.js +++ b/services/database/fetchPoiDataService.js @@ -1,6 +1,6 @@ -// /services/api/fetchPoiData.js +// /services/database/fetchPoiDataService.js -export const fetchPoiData = async (idPoi) => { +export const fetchPoiDataService = async (idPoi) => { try { const response = await fetch(`/api/talas_v5_DB/pois/getPoiById?idPoi=${idPoi}`); if (!response.ok) throw new Error("Fehler beim Abrufen der POI-Daten"); diff --git a/services/database/updateLocationInDatabase.js b/services/database/updateLocationInDatabaseService.js similarity index 68% rename from services/database/updateLocationInDatabase.js rename to services/database/updateLocationInDatabaseService.js index 4cec4ca7e..06ea5d2e1 100644 --- a/services/database/updateLocationInDatabase.js +++ b/services/database/updateLocationInDatabaseService.js @@ -1,6 +1,6 @@ -// /services/api/updateLocationInDatabase.js +// /services/database/updateLocationInDatabaseService.js -export const updateLocationInDatabase = async (id, newLatitude, newLongitude) => { +export const updateLocationInDatabaseService = async (id, newLatitude, newLongitude) => { const response = await fetch("/api/talas_v5_DB/pois/updateLocation", { method: "POST", headers: { "Content-Type": "application/json" }, diff --git a/services/utils/fetchWithTimeout.js b/services/utils/fetchWithTimeout.js index 5372a2ad9..c436fe564 100644 --- a/services/utils/fetchWithTimeout.js +++ b/services/utils/fetchWithTimeout.js @@ -1,4 +1,4 @@ -// services/api/fetchWithTimeout.js +// services/utils/fetchWithTimeout.js const fetchWithTimeout = (url, options, timeout = 5000) => { const controller = new AbortController(); diff --git a/services/webservice/fetchGisStationsMeasurementsService.js b/services/webservice/fetchGisStationsMeasurementsService.js index 8191a7c2f..50e79cd2c 100644 --- a/services/webservice/fetchGisStationsMeasurementsService.js +++ b/services/webservice/fetchGisStationsMeasurementsService.js @@ -1,4 +1,4 @@ -// /services/api/fetchGisStationsMeasurementsService.js +// /services/webservice/fetchGisStationsMeasurementsService.js export const fetchGisStationsMeasurementsService = async () => { const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; diff --git a/services/webservice/fetchGisStationsStaticDistrictService.js b/services/webservice/fetchGisStationsStaticDistrictService.js index 259c0619c..5fed078dc 100644 --- a/services/webservice/fetchGisStationsStaticDistrictService.js +++ b/services/webservice/fetchGisStationsStaticDistrictService.js @@ -1,4 +1,4 @@ -// /services/api/fetchGisStationsStaticDistrictService.js +// /services/webservice/fetchGisStationsStaticDistrictService.js /** * Holt statische GIS-Stationen-Daten für Bezirke. diff --git a/services/webservice/fetchGisStationsStatusDistrictService.js b/services/webservice/fetchGisStationsStatusDistrictService.js index c803c8537..a0f8b07c0 100644 --- a/services/webservice/fetchGisStationsStatusDistrictService.js +++ b/services/webservice/fetchGisStationsStatusDistrictService.js @@ -1,4 +1,4 @@ -// /services/api/fetchGisStationsStatusDistrictService.js +// /services/webservice/fetchGisStationsStatusDistrictService.js /** * Holt Statusinformationen der GIS-Bezirksstationen. diff --git a/services/webservice/fetchGisStatusStations.js b/services/webservice/fetchGisStatusStationsService.js similarity index 85% rename from services/webservice/fetchGisStatusStations.js rename to services/webservice/fetchGisStatusStationsService.js index 9b372eb90..6ebf908fa 100644 --- a/services/webservice/fetchGisStatusStations.js +++ b/services/webservice/fetchGisStatusStationsService.js @@ -1,7 +1,7 @@ -// /services/api/fetchGisStatusStations.js +// /services/webservice/fetchGisStatusStationsService.js import fetchWithTimeout from "../utils/fetchWithTimeout"; -export const fetchGisStatusStations = async (idMap, idUser) => { +export const fetchGisStatusStationsService = async (idMap, idUser) => { const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; const SERVER_URL = mode === "dev" ? `${window.location.protocol}//${window.location.hostname}:80` : `${window.location.origin}`; diff --git a/services/webservice/fetchGisSystemStatic.js b/services/webservice/fetchGisSystemStaticService.js similarity index 74% rename from services/webservice/fetchGisSystemStatic.js rename to services/webservice/fetchGisSystemStaticService.js index cb9a97de5..6a9f7b136 100644 --- a/services/webservice/fetchGisSystemStatic.js +++ b/services/webservice/fetchGisSystemStaticService.js @@ -1,6 +1,6 @@ -// /services/api/fetchGisSystemStatic.js +// /services/webservice/fetchGisSystemStaticService.js -export const fetchGisSystemStatic = async (url, setGisSystemStatic, setGisSystemStaticLoaded) => { +export const fetchGisSystemStaticService = async (url, setGisSystemStatic, setGisSystemStaticLoaded) => { try { const response = await fetch(url); const jsonResponse = await response.json(); diff --git a/services/webservice/fetchUserRights.js b/services/webservice/fetchUserRightsService.js similarity index 88% rename from services/webservice/fetchUserRights.js rename to services/webservice/fetchUserRightsService.js index aa130bd41..a37d5eaa9 100644 --- a/services/webservice/fetchUserRights.js +++ b/services/webservice/fetchUserRightsService.js @@ -1,7 +1,7 @@ -// /services/api/fetchUserRights.js +// /services/webservice/fetchUserRightsService.js import * as config from "../../config/config"; -export const fetchUserRights = async () => { +export const fetchUserRightsService = async () => { if (config.USE_MOCK_API) { console.log("⚠️ Mock-API: Benutzerrechte geladen"); return [56, 57, 58]; // Beispielrechte diff --git a/utils/polylines/setupPolylines.js b/utils/polylines/setupPolylines.js index 325775a1e..9ebff3329 100644 --- a/utils/polylines/setupPolylines.js +++ b/utils/polylines/setupPolylines.js @@ -1,23 +1,14 @@ // utils/polylines/setupPolylines.js import { findClosestPoints } from "../geometryUtils"; -import handlePoiSelect from "../handlePoiSelect"; -import { updateLocationInDatabase } from "../../services/database/updateLocationInDatabase"; -import { handleEditPoi, insertNewPOI, removePOI } from "../poiUtils"; -import { parsePoint } from "../geometryUtils"; +import { insertNewPOI, removePOI } from "../poiUtils"; import circleIcon from "../../components/gisPolylines/icons/CircleIcon"; import startIcon from "../../components/gisPolylines/icons/StartIcon"; import endIcon from "../../components/gisPolylines/icons/EndIcon"; import { redrawPolyline } from "./redrawPolyline"; -import { openInNewTab } from "../openInNewTab"; import { toast } from "react-toastify"; -import { polylineLayerVisibleState } from "../../redux/slices/polylineLayerVisibleSlice"; import { store } from "../../redux/store"; // Importiere den Store -import { openAddPoiOnPolylineModal } from "../../redux/slices/addPoiOnPolylineSlice"; import { openPolylineContextMenu, closePolylineContextMenu } from "../../redux/slices/polylineContextMenuSlice"; -import { enablePolylineEvents, disablePolylineEvents } from "./eventHandlers"; -import { closePolylineSelectionAndContextMenu } from "./contextMenu"; import { monitorContextMenu } from "./monitorContextMenu"; -import { subscribeToPolylineContextMenu } from "./polylineSubscription"; import { forceCloseContextMenu } from "../../redux/slices/polylineContextMenuSlice"; //-------------------------------------------- diff --git a/utils/setupPOIs.js b/utils/setupPOIs.js index fe1112227..800bb8ddb 100644 --- a/utils/setupPOIs.js +++ b/utils/setupPOIs.js @@ -1,7 +1,7 @@ // utils/setupPOIs.js import { findClosestPoints } from "./geometryUtils"; import handlePoiSelect from "./handlePoiSelect"; -import { updateLocationInDatabase } from "../services/database/updateLocationInDatabase"; +import { updateLocationInDatabaseService } from "../services/database/updateLocationInDatabaseService"; import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils"; import { parsePoint } from "./geometryUtils"; import circleIcon from "../components/gisPolylines/icons/CircleIcon"; @@ -120,7 +120,7 @@ export const setupPOIs = async ( const newLat = e.target.getLatLng().lat; const newLng = e.target.getLatLng().lng; const markerId = e.target.options.id; - updateLocationInDatabase(markerId, newLat, newLng).then(() => {}); + updateLocationInDatabaseService(markerId, newLat, newLng).then(() => {}); } else { console.error("Drag operation not allowed"); }