Fixed handling of user and subscripition queries

Author: krmorse

src/com/rallydev/rest/request/GetRequest.java

@@ -19,7 +19,9 @@ public class GetRequest extends Request {
 
     /**
      * Create a new get request for the specified object.
+     *
      * @param ref the ref of the WSAPI object to be retrieved.  May be absolute or relative, e.g. "/defect/12345"
+     *            May also be "/user" or "/subscription" to get the current instances
      */
     public GetRequest(String ref) {
         this.ref = ref;
@@ -54,7 +56,20 @@ public void setFetch(Fetch fetch) {
     public String toUrl() {
         List<NameValuePair> params = new ArrayList<NameValuePair>(getParams());
         params.add(new BasicNameValuePair("fetch", fetch.toString()));
-        return String.format("%s.js?%s", Ref.getRelativeRef(ref),
+        return String.format("%s.js?%s", getEndpoint(),
                 URLEncodedUtils.format(params, "utf-8"));
     }
+
+    protected String getEndpoint() {
+        String endpoint = ref.toLowerCase();
+        if (Ref.isRef(endpoint)) {
+            endpoint = Ref.getRelativeRef(endpoint);
+        } else if (endpoint.contains("user")) {
+            endpoint = "/user";
+        } else if (endpoint.contains("subscription")) {
+            endpoint = "/subscription";
+        }
+
+        return endpoint;
+    }
 }

src/com/rallydev/rest/request/QueryRequest.java

@@ -275,7 +275,15 @@ public String toUrl() {
             params.add(new BasicNameValuePair("query", getQueryFilter().toString()));
         }
 
-        return "/" + type.toLowerCase().replaceAll(" ", "") + ".js?" +
+        return getTypeEndpoint() + "?" +
                 URLEncodedUtils.format(params, "utf-8");
     }
+    
+    protected String getTypeEndpoint() {
+        String typeEndpoint = type.toLowerCase().replaceAll(" ", "");
+        if(typeEndpoint.equals("subscription") || typeEndpoint.equals("user")) {
+            typeEndpoint += "s";
+        }
+        return "/" + typeEndpoint + ".js";
+    }
 }

test/com/rallydev/rest/request/GetRequestTest.java

@@ -24,4 +24,22 @@ public void shouldReturnCorrectUrlWithFetchParams() {
         req.setFetch(new Fetch("Name", "Description"));
         Assert.assertEquals(req.toUrl(), "/defect/1234.js?fetch=Name%2CDescription");
     }
+
+    @Test
+    public void shouldReturnCorrectUrlForUser() {
+        Assert.assertEquals(new GetRequest("User").toUrl(), "/user.js?fetch=true");
+        Assert.assertEquals(new GetRequest("user").toUrl(), "/user.js?fetch=true");
+        Assert.assertEquals(new GetRequest("/user").toUrl(), "/user.js?fetch=true");
+        Assert.assertEquals(new GetRequest("/user.js").toUrl(), "/user.js?fetch=true");
+        Assert.assertEquals(new GetRequest("/user/12345.js").toUrl(), "/user/12345.js?fetch=true");
+    }
+
+    @Test
+    public void shouldReturnCorrectUrlForSubscription() {
+        Assert.assertEquals(new GetRequest("Subscription").toUrl(), "/subscription.js?fetch=true");
+        Assert.assertEquals(new GetRequest("subscription").toUrl(), "/subscription.js?fetch=true");
+        Assert.assertEquals(new GetRequest("/subscription").toUrl(), "/subscription.js?fetch=true");
+        Assert.assertEquals(new GetRequest("/subscription.js").toUrl(), "/subscription.js?fetch=true");
+        Assert.assertEquals(new GetRequest("/subscription/12345.js").toUrl(), "/subscription/12345.js?fetch=true");
+    }
 }

test/com/rallydev/rest/request/QueryRequestTest.java

@@ -127,4 +127,20 @@ public void shouldCloneCorrectly() {
         Assert.assertEquals(q.toUrl(), q2.toUrl());
 
     }
+
+    @Test
+    public void shouldCreateCorrectUrlForSubscription() {
+
+        QueryRequest q = new QueryRequest("Subscription");
+
+        Assert.assertEquals(q.toUrl(), "/subscriptions.js?start=1&pagesize=200&fetch=true&order=ObjectID");
+    }
+
+    @Test
+    public void shouldCreateCorrectUrlForUser() {
+
+        QueryRequest q = new QueryRequest("User");
+
+        Assert.assertEquals(q.toUrl(), "/users.js?start=1&pagesize=200&fetch=true&order=ObjectID");
+    }
 }