Only validate ooapi fields passed on to rio (#313)

SURFnet · Jun 25, 2024 · 09567f5 · 09567f5
1 parent 6d0003a
commit 09567f5
Show file tree

Hide file tree

Showing 2 changed files with 0 additions and 31 deletions.
diff --git a/src/nl/surf/eduhub_rio_mapper/specs/common.clj b/src/nl/surf/eduhub_rio_mapper/specs/common.clj
@@ -20,7 +20,6 @@
   "Common specs for use in the ooapi namespaces."
   (:require [clojure.spec.alpha :as s]
             [nl.surf.eduhub-rio-mapper.ooapi.common.LongLanguageTypedString :as-alias LongLanguageTypedString]
-            [nl.surf.eduhub-rio-mapper.ooapi.common.UnlimitedLanguageTypedString :as-alias UnlimitedLanguageTypedString]
             [nl.surf.eduhub-rio-mapper.ooapi.enums :as enums]
             [nl.surf.eduhub-rio-mapper.ooapi.LanguageTypedString :as-alias LanguageTypedString]
             [nl.surf.eduhub-rio-mapper.ooapi.LanguageTypedStringEN :as-alias LanguageTypedStringEN]
@@ -122,20 +121,6 @@
 (s/def ::LongLanguageTypedStrings
   (s/coll-of ::LongLanguageTypedString))
 
-(s/def ::UnlimitedLanguageTypedString/language
-  (re-spec #"^[a-z]{2,4}(-[A-Z][a-z]{3})?(-([A-Z]{2}|[0-9]{3}))?$"))
-
-(s/def ::UnlimitedLanguageTypedString/value
-  string?)
-
-(s/def ::UnlimitedLanguageTypedString
-  (s/keys :req-un [::UnlimitedLanguageTypedString/language
-                   ::UnlimitedLanguageTypedString/value]))
-
-;; A collection of language typed strings with any set of languages
-(s/def ::UnlimitedLanguageTypedStrings
-  (s/coll-of ::UnlimitedLanguageTypedString))
-
 ;; A collection of language typed strings with at least one dutch or
 ;; english entry
 (s/def ::nlOrEnLanguageTypedStrings

diff --git a/src/nl/surf/eduhub_rio_mapper/specs/program.clj b/src/nl/surf/eduhub_rio_mapper/specs/program.clj
@@ -26,16 +26,12 @@
   (text-spec 1 40))
 
 (s/def ::acceleratedRoute enums/acceleratedRoute)
-(s/def ::admissionRequirements ::common/UnlimitedLanguageTypedStrings)
-(s/def ::assessment ::common/LanguageTypedStrings)
 (s/def ::children (s/coll-of ::common/uuid))
 (s/def ::consentParticipationSTAP enums/consentParticipationSTAP)
-(s/def ::coordinators (s/coll-of string?))
 (s/def ::deficiency enums/deficiency)
 (s/def ::description ::common/LongLanguageTypedStrings)
 (s/def ::educationLocationCode string?)
 (s/def ::educationSpecification ::common/uuid)
-(s/def ::enrollment ::common/LanguageTypedStrings)
 (s/def ::firstStartDate ::common/date)
 (s/def ::foreignPartner string?)
 (s/def ::foreignPartners (s/coll-of ::foreignPartner))
@@ -44,16 +40,12 @@
 (s/def ::link string?)
 (s/def ::modeOfStudy enums/modeOfStudy)
 (s/def ::name ::common/LanguageTypedStrings)
-(s/def ::organization string?)
 (s/def ::parent string?)
 (s/def ::primaryCode ::common/codeTuple)
 (s/def ::programId ::common/uuid)
 (s/def ::programType enums/programType)
 (s/def ::propaedeuticPhase enums/propaedeuticPhase)
-(s/def ::qualificationAwarded string?)
-(s/def ::qualificationRequirements ::common/LanguageTypedStrings)
 (s/def ::requirementsActivities enums/requirementsActivities)
-(s/def ::resources (s/coll-of string?))
 (s/def ::studyChoiceCheck enums/studyChoiceCheck)
 (s/def ::teachingLanguage (re-spec #"[a-z]{3}"))
 (s/def ::validFrom ::common/date)
@@ -94,20 +86,12 @@
                    ::name
                    ::validFrom]
           :opt-un [::abbreviation
-                   ::admissionRequirements
-                   ::assessment
                    ::children
-                   ::coordinators
                    ::description
                    ::common/duration
-                   ::enrollment
                    ::link
                    ::modeOfStudy
-                   ::organization
                    ::parent
-                   ::qualificationAwarded
-                   ::qualificationRequirements
-                   ::resources
                    ::teachingLanguage
                    ::common/addresses
                    ::common/fieldsOfStudy