Skip to content

Commit b632323

Browse files
committedJul 30, 2024·
fix: validation for core package
1 parent 0c18866 commit b632323

File tree

1 file changed

+8
-4
lines changed

1 file changed

+8
-4
lines changed
 

‎src/aidbox_sdk/schema/verify.clj

+8-4
Original file line numberDiff line numberDiff line change
@@ -20,19 +20,23 @@
2020
(defn simplify-package-meta [package]
2121
(select-keys package [:name :version]))
2222

23-
2423
;; FIXME: is it reliable to use first element of the list?
2524
;; ! seems like it's not for original packages (without Aidbox processing).
2625
(defn extract-meta-from-package
2726
"Extracts meta information from the package."
2827
[package]
2928
(first package))
3029

30+
(defn core-package? [package]
31+
(or
32+
(= "Core" (:type package))
33+
(= "fhir.core" (:type package))))
34+
3135
(defn find-core-package
3236
"Finds core package in the list of packages.
3337
Throws an exception if there are more then one core package."
3438
[packages]
35-
(let [cores (filter #(= "fhir.core" (:type %)) packages)
39+
(let [cores (filter core-package? packages)
3640
core (first cores)]
3741
(cond
3842
(= (count cores) 0)
@@ -49,7 +53,7 @@
4953
"Finds extra packages in the list of packages.
5054
Throws an exception if there are a few packages with same name."
5155
[packages]
52-
(let [extra (remove #(= "fhir.core" (:type %)) packages)
56+
(let [extra (remove core-package? packages)
5357

5458
duplicates (reduce (fn [duplicates [k v]]
5559
(if (= (count v) 1)
@@ -64,7 +68,7 @@
6468
:else
6569
extra))
6670

67-
(remove #(= "fhir.core" (:type %)) packages))
71+
(remove core-package? packages))
6872

6973
(defn find-core-package-mismatch
7074
"Finds packages which do not support a core package version."

0 commit comments

Comments
 (0)
Please sign in to comment.