Ensure route-ids

Author: vharmain

webapp/src/cljc/lipas/data/activities.cljc

@@ -614,7 +614,7 @@
                    (mu/dissoc :latest-updates)
                    (mu/dissoc :rules))
                [:map
-                [:id [:string]]
+                [:id {:optional true} [:string]]
                 [:fids {:optional true} fids-schema]
                 [:geometries {:optional true} common-schema/line-string-feature-collection]
                 [:accessibility-categorized {:optional true}
@@ -1058,7 +1058,7 @@
               (mu/merge
                common-route-props-schema
                [:map
-                [:id [:string]]
+                [:id {:optional true} [:string]]
                 [:fids {:optional true} fids-schema]
                 [:geometries {:optional true} common-schema/line-string-feature-collection]
                 [:route-name {:optional true} common-schema/localized-string]
@@ -1442,7 +1442,7 @@
                      (mu/merge
                       common-route-props-schema
                       [:map
-                       [:id [:string]]
+                       [:id {:optional true} [:string]]
                        [:fids {:optional true} fids-schema]
                        [:geometries {:optional true} common-schema/line-string-feature-collection]
                        [:route-name {:optional true} common-schema/localized-string]

webapp/src/cljs/lipas/ui/utils.cljs

@@ -172,12 +172,12 @@
   "Removes nil values and empty entries recursively from maps."
   [m]
   (walk/postwalk
-    (fn [x]
-      (cond
-        (map? x) (not-empty (into {} (filter (comp some? val)) x))
-        (and (coll? x) (empty? x)) nil
-        :else x))
-    m))
+   (fn [x]
+     (cond
+       (map? x) (not-empty (into {} (filter (comp some? val)) x))
+       (and (coll? x) (empty? x)) nil
+       :else x))
+   m))
 
 (defn- make-comparable [rev]
   (-> rev
@@ -268,7 +268,7 @@
       ;; duplicates from :location :geometries and can be dereferenced
       ;; using :fids
       (cond->
-        (:activities sports-site)
+       (:activities sports-site)
         (update :activities (fn [activities]
                               (into (empty activities)
                                     (map (fn [[k v]]
@@ -280,6 +280,23 @@
 
       clean))
 
+(defn- ensure-route-ids
+  "Ensure all routes in activities have an :id field"
+  [activities]
+  (when activities
+    (reduce-kv
+     (fn [acc activity-k activity-v]
+       (if-let [routes (:routes activity-v)]
+         (assoc-in acc [activity-k :routes]
+                   (mapv (fn [route]
+                           (if (:id route)
+                             route
+                             (assoc route :id (str (random-uuid)))))
+                         routes))
+         (assoc acc activity-k activity-v)))
+     {}
+     activities)))
+
 (defn make-editable [sports-site]
   (-> sports-site
 
@@ -301,7 +318,10 @@
       (update-in [:locker-rooms] ->indexed-map)
 
       ;; Audits
-      (update-in [:audits] ->indexed-map)))
+      (update-in [:audits] ->indexed-map)
+
+      ;; Activities routes
+      (update :activities ensure-route-ids)))
 
 ;; TODO used only in legacy energy consumption view
 ;; Should be removed
@@ -354,13 +374,13 @@
 
 (defn ->excel-row [headers m]
   (reduce
-    (fn [res [k _]]
-      (let [v (get m k)]
-        (conj res {:value v
-                   :type  (if (number? v)
-                            "number"
-                            "string")})))
-    [] headers))
+   (fn [res [k _]]
+     (let [v (get m k)]
+       (conj res {:value v
+                  :type  (if (number? v)
+                           "number"
+                           "string")})))
+   [] headers))
 
 (defn ->excel-data [headers coll]
   (let [header-row (->excel-row headers (into {} headers))]
@@ -433,8 +453,8 @@
 (defn link? [x]
   (and (string? x)
        (or
-         (str/starts-with? x "http")
-         (str/starts-with? x "www"))))
+        (str/starts-with? x "http")
+        (str/starts-with? x "www"))))
 
 (defn link-strict? [x]
   (and (string? x) (str/starts-with? x "http")))