Revert "CMR-7230 Updating community usage metrics to also include Persistent ID attribute as identifier (#1208)"

This reverts commit d1f858a.

CMR-7230 was marked "Verify Failed" and is being re-worked.

Author: jwteague

search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj

@@ -12,7 +12,6 @@
    [cmr.common.log :as log :refer (debug info warn error)]
    [cmr.common.services.errors :as errors]
    [cmr.common.util :as util]
-   [cmr.search.models.query :as advanced-query]
    [cmr.search.services.community-usage-metrics.metrics-json-schema-validation :as metrics-json]
    [cmr.search.services.humanizers.humanizer-service :as humanizer-service]))
 
@@ -37,7 +36,7 @@
 
 (defn- get-collection-by-product-id
   "Query elastic for a collection with a given product-id, parses out the value before the last : and
-   checks that value against entry-title, short-name, and Persistent ID attribute. Also checks the non-parsed value against
+   checks that value against both entry-title or short-name. Also checks the non-parsed value against
    short-name."
   [context product-id]
   (when (seq product-id)
@@ -46,12 +45,7 @@
                                        (last matches))]
       (let [condition (gc/or (qm/string-condition :entry-title parsed-product-id false false)
                              (qm/string-condition :short-name parsed-product-id false false)
-                             (qm/string-condition :short-name product-id false false)
-                             ;; Handle PODAAC case
-                             (advanced-query/map->AttributeValueCondition
-                              {:name "Persistent ID"
-                               :type :string
-                               :value product-id}))
+                             (qm/string-condition :short-name product-id false false))
             query (qm/query {:concept-type :collection
                              :condition condition
                              :page-size 1

system-int-test/test/cmr/system_int_test/search/collection_relevancy/collection_usage_relevancy_test.clj

@@ -4,7 +4,7 @@
   cmr.system-int-test.search.collection-relevancy.collection-relevancy namespace.
   For all of the tests in this namespace we bin each integer value to its own bin."
   (:require
-   [clojure.string :as string]
+   [clojure.string :as str]
    [clojure.test :refer :all]
    [cmr.access-control.test.util :as u]
    [cmr.common.config :as config]
@@ -22,11 +22,11 @@
    [cmr.system-int-test.utils.search-util :as search]))
 
 (def sample-usage-csv
-  (string/join "\n" ["Product,Version,Hosts"
-                     "AMSR-L1A,3,10"
-                     "AG_VIRTUAL,1,100"
-                     "AG_MAPSS,2,30"
-                     "AST_05,B,8"]))
+  (str "Product,Version,Hosts\n"
+       "AMSR-L1A,3,10\n"
+       "AG_VIRTUAL,1,100\n"
+       "AG_MAPSS,2,30\n"
+       "AST_05,B,8\n"))
 
 (defn- init-community-usage-fixture
   "Sets up the community usage config required for each test."
@@ -234,40 +234,3 @@
   (let [results (:refs (search/find-refs :collection {:keyword "AMSR-L1A"}))]
     (is (= ["AMSR-L1A 003" "AMSR-L1A 2" "AMSR-L1A 1"]
            (map :name results)))))
-
-(deftest sorting-handles-persistent-id-attribute-test
-  (d/ingest-umm-spec-collection "PROV1"
-                                (data-umm-c/collection {:ShortName "ABOM-AUS-RAMSSA_09km"
-                                                        :EntryTitle "PODAAC 1"
-                                                        :AdditionalAttributes
-                                                        [{:Name "Persistent ID"
-                                                          :Value "PODAAC-GHRAM-4FA01"
-                                                          :DataType "STRING"
-                                                          :Description "Dataset Persistent ID"}]
-                                                        :Version "1"}))
-  (d/ingest-umm-spec-collection "PROV1"
-                                (data-umm-c/collection {:ShortName "L4HRfnd-AUS-RAMSSA_09km"
-                                                        :EntryTitle "PODAAC 2"
-                                                        :AdditionalAttributes
-                                                        [{:Name "Persistent ID"
-                                                          :Value "PODAAC-HHRAD-5FB11"
-                                                          :DataType "STRING"
-                                                          :Description "Dataset Persistent ID"}]
-                                                        :Version "1"}))
-
-  (index/wait-until-indexed)
-  (hu/ingest-community-usage-metrics (str "Product,Version,Hosts\n"
-                                          "PODAAC-GHRAM-4FA01,1,10\n"
-                                          "PODAAC-HHRAD-5FB11,1,50\n"))
-  (index/wait-until-indexed)
-  (are3
-   [sort-order expected]
-   (let [results (:refs (search/find-refs :collection {:keyword "PODAAC" :sort-key sort-order}))]
-     (is (= expected
-            (map :name results))))
-
-   "ascending usage"
-   "usage-score" ["PODAAC 1" "PODAAC 2"]
-
-   "descending usage"
-   "-usage-score" ["PODAAC 2" "PODAAC 1"]))