refactor zo zod and felte

web/src/lib/models/api/list_schema.ts

@@ -2,11 +2,11 @@ import { z, ZodType } from "zod";
 import type { List } from "../list";
 
 const ListCreateSchema = z.object({
-    name: z.string(),
+    id: z.string().length(15).optional(),
+    name: z.string().min(1, "required"),
     public: z.boolean(),
     description: z.string().optional(),
     trails: z.array(z.string().length(15)),
-    avatar: z.string().optional(),
     author: z.string()
 }) satisfies ZodType<List>
 
@@ -17,7 +17,6 @@ const ListUpdateSchema = z.object({
     trails: z.array(z.string().length(15)).optional(),
     "trails-": z.string().optional(),
     "trails+": z.string().optional(),
-    avatar: z.string().optional(),
 }) satisfies ZodType<Partial<List>>
 
 export { ListCreateSchema, ListUpdateSchema };

web/src/lib/models/api/summit_log_schema.ts

@@ -4,7 +4,7 @@ import type { SummitLog } from "../summit_log";
 
 const SummitLogCreateSchema = z.object({
     id: z.string().length(15).optional(),
-    date: z.string().date(),
+    date: z.string().date().refine((val) => !isNaN(Date.parse(val)), "invalid-date"),
     text: z.string().optional(),
     gpx: z.string().optional(),
     distance: z.number().nonnegative().optional(),
@@ -16,7 +16,7 @@ const SummitLogCreateSchema = z.object({
 }) satisfies ZodType<SummitLog>
 
 const SummitLogUpdateSchema = z.object({
-    date: z.string().date().optional(),
+    date: z.string().date().refine((val) => !val || !isNaN(Date.parse(val)), "invalid-date").optional(),
     text: z.string().optional(),
     gpx: z.string().optional(),
     distance: z.number().nonnegative().optional(),

web/src/lib/models/api/trail_schema.ts

@@ -3,10 +3,11 @@ import type { Trail } from "../trail";
 
 
 const TrailCreateSchema = z.object({
-    name: z.string(),
+    id: z.string().length(15).optional(),
+    name: z.string().min(1, "required"),
     description: z.string().optional(),
     location: z.string().optional(),
-    date: z.string().date(),
+    date: z.string().optional().refine((val) => !val || !isNaN(Date.parse(val)), "invalid-date"),
     public: z.boolean(),
     difficulty: z.enum(["easy", "moderate", "difficult"]).optional(),
     lat: z.number().optional(),
@@ -29,7 +30,7 @@ const TrailUpdateSchema = z.object({
     name: z.string(),
     description: z.string().optional(),
     location: z.string().optional(),
-    date: z.string().date(),
+    date: z.string().optional().refine((val) => !val || !isNaN(Date.parse(val)), "invalid-date"),
     public: z.boolean().optional(),
     difficulty: z.enum(["easy", "moderate", "difficult"]).optional(),
     lat: z.number().optional(),

web/src/lib/models/api/waypoint_schema.ts

@@ -17,8 +17,8 @@ const WaypointUpdateSchema = z.object({
     name: z.string().optional(),
     description: z.string().optional(),
     text: z.string().optional(),
-    lat: z.number().optional(),
-    lon: z.number().optional(),
+    lat: z.number({coerce: true}).optional(),
+    lon: z.number({coerce: true}).optional(),
     icon: z.string().optional(),
     photos: z.array(z.string()),
     "photos-": z.string().optional(),

web/src/lib/models/list.ts

@@ -16,7 +16,7 @@ export class List {
         author?: UserAnonymous;
 
     }
-    author?: string;
+    author: string;
 
     constructor(name: string, trails: Trail[], params?: { description?: string, public?: boolean, avatar?: string, author?: string }) {
         this.name = name;
@@ -24,8 +24,8 @@ export class List {
         this.expand = { trails: trails };
         this.trails = trails.map(t => t.id!);
         this.description = params?.description;
-        this.avatar = params?.description;
-        this.author = params?.author;
+        this.avatar = params?.avatar;
+        this.author = params?.author ?? "000000000000000";
     }
 }
 

web/src/lib/models/summit_log.ts

@@ -13,7 +13,7 @@ class SummitLog {
   elevation_gain?: number
   elevation_loss?: number
   duration?: number
-  author?: string;
+  author: string;
 
   expand?: {
     gpx_data?: string;
@@ -33,6 +33,7 @@ class SummitLog {
     this._gpx = null
     this.photos = params?.photos ?? []
     this._photos = [];
+    this.author = "000000000000000"
   }
 }
 

web/src/lib/models/trail.ts

@@ -36,7 +36,7 @@ class Trail {
     }
     tags?: string[];
     description?: string;
-    author?: string;
+    author: string;
 
     constructor(name: string,
         params?: {
@@ -70,10 +70,10 @@ class Trail {
         this.location = params?.location;
         this.date = params?.date ?? new Date().toISOString().split('T')[0];
         this.public = params?.public ?? false
-        this.distance = params?.distance;
-        this.elevation_gain = params?.elevation_gain;
-        this.elevation_loss = params?.elevation_loss;
-        this.duration = params?.duration;
+        this.distance = params?.distance ?? 0;
+        this.elevation_gain = params?.elevation_gain ?? 0;
+        this.elevation_loss = params?.elevation_loss ?? 0;
+        this.duration = params?.duration ?? 0;
         this.difficulty = params?.difficulty ?? "easy";
         this.lat = params?.lat;
         this.lon = params?.lon;
@@ -92,6 +92,7 @@ class Trail {
         this.tags = params?.tags ?? []
         this.description = params?.description ?? "";
         this.created = params?.created;
+        this.author = "000000000000000"
     }
 }
 

web/src/lib/models/waypoint.ts

@@ -1,4 +1,3 @@
-import type { Marker } from "maplibre-gl";
 import * as M from "maplibre-gl";
 import { number, object, string } from "yup";
 
@@ -12,7 +11,7 @@ class Waypoint {
     marker?: M.Marker;
     photos: string[];
     _photos?: File[];
-    author?: string;
+    author: string;
 
     constructor(lat: number, lon: number, params?: {
         id?: string, name?: string, description?: string, icon?: string, marker?: M.Marker, photos?: string[];
@@ -26,16 +25,8 @@ class Waypoint {
         this.marker = params?.marker;
         this.photos = params?.photos ?? []
         this._photos = [];
+        this.author = "000000000000000"
     }
 }
 
-const waypointSchema = object<Waypoint>({
-    id: string().optional(),
-    name: string().optional(),
-    description: string().optional(),
-    lat: number().required('Required').typeError('Invalid latitude'),
-    lon: number().required('Required').typeError('Invalid longitude'),
-    icon: string().optional()
-});
-
-export { Waypoint, waypointSchema };
+export { Waypoint };