Revert "Merge pull request #50 from kieler/23-service-improvements"

This reverts commit 1548d6b, reversing
changes made to e07af0f.

Server/src/routes/init.route.ts

@@ -147,7 +147,7 @@ export class InitRoute {
 			geometry: { type: "Point", coordinates: [pos.lng, pos.lat] },
 			properties: null
 		}
-		const currentTrack: Track | null = await TrackService.getClosestTrack(backendPos)
+		const currentTrack: Track | null = await VehicleService.getCurrentTrackForVehicle(backendPos)
 
 		if (!currentTrack) {
 			logger.error(`Could not find current track with position {lat : ${pos.lat}, lng : ${pos.lng}}`)

Server/src/routes/track.route.ts

@@ -225,7 +225,7 @@ export class TrackRoute {
 				} : undefined
 				// Also acquire the percentage position. It might happen that a percentage position is known, while the position is not.
 				// This might not make much sense.
-				const percentagePosition = (await VehicleService.getVehicleTrackDistancePercentage(vehicle)) ?? undefined
+				const percentagePosition = (await VehicleService.getVehicleTrackDistancePercentage(vehicle, track)) ?? undefined
 				const heading = await VehicleService.getVehicleHeading(vehicle)
 				return {
 					id: vehicle.uid,

Server/src/services/db/log.controller.ts

@@ -132,29 +132,32 @@ export default class LogController {
 		}
 	}
 
-    /**
+	/**
 	 * Return a list of all logs. (Sorted: Descending by timestamp)
 	 * If a trackerId is given the list will be filtered for this specific tracker.
 	 * If a vehicleId is given the list will be filtered for this specific vehicle.
 	 *
-	 * @param limit - Number of entries this method should deliver. Default is all (undefined)
 	 * @param vehicleId - Vehicle to filter for (Optional)
 	 * @param trackerId - Tracker to filter for (Optional)
 	 * @returns Log[] - List of all logs
 	 */
-	public async getAll(vehicleId?: number, trackerId?: string, limit?: number): Promise<Log[]> {
-		return await this.prisma.log.findMany({
-			where: {
-				vehicleId: vehicleId,
-				trackerId: trackerId
-			},
-			orderBy: [
-				{
-					timestamp: "desc"
-				}
-			],
-			take: limit
-		})
+	public async getAll(vehicleId?: number, trackerId?: string): Promise<Log[]> {
+		try {
+			return await this.prisma.log.findMany({
+				where: {
+					vehicleId: vehicleId,
+					trackerId: trackerId
+				},
+				orderBy: [
+					{
+						timestamp: "desc"
+					}
+				]
+			})
+		} catch (e) {
+			logger.debug(e)
+			return []
+		}
 	}
 
 	/**