Revert "CMR-7185: prune old autocomplete suggestions"

This reverts commit fef2cc0.

Author: jwteague

indexer-app/src/cmr/indexer/data/index_set.clj

@@ -704,8 +704,7 @@
    :fields (m/not-indexed m/string-field-mapping)
    :value m/search-as-you-type-field-mapping
    :contains-public-collections (m/doc-values m/bool-field-mapping)
-   :permitted-group-ids (m/doc-values m/string-field-mapping)
-   :modified (m/doc-values m/date-field-mapping)})
+   :permitted-group-ids (m/doc-values m/string-field-mapping)})
 
 (defmapping variable-mapping :variable
   "Defines the elasticsearch mapping for storing variables. These are the

indexer-app/src/cmr/indexer/services/index_service.clj

@@ -185,7 +185,7 @@
 
 (defn- science-keywords->elastic-docs
   "Convert hierarchical science-keywords to colon-separated elastic docs for indexing"
-  [science-keywords public-collection? permitted-group-ids modified-date]
+  [science-keywords public-collection? permitted-group-ids]
   (let [keyword-hierarchy [:topic :term :variable-level-1
                            :variable-level-2 :variable-level-3 :detailed-variable]
         sk-strings (->> keyword-hierarchy
@@ -202,8 +202,7 @@
      :fields keyword-string
      :_index "1_autocomplete"
      :contains-public-collections public-collection?
-     :permitted-group-ids permitted-group-ids
-     :modified modified-date}))
+     :permitted-group-ids permitted-group-ids}))
 
 (defn- suggestion-doc
   "Creates elasticsearch docs from a given humanized map"
@@ -218,14 +217,9 @@
         permitted-group-ids (->> permissions
                                  (remove #(= "guest" %))
                                  (s/join ",")
-                                 not-empty)
-        modified-date (str (t/now))]
+                                 not-empty)]
     (if (seq (re-find sk-matcher))
-     (science-keywords->elastic-docs
-      value-map
-      public-collection?
-      permitted-group-ids
-      modified-date)
+     (science-keywords->elastic-docs value-map public-collection? permitted-group-ids)
      (map (fn [value]
             (let [v (val value)
                   type (-> key-name
@@ -240,8 +234,7 @@
               :fields v
               :_index "1_autocomplete"
               :contains-public-collections public-collection?
-              :permitted-group-ids permitted-group-ids
-              :modified modified-date}))
+              :permitted-group-ids permitted-group-ids}))
          values))))
 
 (defn- get-suggestion-docs
@@ -326,20 +319,6 @@
                                        flatten)]
     (es/bulk-index-autocomplete-suggestions context latest-suggestion-batches)))
 
-(defn- prune-stale-autocomplete-suggestions
-  "Delete any autocomplete suggestions that were modified longer than a day ago"
-  [context]
-  (info "Pruning autocomplete suggestions")
-  (let [{:keys [index-names]} (idx-set/get-concept-type-index-names context)
-        index (vals (:suggestion index-names))
-        concept-mapping-types (idx-set/get-concept-mapping-types context)
-        mapping-type (concept-mapping-types :collection)]
-    (es/delete-by-query
-     context
-     index
-     mapping-type
-     {:range {(query-field->elastic-field :modified :suggestion) {:lt "now-24h/h"}}})))
-
 (defn reindex-autocomplete-suggestions
   "Reindexes all autocomplete suggestions in the providers given."
   [context]
@@ -349,12 +328,7 @@
         (reindex-autocomplete-suggestions-for-provider context provider-id)
         (catch Exception e (error (format "An error occurred while reindexing autocomplete suggestions in provider [%s] : %s"
                                           provider-id
-                                          (.getMessage e))))))
-    (try
-      (prune-stale-autocomplete-suggestions context)
-      (catch Exception e
-        (error (format "An error occurred while cleaning up autocomplete suggesions %s"
-                       (.getMessage e)))))))
+                                          (.getMessage e))))))))
 
 (defn reindex-provider-collections
   "Reindexes all the collections in the providers given.

system-int-test/test/cmr/system_int_test/search/autocomplete/suggestion_reindex_test.clj

@@ -1,14 +1,12 @@
 (ns cmr.system-int-test.search.autocomplete.suggestion-reindex-test
   "This tests re-indexes autocomplete suggestions."
   (:require
-   [clj-time.core :as time]
    [clojure.test :refer :all]
    [cmr.common.util :as util :refer [are3]]
    [cmr.mock-echo.client.echo-util :as e]
    [cmr.system-int-test.data2.collection :as dc]
    [cmr.system-int-test.data2.core :as d]
    [cmr.system-int-test.data2.umm-spec-collection :as data-umm-spec]
-   [cmr.system-int-test.utils.dev-system-util :as dev-sys-util]
    [cmr.system-int-test.data2.umm-spec-common :as umm-spec-common]
    [cmr.system-int-test.search.facets.facets-util :as fu]
    [cmr.system-int-test.system :as s]
@@ -234,33 +232,3 @@
 
       "does not filter 'not' prefixed values"
       "not" [{:value "Nothofagus" :type "science_keywords" :fields "Biosphere:Nothofagus"}])))
-
-(deftest prune-stale-data-test
-  (testing "The suggestions from these old collections shouldn't be found"
-    (are3
-     [query expected]
-     (let [_ (dev-sys-util/freeze-time! "2020-01-01T10:00:00Z")
-           coll7 (d/ingest-umm-spec-collection
-                   "PROV1"
-                   (data-umm-spec/collection
-                    {:ShortName "This one is old and should be cleaned up"
-                     :EntryTitle "Oldie"
-                     :Projects (:Projects (fu/projects "OLD"))
-                     :Platforms (:Platforms (fu/platforms "STALE" 2 2 1))}))
-
-           _ (dev-sys-util/freeze-time! (time/yesterday))
-           coll8 (d/ingest-umm-spec-collection
-                   "PROV2"
-                   (data-umm-spec/collection
-                    {:ShortName "Yesterday's news"
-                     :EntryTitle "Also an Oldie"
-                     :Platforms (:Platforms (fu/platforms "old AND stale" 2 1 1))}))
-           _(index/wait-until-indexed)
-           _ (dev-sys-util/clear-current-time!)
-           results (get-in (search/get-autocomplete-json (str "q=" query)) [:feed :entry])]
-       (compare-autocomplete-results results expected))
-     "None found"
-     "stale" []
-     
-     "Still none found"
-     "old" [])))