Cleaned up rio-loader (#301)

* Cleaned up rio-loader * Renamed string constants * Renamed constants after rebase
SURFnet · May 15, 2024 · b8a50c3 · b8a50c3
1 parent c58d6c0
commit b8a50c3
Show file tree

Hide file tree

Showing 6 changed files with 168 additions and 163 deletions.
diff --git a/src/nl/surf/eduhub_rio_mapper/commands/link.clj b/src/nl/surf/eduhub_rio_mapper/commands/link.clj
@@ -128,7 +128,7 @@
           (case type
             "education-specification" ["aanleveren_opleidingseenheid" "eigenOpleidingseenheidSleutel"]
             ("course" "program")     ["aanleveren_aangebodenOpleiding" "eigenAangebodenOpleidingSleutel"])
-          rio-obj  (rio.loader/rio-finder getter rio-config request)]
+          rio-obj  (rio.loader/rio-finder getter request)]
       (if (nil? rio-obj)
         (throw (ex-info "404 Not Found" {:phase :resolving}))
         (let [rio-obj (xmlclj->duo-hiccup rio-obj)

diff --git a/src/nl/surf/eduhub_rio_mapper/commands/processing.clj b/src/nl/surf/eduhub_rio_mapper/commands/processing.clj
@@ -185,8 +185,8 @@
         output (if (nil? ooapi-summary) diff (assoc diff :opleidingseenheidcode rio-code))]
     (merge output (dry-run-status rio-summary ooapi-summary))))
 
-(defn- course-program-dry-run-handler [ooapi-entity {::ooapi/keys [id] :keys [institution-oin] :as request} {:keys [rio-config ooapi-loader]}]
-  (let [rio-obj     (rio.loader/find-aangebodenopleiding id institution-oin rio-config)
+(defn- course-program-dry-run-handler [ooapi-entity {::ooapi/keys [id] :keys [institution-oin] :as request} {:keys [getter ooapi-loader]}]
+  (let [rio-obj     (rio.loader/find-aangebodenopleiding id getter institution-oin)
         rio-summary (dry-run/summarize-aangebodenopleiding-xml rio-obj)
         offering-summary (->> (ooapi.loader/load-offerings ooapi-loader request)
                               (map dry-run/summarize-offering)