diff --git a/CHANGELOG.md b/CHANGELOG.md index 614c73e76..c49aa1e4c 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,25 @@ Alle bedeutenden Änderungen an diesem Projekt werden in dieser Datei dokumentie --- +## [1.1.117] – 2025-05-20 + +### Changed + +- 🔁 Projektstruktur unter `/services/` neu organisiert nach Datenquelle: + - `/services/webservice/` für TALAS-WebServices (Port 80) + - `/services/database/` für eigene Next.js-APIs (Port 3000) + - `/services/utils/` für Hilfsfunktionen (z. B. `fetchWithTimeout`) +- Alle Service-Dateien konsistent benannt nach Schema: `fetchXyzService.js` +- Beispiel: `fetchGisStationsMeasurementsService.js`, `fetchPoiData.js`, `updateLocationInDatabase.js` + +### Motivation + +- ✅ Bessere Übersicht nach Quelle und Verantwortung +- 📦 Klare Trennung zwischen WebService-Fetch und App-APIs +- 👨‍💻 Erleichtert das Onboarding und Debugging + +--- + ## [1.1.108] – 2025-05-20 ### Removed diff --git a/components/mainComponent/MapComponent.js b/components/mainComponent/MapComponent.js index 2ee7e8fc8..4290f344d 100644 --- a/components/mainComponent/MapComponent.js +++ b/components/mainComponent/MapComponent.js @@ -36,8 +36,8 @@ import CoordinateInput from "../CoordinateInput.js"; import CoordinateModal from "../CoordinateModal.js"; import CoordinatePopup from "../CoordinatePopup.js"; //------------------------Daten aus API-------------------- -import { fetchPoiData } from "../../services/api/fetchPoiData.js"; -import { fetchGisStationsMeasurementsService } from "../../services/api/fetchGisStationsMeasurementsService.js"; +import { fetchPoiData } from "../../services/database/fetchPoiData.js"; +import { fetchGisStationsMeasurementsService } from "../../services/webservice/fetchGisStationsMeasurementsService.js"; import { selectPolylineVisible, setPolylineVisible } from "../../redux/slices/polylineLayerVisibleSlice.js"; import { fetchLocationDevicesFromDB } from "../../redux/slices/db/locationDevicesFromDBSlice"; import { fetchGisStationsStaticDistrictFromWebService } from "../../redux/slices/webService/gisStationsStaticDistrictSlice"; diff --git a/components/mainComponent/hooks/useFetchWebServiceMap.js b/components/mainComponent/hooks/useFetchWebServiceMap.js index 861d3b762..924f3bbe8 100644 --- a/components/mainComponent/hooks/useFetchWebServiceMap.js +++ b/components/mainComponent/hooks/useFetchWebServiceMap.js @@ -1,8 +1,8 @@ // /components/mainComponent/hooks/useFetchWebServiceMap.js import { useEffect } from "react"; -import { fetchGisStationsStatusDistrictService } from "../../../services/api/fetchGisStationsStatusDistrictService"; -import { fetchGisStationsMeasurementsService } from "../../../services/api/fetchGisStationsMeasurementsService"; -import { fetchGisSystemStatic } from "../../../services/api/fetchGisSystemStatic"; +import { fetchGisStationsStatusDistrictService } from "../../../services/webservice/fetchGisStationsStatusDistrictService"; +import { fetchGisStationsMeasurementsService } from "../../../services/webservice/fetchGisStationsMeasurementsService"; +import { fetchGisSystemStatic } from "../../../services/webservice/fetchGisSystemStatic"; const useFetchWebServiceMap = (mapGisStationsStatusDistrictUrl, mapGisStationsMeasurementsUrl, mapGisSystemStaticUrl, setGisStationsStatusDistrict, setGisStationsMeasurements, setGisSystemStatic, setGisSystemStaticLoaded) => { useEffect(() => { diff --git a/components/mainComponent/hooks/useLoadUserRights.js b/components/mainComponent/hooks/useLoadUserRights.js index fa3688085..69d744d0e 100644 --- a/components/mainComponent/hooks/useLoadUserRights.js +++ b/components/mainComponent/hooks/useLoadUserRights.js @@ -1,6 +1,6 @@ // /components/mainComponent/hooks/useLoadUserRights.js import { useEffect } from "react"; -import { fetchUserRights } from "../../../services/api/fetchUserRights"; +import { fetchUserRights } from "../../../services/webservice/fetchUserRights"; const useLoadUserRights = (setUserRights, setIsRightsLoaded, setHasRights) => { useEffect(() => { diff --git a/config/appVersion.js b/config/appVersion.js index 79a6c8f1c..172e5f540 100644 --- a/config/appVersion.js +++ b/config/appVersion.js @@ -1,2 +1,2 @@ // /config/appVersion -export const APP_VERSION = "1.1.116"; +export const APP_VERSION = "1.1.118"; diff --git a/services/api/fetchDeviceNameByIdService.js b/services/database/fetchDeviceNameByIdService.js similarity index 100% rename from services/api/fetchDeviceNameByIdService.js rename to services/database/fetchDeviceNameByIdService.js diff --git a/services/api/fetchPoiData.js b/services/database/fetchPoiData.js similarity index 100% rename from services/api/fetchPoiData.js rename to services/database/fetchPoiData.js diff --git a/services/api/updateLocationInDatabase.js b/services/database/updateLocationInDatabase.js similarity index 100% rename from services/api/updateLocationInDatabase.js rename to services/database/updateLocationInDatabase.js diff --git a/services/api/fetchWithTimeout.js b/services/utils/fetchWithTimeout.js similarity index 100% rename from services/api/fetchWithTimeout.js rename to services/utils/fetchWithTimeout.js diff --git a/services/api/fetchGisStationsMeasurementsService.js b/services/webservice/fetchGisStationsMeasurementsService.js similarity index 100% rename from services/api/fetchGisStationsMeasurementsService.js rename to services/webservice/fetchGisStationsMeasurementsService.js diff --git a/services/api/fetchGisStationsStaticDistrictService.js b/services/webservice/fetchGisStationsStaticDistrictService.js similarity index 100% rename from services/api/fetchGisStationsStaticDistrictService.js rename to services/webservice/fetchGisStationsStaticDistrictService.js diff --git a/services/api/fetchGisStationsStatusDistrictService.js b/services/webservice/fetchGisStationsStatusDistrictService.js similarity index 100% rename from services/api/fetchGisStationsStatusDistrictService.js rename to services/webservice/fetchGisStationsStatusDistrictService.js diff --git a/services/api/fetchGisStatusStations.js b/services/webservice/fetchGisStatusStations.js similarity index 93% rename from services/api/fetchGisStatusStations.js rename to services/webservice/fetchGisStatusStations.js index 64a82f003..9b372eb90 100644 --- a/services/api/fetchGisStatusStations.js +++ b/services/webservice/fetchGisStatusStations.js @@ -1,5 +1,5 @@ // /services/api/fetchGisStatusStations.js -import fetchWithTimeout from "./fetchWithTimeout"; +import fetchWithTimeout from "../utils/fetchWithTimeout"; export const fetchGisStatusStations = async (idMap, idUser) => { const mode = process.env.NEXT_PUBLIC_API_PORT_MODE; diff --git a/services/api/fetchGisSystemStatic.js b/services/webservice/fetchGisSystemStatic.js similarity index 100% rename from services/api/fetchGisSystemStatic.js rename to services/webservice/fetchGisSystemStatic.js diff --git a/services/api/fetchUserRights.js b/services/webservice/fetchUserRights.js similarity index 100% rename from services/api/fetchUserRights.js rename to services/webservice/fetchUserRights.js diff --git a/utils/polylines/setupPolylines.js b/utils/polylines/setupPolylines.js index 13ebc44dc..325775a1e 100644 --- a/utils/polylines/setupPolylines.js +++ b/utils/polylines/setupPolylines.js @@ -1,7 +1,7 @@ // utils/polylines/setupPolylines.js import { findClosestPoints } from "../geometryUtils"; import handlePoiSelect from "../handlePoiSelect"; -import { updateLocationInDatabase } from "../../services/api/updateLocationInDatabase"; +import { updateLocationInDatabase } from "../../services/database/updateLocationInDatabase"; import { handleEditPoi, insertNewPOI, removePOI } from "../poiUtils"; import { parsePoint } from "../geometryUtils"; import circleIcon from "../../components/gisPolylines/icons/CircleIcon"; diff --git a/utils/setupPOIs.js b/utils/setupPOIs.js index 6a5af4177..fe1112227 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/api/updateLocationInDatabase"; +import { updateLocationInDatabase } from "../services/database/updateLocationInDatabase"; import { handleEditPoi, insertNewPOI, removePOI } from "./poiUtils"; import { parsePoint } from "./geometryUtils"; import circleIcon from "../components/gisPolylines/icons/CircleIcon";