CMR-10502 cleanup

Author: daniel-zamora

ingest-app/src/cmr/ingest/api/generic_documents.clj

@@ -204,13 +204,7 @@
   (when concept
     (let [concept-type (:concept-type concept)]
       (when-not (common-concepts/is-draft-concept? concept-type)
-        (try
-          (generic-document-validation/validate-concept context concept)
-          (catch Exception e
-            (errors/throw-service-error
-             :invalid-data
-             (format "While validating the business rules for the record, the following error occurred: [%s]"
-                     (.getMessage e)))))))))
+        (generic-document-validation/validate-concept context concept)))))
 
 (defn ingest-document
   "Ingest the concept into the database and the indexer through the database."

ingest-app/src/cmr/ingest/validation/generic_document_validation.clj

@@ -17,7 +17,7 @@
 
 (def SCHEMA_CACHE_TIME
   "The number of milliseconds schema validation functions will be cached."
-  (* 60 60 1000)) ;; 1 hour
+  (* 24 60 60 1000)) ;; 24 hours
 
 (defn create-schema-validation-cache
   "Creates a cache for schema validation functions."
@@ -52,7 +52,6 @@
 
             ;; Check if any other document in the collection has the same combination of values
             duplicate-concepts (filter (fn [existing-concept]
-                                         ;; Debug print to show values being compared
                                          (and (not= (:native-id existing-concept) (:native-id concept))
                                               (not= (:deleted existing-concept) true)
                                               (= (set (get-field-values existing-concept fields))
@@ -72,7 +71,8 @@
       [])))
 
 (defn- validate-by-type
-  "Validates fields based on validation type.
+  "Validates fields based on validation type. Any new validation added to the config.json
+   should be added here and implemented in the corresponding function.
    Returns a sequence of error messages if validation fails, empty sequence otherwise."
   [context concept validation-type fields validation-value]
   (case validation-type
@@ -98,14 +98,10 @@
   "Loads a single schema validation function for a concept type and version"
   [concept-type version]
   (try
-    (if (generics/approved-generic? concept-type version)
-      (let [schema-json (generics/read-schema-config concept-type version)
-            schema (json/parse-string schema-json true)]
-        (fn [context concept]
-          (validate-with-schema context concept schema)))
-      (do
-        (error "Schema version not approved for" concept-type "version" version)
-        nil))
+    (let [schema-json (generics/read-schema-config concept-type version)
+          schema (json/parse-string schema-json true)]
+      (fn [context concept]
+        (validate-with-schema context concept schema)))
     (catch Exception e
       (error "Error loading schema for" concept-type "version" version ":" (.getMessage e))
       nil)))
@@ -123,12 +119,12 @@
   []
   (info "Loading schema validation functions for all generic concept types")
   (let [generic-types (concepts/get-generic-concept-types-array)
-        validators (reduce (fn [validators concept-type]
+        validators (reduce (fn [vs concept-type]
                              (let [current-version (generics/current-generic-version concept-type)
                                    validator (load-schema-validation concept-type current-version)]
                                (if validator
-                                 (assoc validators [concept-type current-version] validator)
-                                 validators)))
+                                 (assoc vs [concept-type current-version] validator)
+                                 vs)))
                            {}
                            generic-types)]
     (info "Loaded" (count validators) "schema validators")
@@ -148,8 +144,10 @@
    Throws a :bad-request service error if validation fails."
   [context concept]
   (let [concept-type (:concept-type concept)
-        metadata-spec (extract-concept-metadata-spec concept)
-        version (or (:version metadata-spec)
+        version (or (:version (extract-concept-metadata-spec concept))
+                    ;; If version is not specified in metadata, use the current version
+                    ;; of the concept type, though it is likey that the concept failed
+                    ;; schema validation and we never reach this point. 
                     (generics/current-generic-version concept-type))
 
         ;; Get validation functions
@@ -163,4 +161,4 @@
 
     ;; Throw service errors if any validation errors are found
     (when (seq errors)
-      (errors/throw-service-errors :bad-request errors))))
+      (errors/throw-service-errors :invalid-data errors))))

schemas/resources/schemas/config/v0.0.1/schema.json

@@ -34,7 +34,7 @@
                 "additionalProperties": false,
                 "properties": {
                     "Fields": {
-                        "description": "The Field to validate, defined as a jq style path",
+                        "description": "The field to validate, defined as a jq style path",
                         "type": "array",
                         "items": {
                             "type": "string",

system-int-test/test/cmr/system_int_test/search/acls/collection_test.clj

@@ -18,7 +18,7 @@
 (use-fixtures :each (join-fixtures
                       [(ingest/reset-fixture {"provguid1" "PROV1" "provguid2" "PROV2"
                                               "provguid3" "PROV3" "provguid4" "PROV4"}
-                                             {:grant-all-search? true})
+                                             {:grant-all-search? false})
                        (search/freeze-resume-time-fixture)]))
 
 (comment