쿼리복잡도 초과시 errors 대신 extensions.warnings 로 리졸빙되도록 수정 (#15)

* complexity errors to extensions.warnings * some fix * fix test * remove prn * apply review * indent
green-labs · Aug 23, 2024 · e297fe6 · e297fe6
1 parent c360d04
commit e297fe6
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 16 deletions.
diff --git a/src/com/walmartlabs/lacinia.clj b/src/com/walmartlabs/lacinia.clj
@@ -58,17 +58,13 @@
 
     (seq validation-errors)
     (resolve/resolve-as {:errors validation-errors})
-
-    :let [complexity-error (when (:max-complexity options)
-                             (complexity-analysis/complexity-analysis prepared options))]
 
-    (some? complexity-error)
-    (resolve/resolve-as {:errors complexity-error})
-
-    :else
-    (executor/execute-query (assoc context constants/parsed-query-key prepared
-                                   ::tracing/validation {:start-offset start-offset
-                                                         :duration (tracing/duration start-nanos)})))))
+    :else (let [complexity-warning (when (:max-complexity options)
+                                     (complexity-analysis/complexity-analysis prepared options))]
+           (executor/execute-query (assoc context constants/parsed-query-key prepared
+                                          :complexity-warning complexity-warning
+                                          ::tracing/validation {:start-offset start-offset
+                                                                :duration (tracing/duration start-nanos)}))))))
 
 (defn execute-parsed-query
   "Prepares a query, by applying query variables to it, resulting in a prepared

diff --git a/src/com/walmartlabs/lacinia/executor.clj b/src/com/walmartlabs/lacinia/executor.clj
@@ -379,11 +379,14 @@
   (let [parsed-query (get context constants/parsed-query-key)
         {:keys [selections operation-type ::tracing/timing-start]} parsed-query
         schema (get parsed-query constants/schema-key)
-        ^Executor executor (::schema/executor schema)]
+        ^Executor executor (::schema/executor schema)
+        complexity-warning (:complexity-warning context)]
     (binding [resolve/*callback-executor* executor]
       (let [enabled-selections (remove :disabled? selections)
             *errors (atom [])
-            *warnings (atom [])
+            *warnings (if complexity-warning
+                        (atom [complexity-warning])
+                        (atom []))
             *extensions (atom {})
             *resolver-tracing (when (::tracing/enabled? context)
                                 (atom []))

diff --git a/test/com/walmartlabs/lacinia/complexity_analysis_test.clj b/test/com/walmartlabs/lacinia/complexity_analysis_test.clj
@@ -41,8 +41,7 @@
 
 (defn ^:private resolve-node
   [_ _ _]
-  {:edges []
-   :pageInfo {}})
+  nil)
 
 (def ^:private schema
   (utils/compile-schema "complexity-analysis-error.edn"
@@ -58,7 +57,8 @@
 (deftest over-complexity-analysis
   (testing "It is possible to calculate the complexity of a query in the Relay connection spec 
             by taking into account both named fragments and inline fragments."
-    (is (= {:errors {:message "Over max complexity! Current number of resources to be queried: 27"}}
+    (is (= {:data {:node nil}
+            :extensions {:warnings [{:message "Over max complexity! Current number of resources to be queried: 27"}]}}
            (q "query ProductDetail($productId: ID){
                node(id: $productId) {
                  ... on Product {
@@ -101,7 +101,8 @@
                }
              }" {:productId "id"}))))
   (testing "If no arguments are passed in the query, the calculation uses the default value defined in the schema."
-    (is (= {:errors {:message "Over max complexity! Current number of resources to be queried: 22"}}
+    (is (= {:data {:node nil}
+            :extensions {:warnings [{:message "Over max complexity! Current number of resources to be queried: 22"}]}}
            (q "query ProductDetail($productId: ID){
                                 node(id: $productId) {
                                   ... on Product {