From cc903edc4f42937289b10a21eb93fbffa8387057 Mon Sep 17 00:00:00 2001 From: jmaeng72 <44305062+jmaeng72@users.noreply.github.com> Date: Thu, 25 Jul 2024 09:56:54 -0400 Subject: [PATCH 1/5] saving place --- search-app/src/cmr/search/services/acls/subscription_acls.clj | 1 - search-app/src/cmr/search/services/association_service.clj | 4 ++-- .../src/cmr/search/services/generic_association_service.clj | 2 +- .../search/services/humanizers/humanizer_report_service.clj | 2 +- search-app/src/cmr/search/services/parameters/conversion.clj | 1 - .../cmr/search/services/parameters/converters/geometry.clj | 3 +-- .../cmr/search/services/parameters/converters/shapefile.clj | 4 ++-- .../src/cmr/search/services/parameters/converters/spatial.clj | 2 +- .../query_execution/granule_counts_results_feature.clj | 1 - .../query_execution/has_granules_created_at_feature.clj | 1 - .../query_execution/has_granules_revised_at_feature.clj | 1 - .../query_walkers/collection_concept_id_extractor.clj | 4 +--- .../cmr/search/services/query_walkers/condition_extractor.clj | 2 -- .../cmr/search/services/tagging/json_schema_validation.clj | 4 +--- 14 files changed, 10 insertions(+), 22 deletions(-) diff --git a/search-app/src/cmr/search/services/acls/subscription_acls.clj b/search-app/src/cmr/search/services/acls/subscription_acls.clj index 64777aa6d3..5983c590b5 100644 --- a/search-app/src/cmr/search/services/acls/subscription_acls.clj +++ b/search-app/src/cmr/search/services/acls/subscription_acls.clj @@ -5,7 +5,6 @@ [cmr.elastic-utils.search.query-execution :as qe] [cmr.common.services.search.query-model :as qm] [cmr.common.api.context :as context-util] - [cmr.common.util :as util] [cmr.search.services.acls.acl-helper :as acl-helper] [cmr.transmit.config :as tc])) diff --git a/search-app/src/cmr/search/services/association_service.clj b/search-app/src/cmr/search/services/association_service.clj index 0c4447b4a1..61b1a68e5f 100644 --- a/search-app/src/cmr/search/services/association_service.clj +++ b/search-app/src/cmr/search/services/association_service.clj @@ -5,7 +5,7 @@ (:require [clojure.string :as string] [cmr.common.api.context :as cmn-context] - [cmr.common.log :as log :refer (debug info)] + [cmr.common.log :refer (debug info)] [cmr.common.mime-types :as mt] [cmr.common.services.errors :as errors] [cmr.common.util :as util] @@ -162,7 +162,7 @@ :source-concept-type concept-type}) operation)) associations))] - (info "update-associations:" t1) + (info "update-associations:" t1) ;;TODO is this required? or needed? result)) (defn- fetch-concept diff --git a/search-app/src/cmr/search/services/generic_association_service.clj b/search-app/src/cmr/search/services/generic_association_service.clj index 8493814fb0..6371b552a2 100644 --- a/search-app/src/cmr/search/services/generic_association_service.clj +++ b/search-app/src/cmr/search/services/generic_association_service.clj @@ -195,7 +195,7 @@ :source-revision-id revision-id}) operation)) associations))] - (info "update-generic-associations:" t1) + (info "update-generic-associations:" t1) ;; TODO is this required? result)) (defn- link-to-concepts diff --git a/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj b/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj index 174442b53a..5bc4d54db5 100644 --- a/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj +++ b/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj @@ -86,7 +86,7 @@ (if-let [vec-concept-ids (metadata-cache/get-collection-metadata-cache-concept-ids context)] vec-concept-ids (when (> retries 0) - (info (format (str "Failed reading %s for the humanizer report. " + (warn (format (str "Failed reading %s for the humanizer report. " "Humanizer report generator job is sleeping for %d second(s)" " before retrying to fetch from collection cache.") cmn-coll-metadata-cache/cache-key diff --git a/search-app/src/cmr/search/services/parameters/conversion.clj b/search-app/src/cmr/search/services/parameters/conversion.clj index 4e3d80053a..6c973023b2 100644 --- a/search-app/src/cmr/search/services/parameters/conversion.clj +++ b/search-app/src/cmr/search/services/parameters/conversion.clj @@ -9,7 +9,6 @@ [cmr.common.services.search.query-model :as cqm] [cmr.common.concepts :as cc] [cmr.common.date-time-parser :as parser] - [cmr.common.services.errors :as errors] [cmr.common.util :as util] [cmr.search.models.query :as qm] [cmr.search.services.parameters.legacy-parameters :as lp])) diff --git a/search-app/src/cmr/search/services/parameters/converters/geometry.clj b/search-app/src/cmr/search/services/parameters/converters/geometry.clj index faf16fde4a..b7a5d0224c 100644 --- a/search-app/src/cmr/search/services/parameters/converters/geometry.clj +++ b/search-app/src/cmr/search/services/parameters/converters/geometry.clj @@ -6,8 +6,7 @@ [cmr.spatial.polygon :as poly] [cmr.spatial.point :as point] [cmr.spatial.line-string :as l] - [cmr.spatial.ring-relations :as rr] - [clojure.math.numeric-tower :as math]) + [cmr.spatial.ring-relations :as rr]) (:import (java.io BufferedReader File FileReader FileOutputStream FileInputStream) (java.nio.file Files) diff --git a/search-app/src/cmr/search/services/parameters/converters/shapefile.clj b/search-app/src/cmr/search/services/parameters/converters/shapefile.clj index a27f01aae5..09511f34ee 100644 --- a/search-app/src/cmr/search/services/parameters/converters/shapefile.clj +++ b/search-app/src/cmr/search/services/parameters/converters/shapefile.clj @@ -2,8 +2,8 @@ "Contains parameter converters for shapefile parameter" (:require [clojure.java.io :as io] - [cmr.common.config :as cfg :refer [defconfig]] - [cmr.common.log :refer [debug info]] + [cmr.common.config :refer [defconfig]] + [cmr.common.log :refer [debug]] [cmr.common.mime-types :as mt] [cmr.common.util :as util] [cmr.elastic-utils.search.es-group-query-conditions :as gc] diff --git a/search-app/src/cmr/search/services/parameters/converters/spatial.clj b/search-app/src/cmr/search/services/parameters/converters/spatial.clj index 5a7c88cbea..c1a1adb224 100644 --- a/search-app/src/cmr/search/services/parameters/converters/spatial.clj +++ b/search-app/src/cmr/search/services/parameters/converters/spatial.clj @@ -4,7 +4,7 @@ [clojure.string :as string] [cmr.elastic-utils.search.es-group-query-conditions :as gc] [cmr.elastic-utils.search.es-params-converter :as p] - [cmr.common.config :as cfg :refer [defconfig]] + [cmr.common.config :refer [defconfig]] [cmr.common.services.errors :as errors] [cmr.search.models.query :as qm] [cmr.spatial.circle :as spatial-circle] diff --git a/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj b/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj index b3b9a84d4b..b1ab5be764 100644 --- a/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj +++ b/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj @@ -10,7 +10,6 @@ [cmr.common.services.search.query-model :as q] [cmr.elastic-utils.search.es-query-to-elastic :as q2e] [cmr.common.services.errors :as errors] - [cmr.search.models.query :as qm] [cmr.search.services.query-walkers.condition-extractor :as condition-extractor]) (:import [cmr.common.services.search.query_model Query diff --git a/search-app/src/cmr/search/services/query_execution/has_granules_created_at_feature.clj b/search-app/src/cmr/search/services/query_execution/has_granules_created_at_feature.clj index ae4e7d6cc0..e885408582 100644 --- a/search-app/src/cmr/search/services/query_execution/has_granules_created_at_feature.clj +++ b/search-app/src/cmr/search/services/query_execution/has_granules_created_at_feature.clj @@ -11,7 +11,6 @@ has_granules_created_at time ranges. 3.) Return the full search results for those collection-ids returned by the granule query." (:require - [clojure.set :as set] [cmr.elastic-utils.search.query-execution :as query-execution] [cmr.search.services.query-execution.multi-part-query-feature-common :as mp-query-common])) diff --git a/search-app/src/cmr/search/services/query_execution/has_granules_revised_at_feature.clj b/search-app/src/cmr/search/services/query_execution/has_granules_revised_at_feature.clj index 35c283b44d..f2616828bc 100644 --- a/search-app/src/cmr/search/services/query_execution/has_granules_revised_at_feature.clj +++ b/search-app/src/cmr/search/services/query_execution/has_granules_revised_at_feature.clj @@ -6,7 +6,6 @@ This works exactly the same as the has_granules_created_at feature, but uses a different parameter to search for relevant granules." (:require - [clojure.set :as set] [cmr.elastic-utils.search.query-execution :as query-execution] [cmr.search.services.query-execution.multi-part-query-feature-common :as mp-query-common])) diff --git a/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj b/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj index 312d1fb1dc..b64819d213 100644 --- a/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj +++ b/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj @@ -1,8 +1,6 @@ (ns cmr.search.services.query-walkers.collection-concept-id-extractor "Defines protocols and functions to extract collection concept ids from the query constructs" - (:require [cmr.common.services.errors :as errors] - [cmr.common.services.search.query-model :as cqm] - [cmr.search.models.query :as qm])) + (:require [cmr.common.services.errors :as errors])) (defprotocol ExtractCollectionConceptId "Defines a function to extract collection concept ids" diff --git a/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj b/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj index ad5b2ad134..70f2193d9a 100644 --- a/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj +++ b/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj @@ -1,7 +1,5 @@ (ns cmr.search.services.query-walkers.condition-extractor "Defines protocols and functions to extract conditions." - (:require [cmr.common.services.search.query-model :as cqm] - [cmr.search.models.query :as qm]) (:import [cmr.common.services.search.query_model Query ConditionGroup diff --git a/search-app/src/cmr/search/services/tagging/json_schema_validation.clj b/search-app/src/cmr/search/services/tagging/json_schema_validation.clj index 497a5aa35d..e8a0b37e55 100644 --- a/search-app/src/cmr/search/services/tagging/json_schema_validation.clj +++ b/search-app/src/cmr/search/services/tagging/json_schema_validation.clj @@ -1,8 +1,6 @@ (ns cmr.search.services.tagging.json-schema-validation "This contains JSON schema validations related to the tagging service" - (:require [cmr.common.validations.json-schema :as js] - [cheshire.core :as json] - [cmr.common.services.errors :as errors])) + (:require [cmr.common.validations.json-schema :as js])) (def ^:private base-tag-schema-structure "Base Schema for tags as json." From 467dab769613e3d2991bde6b8803618c48636b0d Mon Sep 17 00:00:00 2001 From: jmaeng72 <44305062+jmaeng72@users.noreply.github.com> Date: Mon, 29 Jul 2024 16:59:37 -0400 Subject: [PATCH 2/5] changed info to debug --- search-app/src/cmr/search/services/association_service.clj | 2 +- .../services/community_usage_metrics/metrics_service.clj | 2 +- .../src/cmr/search/services/generic_association_service.clj | 2 +- .../services/humanizers/humanizer_range_facet_service.clj | 2 +- .../search/services/humanizers/humanizer_report_service.clj | 2 +- search-app/src/cmr/search/services/result_format_helper.clj | 4 +--- search-app/src/cmr/search/services/tagging_service.clj | 6 +++--- search-app/src/cmr/search/services/url_helper.clj | 1 - 8 files changed, 9 insertions(+), 12 deletions(-) diff --git a/search-app/src/cmr/search/services/association_service.clj b/search-app/src/cmr/search/services/association_service.clj index 61b1a68e5f..605c45768b 100644 --- a/search-app/src/cmr/search/services/association_service.clj +++ b/search-app/src/cmr/search/services/association_service.clj @@ -162,7 +162,7 @@ :source-concept-type concept-type}) operation)) associations))] - (info "update-associations:" t1) ;;TODO is this required? or needed? + (debug "update-associations:" t1) result)) (defn- fetch-concept diff --git a/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj b/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj index 70b6d3ac7a..48dc207995 100644 --- a/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj +++ b/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj @@ -9,7 +9,7 @@ [cmr.elastic-utils.search.es-group-query-conditions :as gc] [cmr.elastic-utils.search.query-execution :as qe] [cmr.common.services.search.query-model :as qm] - [cmr.common.log :as log :refer (debug info warn error)] + [cmr.common.log :refer (warn)] [cmr.common.services.errors :as errors] [cmr.common.util :as util] [cmr.search.services.community-usage-metrics.metrics-json-schema-validation :as metrics-json] diff --git a/search-app/src/cmr/search/services/generic_association_service.clj b/search-app/src/cmr/search/services/generic_association_service.clj index 6371b552a2..2928559425 100644 --- a/search-app/src/cmr/search/services/generic_association_service.clj +++ b/search-app/src/cmr/search/services/generic_association_service.clj @@ -195,7 +195,7 @@ :source-revision-id revision-id}) operation)) associations))] - (info "update-generic-associations:" t1) ;; TODO is this required? + (debug "update-generic-associations:" t1) result)) (defn- link-to-concepts diff --git a/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj b/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj index 243c7d4abe..34d198eeab 100644 --- a/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj +++ b/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj @@ -6,7 +6,7 @@ [cmr.common.cache :as cache] [cmr.common.cache.fallback-cache :as fallback-cache] [cmr.common.cache.single-thread-lookup-cache :as stl-cache] - [cmr.common.log :as log :refer [warn]] + [cmr.common.log :refer [warn]] [cmr.redis-utils.config :as redis-config] [cmr.redis-utils.redis-cache :as redis-cache] [cmr.search.services.humanizers.humanizer-messages :as msg] diff --git a/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj b/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj index 5bc4d54db5..4610a01a19 100644 --- a/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj +++ b/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj @@ -9,7 +9,7 @@ [cmr.common.concepts :as concepts] [cmr.common.config :refer [defconfig]] [cmr.common.jobs :refer [defjob default-job-start-delay]] - [cmr.common.log :as log :refer [info warn error]] + [cmr.common.log :refer [info warn error]] [cmr.common.redis-log-util :as rl-util] [cmr.common.util :as util] [cmr.search.data.metadata-retrieval.metadata-cache :as metadata-cache] diff --git a/search-app/src/cmr/search/services/result_format_helper.clj b/search-app/src/cmr/search/services/result_format_helper.clj index 4d3e43d54b..c54d724e25 100644 --- a/search-app/src/cmr/search/services/result_format_helper.clj +++ b/search-app/src/cmr/search/services/result_format_helper.clj @@ -1,8 +1,6 @@ (ns cmr.search.services.result-format-helper "Defines helper functions to support result format. Result format is either a keyword or a map in - the format of {:format umm-json :version \"1.3\"}. Currently, only umm json has version support." - (:require [cmr.common.mime-types :as mt] - [cmr.umm-spec.versioning :as ver])) + the format of {:format umm-json :version \"1.3\"}. Currently, only umm json has version support.") (defn printable-result-format "Returns the given result format in a printable format" diff --git a/search-app/src/cmr/search/services/tagging_service.clj b/search-app/src/cmr/search/services/tagging_service.clj index f4cf48d235..855d1738c8 100644 --- a/search-app/src/cmr/search/services/tagging_service.clj +++ b/search-app/src/cmr/search/services/tagging_service.clj @@ -5,7 +5,7 @@ [clojure.edn :as edn] [cmr.elastic-utils.search.query-execution :as qe] [cmr.common.api.context :as context-util] - [cmr.common.log :as log :refer [debug info]] + [cmr.common.log :refer [debug info]] [cmr.common.mime-types :as mt] [cmr.common.services.errors :as errors] [cmr.common.util :as util] @@ -50,7 +50,7 @@ "Creates the tag saving it as a revision in metadata db. Returns the concept id and revision id of the saved tag." [context tag-json-str] - (info (format "Creating tag [%s]" tag-json-str)) + (debug (format "Creating tag [%s]" tag-json-str)) (let [user-id (context-util/context->user-id context msg/token-required-for-tag-modification) @@ -254,7 +254,7 @@ :originator-id originator-id}) operation)) tag-associations))] - (info "update-tag-associations:" t1) + (debug "update-tag-associations:" t1) result)) (defn- update-tag-associations-with-query diff --git a/search-app/src/cmr/search/services/url_helper.clj b/search-app/src/cmr/search/services/url_helper.clj index ed1705da4e..68ac4dc052 100644 --- a/search-app/src/cmr/search/services/url_helper.clj +++ b/search-app/src/cmr/search/services/url_helper.clj @@ -1,7 +1,6 @@ (ns cmr.search.services.url-helper "Defines functions to construct search urls" (:require - [cmr.common.config :as cfg] [cmr.transmit.config :as tconfig])) (defn search-root From afd33b8dd45710e23397b7a062bd35f45b87aa50 Mon Sep 17 00:00:00 2001 From: jmaeng72 <44305062+jmaeng72@users.noreply.github.com> Date: Tue, 30 Jul 2024 12:25:32 -0400 Subject: [PATCH 3/5] remove params in log search result metadata --- search-app/src/cmr/search/services/association_service.clj | 2 +- .../services/community_usage_metrics/metrics_service.clj | 2 +- .../services/humanizers/humanizer_range_facet_service.clj | 2 +- .../search/services/humanizers/humanizer_report_service.clj | 4 ++-- search-app/src/cmr/search/services/query_service.clj | 6 +++--- search-app/src/cmr/search/services/tagging_service.clj | 2 +- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/search-app/src/cmr/search/services/association_service.clj b/search-app/src/cmr/search/services/association_service.clj index 605c45768b..b5acea64cc 100644 --- a/search-app/src/cmr/search/services/association_service.clj +++ b/search-app/src/cmr/search/services/association_service.clj @@ -5,7 +5,7 @@ (:require [clojure.string :as string] [cmr.common.api.context :as cmn-context] - [cmr.common.log :refer (debug info)] + [cmr.common.log :as log :refer (debug info)] [cmr.common.mime-types :as mt] [cmr.common.services.errors :as errors] [cmr.common.util :as util] diff --git a/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj b/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj index 48dc207995..70b6d3ac7a 100644 --- a/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj +++ b/search-app/src/cmr/search/services/community_usage_metrics/metrics_service.clj @@ -9,7 +9,7 @@ [cmr.elastic-utils.search.es-group-query-conditions :as gc] [cmr.elastic-utils.search.query-execution :as qe] [cmr.common.services.search.query-model :as qm] - [cmr.common.log :refer (warn)] + [cmr.common.log :as log :refer (debug info warn error)] [cmr.common.services.errors :as errors] [cmr.common.util :as util] [cmr.search.services.community-usage-metrics.metrics-json-schema-validation :as metrics-json] diff --git a/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj b/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj index 34d198eeab..243c7d4abe 100644 --- a/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj +++ b/search-app/src/cmr/search/services/humanizers/humanizer_range_facet_service.clj @@ -6,7 +6,7 @@ [cmr.common.cache :as cache] [cmr.common.cache.fallback-cache :as fallback-cache] [cmr.common.cache.single-thread-lookup-cache :as stl-cache] - [cmr.common.log :refer [warn]] + [cmr.common.log :as log :refer [warn]] [cmr.redis-utils.config :as redis-config] [cmr.redis-utils.redis-cache :as redis-cache] [cmr.search.services.humanizers.humanizer-messages :as msg] diff --git a/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj b/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj index 4610a01a19..174442b53a 100644 --- a/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj +++ b/search-app/src/cmr/search/services/humanizers/humanizer_report_service.clj @@ -9,7 +9,7 @@ [cmr.common.concepts :as concepts] [cmr.common.config :refer [defconfig]] [cmr.common.jobs :refer [defjob default-job-start-delay]] - [cmr.common.log :refer [info warn error]] + [cmr.common.log :as log :refer [info warn error]] [cmr.common.redis-log-util :as rl-util] [cmr.common.util :as util] [cmr.search.data.metadata-retrieval.metadata-cache :as metadata-cache] @@ -86,7 +86,7 @@ (if-let [vec-concept-ids (metadata-cache/get-collection-metadata-cache-concept-ids context)] vec-concept-ids (when (> retries 0) - (warn (format (str "Failed reading %s for the humanizer report. " + (info (format (str "Failed reading %s for the humanizer report. " "Humanizer report generator job is sleeping for %d second(s)" " before retrying to fetch from collection cache.") cmn-coll-metadata-cache/cache-key diff --git a/search-app/src/cmr/search/services/query_service.clj b/search-app/src/cmr/search/services/query_service.clj index 1b16eea869..026e99a49a 100644 --- a/search-app/src/cmr/search/services/query_service.clj +++ b/search-app/src/cmr/search/services/query_service.clj @@ -211,7 +211,7 @@ result-format (rfh/printable-result-format (:result-format query)) log-message (log-search-result-metadata (:hits results) (name concept-type) total-took (:client-id context) (:token context) result-format - "with params %s" (pr-str params))] + "" nil)] (info (cond scroll-id (format "%s, scroll-id: %s." log-message (str (hash scroll-id))) search-after (format "%s, search-after: %s, new search-after: %s." @@ -485,7 +485,7 @@ pr-result-format (rfh/printable-result-format result-format) log-message (log-search-result-metadata hits "deleted collections" total-took (:client-id context) (:token context) pr-result-format - "with params %s" (pr-str params))] + "" nil)] (info log-message) {:results results-str :hits hits @@ -530,7 +530,7 @@ pr-result-format (rfh/printable-result-format result-format) log-message (log-search-result-metadata (:hits results) "deleted granules" total-took (:client-id context) (:token context) pr-result-format - "with params %s" (pr-str params))] + "" nil)] (info log-message) {:results results-str :hits hits diff --git a/search-app/src/cmr/search/services/tagging_service.clj b/search-app/src/cmr/search/services/tagging_service.clj index 855d1738c8..1a87a41e11 100644 --- a/search-app/src/cmr/search/services/tagging_service.clj +++ b/search-app/src/cmr/search/services/tagging_service.clj @@ -5,7 +5,7 @@ [clojure.edn :as edn] [cmr.elastic-utils.search.query-execution :as qe] [cmr.common.api.context :as context-util] - [cmr.common.log :refer [debug info]] + [cmr.common.log :as log :refer [debug info]] [cmr.common.mime-types :as mt] [cmr.common.services.errors :as errors] [cmr.common.util :as util] From 8a8879f47642158055e620155cb9e0db346d3ae5 Mon Sep 17 00:00:00 2001 From: jmaeng72 <44305062+jmaeng72@users.noreply.github.com> Date: Tue, 30 Jul 2024 12:50:05 -0400 Subject: [PATCH 4/5] add the requires back in --- .../query_execution/granule_counts_results_feature.clj | 1 + .../query_walkers/collection_concept_id_extractor.clj | 4 +++- .../cmr/search/services/query_walkers/condition_extractor.clj | 2 ++ 3 files changed, 6 insertions(+), 1 deletion(-) diff --git a/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj b/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj index b1ab5be764..b3b9a84d4b 100644 --- a/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj +++ b/search-app/src/cmr/search/services/query_execution/granule_counts_results_feature.clj @@ -10,6 +10,7 @@ [cmr.common.services.search.query-model :as q] [cmr.elastic-utils.search.es-query-to-elastic :as q2e] [cmr.common.services.errors :as errors] + [cmr.search.models.query :as qm] [cmr.search.services.query-walkers.condition-extractor :as condition-extractor]) (:import [cmr.common.services.search.query_model Query diff --git a/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj b/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj index b64819d213..312d1fb1dc 100644 --- a/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj +++ b/search-app/src/cmr/search/services/query_walkers/collection_concept_id_extractor.clj @@ -1,6 +1,8 @@ (ns cmr.search.services.query-walkers.collection-concept-id-extractor "Defines protocols and functions to extract collection concept ids from the query constructs" - (:require [cmr.common.services.errors :as errors])) + (:require [cmr.common.services.errors :as errors] + [cmr.common.services.search.query-model :as cqm] + [cmr.search.models.query :as qm])) (defprotocol ExtractCollectionConceptId "Defines a function to extract collection concept ids" diff --git a/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj b/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj index 70f2193d9a..ad5b2ad134 100644 --- a/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj +++ b/search-app/src/cmr/search/services/query_walkers/condition_extractor.clj @@ -1,5 +1,7 @@ (ns cmr.search.services.query-walkers.condition-extractor "Defines protocols and functions to extract conditions." + (:require [cmr.common.services.search.query-model :as cqm] + [cmr.search.models.query :as qm]) (:import [cmr.common.services.search.query_model Query ConditionGroup From fa2ed7f97e37a7ba342fa634ab61a01e0802673d Mon Sep 17 00:00:00 2001 From: jmaeng72 <44305062+jmaeng72@users.noreply.github.com> Date: Wed, 31 Jul 2024 10:31:06 -0400 Subject: [PATCH 5/5] rollback removing params change --- search-app/src/cmr/search/services/query_service.clj | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/search-app/src/cmr/search/services/query_service.clj b/search-app/src/cmr/search/services/query_service.clj index 026e99a49a..1b16eea869 100644 --- a/search-app/src/cmr/search/services/query_service.clj +++ b/search-app/src/cmr/search/services/query_service.clj @@ -211,7 +211,7 @@ result-format (rfh/printable-result-format (:result-format query)) log-message (log-search-result-metadata (:hits results) (name concept-type) total-took (:client-id context) (:token context) result-format - "" nil)] + "with params %s" (pr-str params))] (info (cond scroll-id (format "%s, scroll-id: %s." log-message (str (hash scroll-id))) search-after (format "%s, search-after: %s, new search-after: %s." @@ -485,7 +485,7 @@ pr-result-format (rfh/printable-result-format result-format) log-message (log-search-result-metadata hits "deleted collections" total-took (:client-id context) (:token context) pr-result-format - "" nil)] + "with params %s" (pr-str params))] (info log-message) {:results results-str :hits hits @@ -530,7 +530,7 @@ pr-result-format (rfh/printable-result-format result-format) log-message (log-search-result-metadata (:hits results) "deleted granules" total-took (:client-id context) (:token context) pr-result-format - "" nil)] + "with params %s" (pr-str params))] (info log-message) {:results results-str :hits hits