Refactor of jsonSearchControllers

xh · Jan 27, 2025 · 5ad232f · 5ad232f
1 parent 30d26d4
commit 5ad232f
Show file tree

Hide file tree

Showing 3 changed files with 42 additions and 49 deletions.
diff --git a/grails-app/controllers/io/xh/hoist/admin/BaseJsonSearchController.groovy b/grails-app/controllers/io/xh/hoist/admin/BaseJsonSearchController.groovy
@@ -0,0 +1,38 @@
+/*
+ * This file belongs to Hoist, an application development toolkit
+ * developed by Extremely Heavy Industries (www.xh.io | [email protected])
+ *
+ * Copyright © 2025 Extremely Heavy Industries Inc.
+ */
+
+package io.xh.hoist.admin
+
+import com.jayway.jsonpath.Configuration
+import com.jayway.jsonpath.JsonPath
+import com.jayway.jsonpath.Option
+import io.xh.hoist.BaseController
+
+class BaseJsonSearchController extends BaseController {
+
+    private Configuration matchSearchConf = Configuration.builder()
+        .options(
+            Option.SUPPRESS_EXCEPTIONS,
+            Option.ALWAYS_RETURN_LIST
+        ).build()
+
+    private Configuration nodeSearchConf = Configuration.builder()
+        .options(
+            Option.AS_PATH_LIST,
+            Option.ALWAYS_RETURN_LIST
+        ).build()
+
+    def getMatchingNodes(String json, String path, boolean asPathList) {
+        def ret = JsonPath.using(nodeSearchConf).parse(json).read(path)
+        renderJSON(ret)
+    }
+
+    protected hasPathMatch(String json, String path) {
+        def result = JsonPath.using(matchSearchConf).parse(json).read(path)
+        return result.size() > 0
+    }
+}
diff --git a/grails-app/controllers/io/xh/hoist/admin/JsonBlobSearchAdminController.groovy b/grails-app/controllers/io/xh/hoist/admin/JsonBlobSearchAdminController.groovy
@@ -7,27 +7,14 @@
 
 package io.xh.hoist.admin
 
-import com.jayway.jsonpath.JsonPath
-import com.jayway.jsonpath.Configuration
-import com.jayway.jsonpath.Option
-import io.xh.hoist.BaseController
 import io.xh.hoist.jsonblob.JsonBlob
 import io.xh.hoist.security.Access
 
 @Access(['HOIST_ADMIN_READER'])
-class JsonBlobSearchAdminController extends BaseController {
+class JsonBlobSearchAdminController extends BaseJsonSearchController {
 
     def searchByJsonPath() {
-        Configuration conf = Configuration.builder()
-            .options(
-                Option.SUPPRESS_EXCEPTIONS,
-                Option.ALWAYS_RETURN_LIST
-            ).build()
-
-        List<JsonBlob> results = JsonBlob.list().findAll { entry ->
-            def result = JsonPath.using(conf).parse(entry.value).read(params.path)
-            return result.size() > 0
-        }
+        List<JsonBlob> results = JsonBlob.list().findAll { hasPathMatch(it.value, params.path) }
 
         def ret = results.collect { it ->
             [
@@ -41,14 +28,4 @@ class JsonBlobSearchAdminController extends BaseController {
         }
         renderJSON(ret)
     }
-
-    def getMatchingNodes(String json, String path, boolean asPathList) {
-        Configuration conf = asPathList
-            ? Configuration.builder().options(Option.AS_PATH_LIST, Option.ALWAYS_RETURN_LIST).build()
-            : Configuration.defaultConfiguration()
-
-        def ret = JsonPath.using(conf).parse(json).read(path)
-        renderJSON(ret)
-    }
-
 }
diff --git a/grails-app/controllers/io/xh/hoist/admin/PreferenceJsonSearchAdminController.groovy b/grails-app/controllers/io/xh/hoist/admin/PreferenceJsonSearchAdminController.groovy
@@ -7,30 +7,17 @@
 
 package io.xh.hoist.admin
 
-import com.jayway.jsonpath.Configuration
-import com.jayway.jsonpath.JsonPath
-import com.jayway.jsonpath.Option
-import io.xh.hoist.BaseController
 import io.xh.hoist.pref.Preference
 import io.xh.hoist.pref.UserPreference
 import io.xh.hoist.security.Access
 
 @Access(['HOIST_ADMIN_READER'])
-class PreferenceJsonSearchAdminController extends BaseController {
+class PreferenceJsonSearchAdminController extends BaseJsonSearchController {
 
     def searchByJsonPath() {
-        Configuration conf = Configuration.builder()
-            .options(
-                Option.SUPPRESS_EXCEPTIONS,
-                Option.ALWAYS_RETURN_LIST
-            ).build()
-
         List<Preference> jsonPrefs = Preference.findAllByType('json')
         List<UserPreference> userPrefs = jsonPrefs.collect { UserPreference.findAllByPreference(it)  }.flatten()
-        List<UserPreference> results = userPrefs.findAll { entry ->
-            def result = JsonPath.using(conf).parse(entry.userValue).read(params.path)
-            return result.size() > 0
-        }
+        List<UserPreference> results = userPrefs.findAll { hasPathMatch(it.userValue, params.path) }
 
         def ret = results.collect { it ->
             [
@@ -45,13 +32,4 @@ class PreferenceJsonSearchAdminController extends BaseController {
         renderJSON(ret)
     }
 
-    def getMatchingNodes(String json, String path, boolean asPathList) {
-        Configuration conf = asPathList
-            ? Configuration.builder().options(Option.AS_PATH_LIST, Option.ALWAYS_RETURN_LIST).build()
-            : Configuration.defaultConfiguration()
-
-        def ret = JsonPath.using(conf).parse(json).read(path)
-        renderJSON(ret)
-    }
-
 }