Fix ftr index codesystem idx valueset update

Co-authored-by: @islambegkatibov <[email protected]>
HealthSamurai · Dec 16, 2022 · d9d5b73 · d9d5b73
1 parent 66630ea
commit d9d5b73
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 6 deletions.
diff --git a/src/ftr/utils/core.clj b/src/ftr/utils/core.clj
@@ -177,6 +177,7 @@
           (recur ks
                  (cond
                    (and (map? v) (map? av)) (assoc acc k (deep-merge av v))
+                   (and (set? v) (set? av)) (assoc acc k (into v av))
                    (and (nil? v) (map? av)) (assoc acc k av)
                    :else (assoc acc k v))))))))
 

diff --git a/src/ftr/zen_package.clj b/src/ftr/zen_package.clj
@@ -181,15 +181,17 @@
     (loop [{:as concept, :keys [code system display]}
            (.readLine tf-reader)
 
-           {:as ftr-index, :keys [codesystems]}
-           ftr-index-with-updated-vss]
+           ftr-index ftr-index-with-updated-vss]
       (if-not (nil? concept)
         (recur
          (.readLine tf-reader)
-         (if (get-in codesystems [system code])
-           (update-in ftr-index [ftr-tag :codesystems system code :valueset] conj vs-url)
-           (assoc-in ftr-index [ftr-tag :codesystems system code] {:display display
-                                                                   :valueset #{vs-url}})))
+         (update-in ftr-index
+                    [ftr-tag :codesystems system code]
+                    (fn [code-idx]
+                      (if (some? code-idx)
+                        (update code-idx :valueset conj vs-url)
+                        {:display  display
+                         :valueset #{vs-url}}))))
         ftr-index))))