#8600 update find templates api

IQSS · May 17, 2022 · 642720c · 642720c
1 parent caacaab
commit 642720c
Showing 1 changed file with 18 additions and 9 deletions.
diff --git a/src/main/java/edu/harvard/iq/dataverse/api/Admin.java b/src/main/java/edu/harvard/iq/dataverse/api/Admin.java
@@ -245,24 +245,33 @@ public Response deleteTemplate(@PathParam("id") long id) {
         return ok("Template " + doomed.getName() + " deleted.");
     }
 
-    @Path("template/{alias}")
+    @Path("orphanTemplates")
+    @GET
+    public Response findOrphanTemplates() {
+
+        return findTemplates("9999");
+    }
+
+    @Path("templates")
+    @GET
+    public Response findAllTemplates() {
+        return findTemplates("");
+    }
+
+    @Path("templates/{alias}")
     @GET
     public Response findTemplates(@PathParam("alias") String alias) {
-                    List<Template> templates;
+        List<Template> templates;
         try {
-            if (alias.equals("orphanTemplates")) {
+            if (alias.equals("9999")) {
                 templates = templateService.findOrphan();
-            } else if (alias.equals("allTemplates")) {
+            } else if (alias.isEmpty()) {
                 templates = templateService.findAll();
             } else {
-                Dataverse owner = dataverseService.findByAlias(alias);
-                if (owner == null) {
-                    return notFound("Dataverse " + alias + " not found");
-                }
+                Dataverse owner = findDataverseOrDie(alias);
                 templates = templateService.findByOwnerId(owner.getId());
             }
 
-
             JsonArrayBuilder container = Json.createArrayBuilder();
             for (Template t : templates) {
                 JsonObjectBuilder bld = Json.createObjectBuilder();