Merge branch 'development' into 109-adjust-time-interval-for-position…

…-computation

Server/prisma/schema.prisma

@@ -37,7 +37,7 @@ model POI {
     typeId          Int
     type            POIType @relation(fields: [typeId], references: [uid])
     trackId         Int
-    track           Track @relation(fields: [trackId], references: [uid])
+    track           Track @relation(fields: [trackId], references: [uid], onDelete: Cascade)
 }
 
 model Track {
@@ -62,12 +62,12 @@ model VehicleType {
 model Vehicle {
     uid         Int @id @default(autoincrement())
     name        String
-    
+
     typeId      Int
     type        VehicleType @relation(fields: [typeId], references: [uid])
     trackId     Int
     track       Track @relation(fields: [trackId], references: [uid])
-    
+
     tracker     Tracker[]
     logs        Log[]
 

Server/src/routes/poi.route.ts

@@ -4,7 +4,7 @@ import { Position, UpdatePointOfInterest } from "../models/api"
 import { logger } from "../utils/logger"
 import POIService from "../services/poi.service"
 import { Feature, GeoJsonProperties, Point } from "geojson"
-import { POI, POIType, Track } from "@prisma/client"
+import { POI, POIType, Track, Prisma } from "@prisma/client"
 import database from "../services/database.service"
 import GeoJSONUtils from "../utils/geojsonUtils"
 import please_dont_crash from "../utils/please_dont_crash"
@@ -199,15 +199,16 @@ export class PoiRoute {
 
 		const enrichedPoint = (await POIService.enrichPOIPosition(geopos, track)) ?? undefined
 
-		const updatedPOI: POI | null = await database.pois.update(
-			poiId,
-			userData.name,
-			userData.description,
-			userData.typeId,
-			userData.trackId,
-			enrichedPoint,
-			userData.isTurningPoint
-		)
+		// Note: geopos is from type GeoJSON.Feature and can't be parsed directly into Prisma.InputJsonValue
+		// Therefore we cast it into unknown first.
+		const updatedPOI: POI | null = await database.pois.update(userData.id!, {
+			name: userData.name,
+			description: userData.description,
+			position: enrichedPoint as unknown as Prisma.InputJsonValue,
+			isTurningPoint: userData.isTurningPoint,
+			typeId: userData.typeId,
+			trackId: track!.uid
+		})
 
 		if (!updatedPOI) {
 			logger.error(`Could not update poi with id ${userData.id}`)

Server/src/routes/poitype.route.ts

@@ -85,7 +85,7 @@ export class PoiTypeRoute {
 		// TODO: ensure that the icon is a member of the enum (or check if the type guard checks that)
 		const { name, icon, description }: CreatePOIType = req.body
 
-		const poiType: POIType | null = await database.pois.saveType(name, icon.toString(), description)
+		const poiType: POIType | null = await database.pois.saveType({ name, icon: icon.toString(), description })
 		if (!poiType) {
 			logger.error("Could not create poi type")
 			res.sendStatus(500)
@@ -118,7 +118,11 @@ export class PoiTypeRoute {
 			return
 		}
 
-		type = await database.pois.updateType(typeId, userData.name, userData.icon.toString(), userData.description)
+		type = await database.pois.updateType(typeId, {
+			name: userData.name,
+			icon: userData.icon.toString(),
+			description: userData.description
+		})
 		if (!type) {
 			logger.error(`Could not update poi type with id ${userData.id}`)
 			res.sendStatus(500)

Server/src/routes/tracker.route.ts

@@ -4,7 +4,8 @@ import { authenticateJWT, jsonParser } from "."
 import TrackerService from "../services/tracker.service"
 import { UplinkTracker } from "../models/api.tracker"
 import please_dont_crash from "../utils/please_dont_crash"
-import { Tracker, Vehicle } from "@prisma/client"
+import { Prisma, Tracker, Vehicle } from "@prisma/client"
+import VehicleService from "../services/vehicle.service"
 import database from "../services/database.service"
 import { Tracker as APITracker } from "../models/api"
 
@@ -82,7 +83,11 @@ export class TrackerRoute {
 	private async createTracker(req: Request, res: Response): Promise<void> {
 		const apiTracker: APITracker = req.body
 
-		const tracker: Tracker | null = await database.trackers.save(apiTracker.id, apiTracker.vehicleId, apiTracker.data)
+		const tracker: Tracker | null = await database.trackers.save({
+			uid: apiTracker.id,
+			vehicleId: apiTracker.vehicleId,
+			data: apiTracker.data as Prisma.InputJsonValue
+		})
 		if (!tracker) {
 			logger.error("Could not create tracker")
 			res.sendStatus(500)
@@ -114,7 +119,10 @@ export class TrackerRoute {
 			return
 		}
 
-		tracker = await database.trackers.update(trackerId, userData.vehicleId, userData.data)
+		tracker = await database.trackers.update(trackerId, {
+			vehicleId: userData.vehicleId,
+			data: userData.data as Prisma.InputJsonValue
+		})
 		if (!tracker) {
 			logger.error(`Could not update tracker with id ${userData.id}`)
 			res.sendStatus(500)

Server/src/routes/vehicle.route.ts

@@ -293,15 +293,19 @@ export class VehicleRoute {
 			trackers.push(maybeTracker)
 		}
 
-		const vehicle: Vehicle | null = await database.vehicles.save(type.uid, userData.track, userData.name)
+		const vehicle: Vehicle | null = await database.vehicles.save({
+			name: userData.name,
+			typeId: type.uid,
+			trackId: userData.track
+		})
 		if (!vehicle) {
 			logger.error(`Could not create vehicle`)
 			res.sendStatus(500)
 			return
 		}
 
 		for (const tracker of trackers) {
-			const updatedTracker = await database.trackers.update(tracker.uid, vehicle.uid)
+			const updatedTracker = await database.trackers.update(tracker.uid, { vehicleId: vehicle.uid })
 			if (!updatedTracker) {
 				logger.error(`Could not attach tracker to created vehicle.`)
 				res.sendStatus(500)
@@ -376,19 +380,23 @@ export class VehicleRoute {
 			trackers.push(tracker)
 		}
 
-		const vehicle = await database.vehicles.update(vehicleId, type.uid, userData.track, userData.name)
+		const vehicle = await database.vehicles.update(vehicleId, {
+			typeId: type.uid,
+			trackId: userData.track,
+			name: userData.name
+		})
 		if (!vehicle) {
 			logger.error(`Could not update vehicle with id ${vehicleId}`)
 			res.sendStatus(500)
 			return
 		}
 
 		for (const tracker of prevTrackers) {
-			database.trackers.update(tracker.uid, null)
+			database.trackers.update(tracker.uid, { vehicleId: null })
 		}
 
 		for (const tracker of trackers) {
-			const trackerToUpdate: Tracker | null = await database.trackers.update(tracker.uid, vehicleId)
+			const trackerToUpdate: Tracker | null = await database.trackers.update(tracker.uid, { vehicleId: vehicleId })
 			if (!trackerToUpdate) {
 				logger.error(`Could not set tracker with tracker-id ${tracker}`)
 				res.sendStatus(500)

Server/src/routes/vehicletype.route.ts

@@ -125,11 +125,11 @@ export class VehicleTypeRoute {
 
 		// TODO: input validation
 
-		const vehicleType: VehicleType | null = await database.vehicles.saveType(
-			userData.name,
-			userData.icon,
-			userData.description
-		)
+		const vehicleType: VehicleType | null = await database.vehicles.saveType({
+			name: userData.name,
+			icon: userData.icon,
+			description: userData.description
+		})
 		if (!vehicleType) {
 			// TODO: differentiate different error causes:
 			//       Constraint violation   => 409
@@ -195,7 +195,11 @@ export class VehicleTypeRoute {
 		// type = await VehicleService.renameVehicleType(type, userData.name) // TODO: What about the description?!
 
 		// update all properties atomically, by directly talking to the database controller
-		type = await database.vehicles.updateType(type.uid, userData.name, userData.icon, userData.description)
+		type = await database.vehicles.updateType(type.uid, {
+			name: userData.name,
+			icon: userData.icon,
+			description: userData.description
+		})
 
 		if (!type) {
 			// TODO: differentiate different error causes:

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

@@ -70,21 +70,23 @@ export default class LogController {
 	 * Removes a log from the database.
 	 *
 	 * @param uid - Indicator which log should be removed
+	 * @returns True if the removal was successful. Otherwise throws an Error.
 	 */
-	public async remove(uid: number): Promise<void> {
+	public async remove(uid: number): Promise<boolean> {
 		await this.prisma.log.delete({
 			where: {
 				uid: uid
 			}
 		})
+		return true
 	}
 
 	/**
 	 * 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 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
@@ -134,7 +136,7 @@ export default class LogController {
 	 */
 	public async getNewestLogs(vehicleId: number, max_sec: number = 300): Promise<Log[]> {
 		// Earliest date which should be considered
-		let max_date = new Date(Date.now() - max_sec * 1000)
+		const max_date = new Date(Date.now() - max_sec * 1000)
 
 		return await this.prisma.log.findMany({
 			where: {