style: run prettier

src/entities/Stores.ts

@@ -23,7 +23,7 @@ export class Store extends BaseEntity {
 
 	@Column({
 		type: "enum",
-		enum: STORE_TYPE
+		enum: STORE_TYPE,
 	})
 	type: StoreType;
 

src/main.ts

@@ -396,9 +396,7 @@ if (process.env.STORES_ENABLED) {
 		}
 
 		const user = await User.findOneBy(
-			c.req.param("user")
+			c.req.param("user") ? { username: c.req.param("user") } : { id: uid },
-				? { username: c.req.param("user") }
-				: { id: uid }
 		);
 		if (!user) {
 			return c.json({ error: "Invalid user ID" }, 400);

src/stores.ts

@@ -2,19 +2,20 @@ import z from "zod";
 import { Store, type StoreType } from "./entities/Stores";
 import type { User } from "./entities/User";
 
-export const locationStore = z.object({
+export const locationStore = z
+	.object({
 		lat: z.number().min(-90).max(90),
 		lng: z.number().min(-180).max(180),
-	name: z.string().min(1).max(100)
+		name: z.string().min(1).max(100),
-}).strict();
+	})
+	.strict();
 
-export const vehicleStore = z.object({
+export const vehicleStore = z
+	.object({
 		name: z.string().min(1).max(100),
 		legalMaxSpeed: z.number().min(0).max(300),
 		actualMaxSpeed: z.number().min(0).max(300),
-	type: z.enum([
+		type: z.enum(["car", "truck", "motorcycle", "bicycle", "motor_scooter"]),
-		"car", "truck", "motorcycle", "bicycle", "motor_scooter"
-	]),
 		weight: z.number().min(0).max(100000).optional(),
 		width: z.number().min(0).max(10).optional(),
 		axisLoad: z.number().min(0).max(100000).optional(),
@@ -22,21 +23,28 @@ export const vehicleStore = z.object({
 		length: z.number().min(0).max(100).optional(),
 		emissionClass: z.string().min(1).max(50),
 		fuelType: z.enum(["petrol", "diesel", "electric"]),
-	preferredFuel: z.string().min(1).max(50)
+		preferredFuel: z.string().min(1).max(50),
-}).strict();
+	})
+	.strict();
 
 export const routeStore = z.object({
-	locations: z.array(z.object({
+	locations: z.array(
+		z.object({
 			lat: z.number().min(-90).max(90),
-		lon: z.number().min(-180).max(180)
+			lon: z.number().min(-180).max(180),
-	})),
+		}),
-	legs: z.array(z.object({
+	),
+	legs: z.array(
+		z.object({
 			shape: z.string(),
-		maneuvers: z.array(z.object({
+			maneuvers: z.array(
-			type: z.number()
+				z.object({
-		}))
+					type: z.number(),
-	}))
+				}),
-})
+			),
+		}),
+	),
+});
 
 export const storeTypes: Record<StoreType, z.ZodSchema> = {
 	location: locationStore,
@@ -45,19 +53,27 @@ export const storeTypes: Record<StoreType, z.ZodSchema> = {
 };
 
 export const SyncPayload = z.object({
-	changes: z.array(z.object({
+	changes: z.array(
+		z.object({
 			id: z.uuid(),
 			operation: z.enum(["create", "update", "delete"]),
 			data: z.string(),
-		modified_at: z.string().refine(val => !isNaN(Date.parse(val)), { message: "Invalid date" }),
+			modified_at: z
+				.string()
+				.refine((val) => !isNaN(Date.parse(val)), { message: "Invalid date" }),
 			type: z.enum(["location", "vehicle", "route"]),
-		name: z.string().min(1).max(100)
+			name: z.string().min(1).max(100),
-	})),
+		}),
-	stores: z.array(z.object({
+	),
+	stores: z.array(
+		z.object({
 			id: z.uuid(),
-		modified_at: z.string().refine(val => !isNaN(Date.parse(val)), { message: "Invalid date" })
+			modified_at: z
-	}))
+				.string()
-})
+				.refine((val) => !isNaN(Date.parse(val)), { message: "Invalid date" }),
+		}),
+	),
+});
 
 export type SyncPayload = z.infer<typeof SyncPayload>;
 
@@ -77,7 +93,10 @@ export async function sync(payload: SyncPayload, user: User) {
 	const changes: Store[] = [];
 	// Apply changes from client
 	for (const change of payload.changes) {
-		const store = await Store.findOne({ where: { id: change.id }, relations: { user: true } });
+		const store = await Store.findOne({
+			where: { id: change.id },
+			relations: { user: true },
+		});
 		if (!verifyStoreData(change.type, change.data)) {
 			// Invalid data
 			if (store) changes.push(store); // Send back the store to the client to overwrite their changes
@@ -109,7 +128,7 @@ export async function sync(payload: SyncPayload, user: User) {
 	// Find stores that are out of date on the client
 	const allStores = await Store.findBy({ user: { id: user.id } }); // TODO: include friends' public stores, TODO: use SQL query to only get modified stores
 	for (const store of allStores) {
-		const clientStore = payload.stores.find(s => s.id === store.id);
+		const clientStore = payload.stores.find((s) => s.id === store.id);
 		if (!clientStore || new Date(clientStore.modified_at) < store.modified_at) {
 			changes.push(store); // Client doesn't have this store or it's out of date
 		}