Add (/admin)/apps/communities/{community-id}/apps endpoint passthroughs.

cyverse-de/apps#125
cyverse-de · Oct 19, 2018 · 6296b58 · 6296b58
1 parent 22ab8f5
commit 6296b58
Show file tree

Hide file tree

Showing 3 changed files with 34 additions and 0 deletions.
diff --git a/src/terrain/clients/apps/raw.clj b/src/terrain/clients/apps/raw.clj
@@ -113,6 +113,20 @@
                :as               :stream
                :follow-redirects false}))
 
+(defn apps-in-community
+  [community-id]
+  (client/get (apps-url "apps" "communities" community-id "apps")
+              {:query-params     (secured-params)
+               :as               :stream
+               :follow-redirects false}))
+
+(defn admin-get-apps-in-community
+  [community-id]
+  (client/get (apps-url "admin" "apps" "communities" community-id "apps")
+              {:query-params     (secured-params)
+               :as               :stream
+               :follow-redirects false}))
+
 (defn search-apps
   [params]
   (client/get (apps-url "apps")

diff --git a/src/terrain/core.clj b/src/terrain/core.clj
@@ -135,6 +135,7 @@
     (app-avu-routes)
     (app-comment-routes)
     (app-ontology-routes)
+    (app-community-routes)
     (apps-routes)
     (analysis-routes)
     (coge-routes)
@@ -180,6 +181,7 @@
     (admin-apps-routes)
     (admin-app-avu-routes)
     (admin-app-comment-routes)
+    (admin-app-community-routes)
     (admin-comment-routes)
     (admin-filesystem-metadata-routes)
     (admin-groups-routes)

diff --git a/src/terrain/routes/metadata.clj b/src/terrain/routes/metadata.clj
@@ -96,6 +96,24 @@
    (GET "/ontologies/:ontology-version/:root-iri/unclassified" [ontology-version root-iri :as {params :params}]
      (service/success-response (apps/get-unclassified-app-listing ontology-version root-iri params)))))
 
+(defn app-community-routes
+  []
+  (optional-routes
+    [#(and (config/app-routes-enabled)
+           (config/metadata-routes-enabled))]
+
+    (GET "/apps/communities/:community-id/apps" [community-id]
+      (service/success-response (apps/apps-in-community community-id)))))
+
+(defn admin-app-community-routes
+  []
+  (optional-routes
+    [#(and (config/app-routes-enabled)
+           (config/metadata-routes-enabled))]
+
+    (GET "/apps/communities/:community-id/apps" [community-id]
+      (service/success-response (apps/admin-get-apps-in-community community-id)))))
+
 (defn admin-apps-routes
   []
   (optional-routes