Calls Module added

Author: mithileshkarnati

restcomm-connect.java.sdk/src/main/java/org/restcomm/connect/java/sdk/Calls/Call.java

@@ -54,11 +54,6 @@ public CallModifier modifyLiveCall()
 		return new CallModifier(BASE_URL+this.getSid());
 	}
 
-	public static CallsList getCallsList()
-	{
-		return new CallsList(BASE_URL);
-	}
-	
 
 	 	private String to;
 

restcomm-connect.java.sdk/src/main/java/org/restcomm/connect/java/sdk/Calls/CallsList.java

@@ -10,52 +10,60 @@
 import java.lang.reflect.Type;
 import com.google.gson.reflect.TypeToken;
 import com.google.gson.Gson;
+import com.google.gson.annotations.SerializedName;
+
 import java.util.ArrayList;
 import java.util.List;
 import org.restcomm.connect.java.sdk.ListUtil;
 import org.apache.http.ParseException;
-
+import com.google.gson.annotations.SerializedName;
 
 public class CallsList extends ListUtil {
 
-	private static String BASE_URL;// = Constants.COMMON_URL+"Accounts/"+Credentials.getAuthID()+"/Calls";
-	private Request request;
-	private List<Call> List;
+	private static String BASE_URL = Restcomm.COMMON_URL+"Accounts/"+Restcomm.getAuthID()+"/Calls.json/";
+	private static Request request;
+	
+	static public void SubAccountAccess(String sid)  //To access the Applications connected to SubAccounts
+	{
+		BASE_URL = Restcomm.COMMON_URL+"Accounts/"+sid+"/Calls.json/";
+	}
+	private List<Call> calls;
+	
 
 	public Call get(int index)
 	{
-		return List.get(index);
+		return calls.get(index);
 	}
 	public int size()
 	{
-		return List.size();
+		return calls.size();
 	}
-    private void setList (List<Call> List)
+    private void setList (List<Call> Calls)
     {
-        this.List = List;
+        this.calls = Calls;
     }
-    public CallsList(final String BASE_URL) 
+    public static CallsList getCallsList() 
 	{
-		this.BASE_URL = BASE_URL;
-		this.request = new Request(HttpMethod.GET,BASE_URL);
-		
-		Restcomm.sendRequest(new Request(HttpMethod.GET,BASE_URL));
-		Type ListType = new TypeToken< ArrayList<Call> >(){}.getType();
+		request = new Request(HttpMethod.GET,BASE_URL);	
+		Restcomm.sendRequest(request);
 		Gson gson = new Gson();
-		List = gson.fromJson(Restcomm.getJSONResponse(),ListType);
+		//System.out.println(Restcomm.getJSONResponse());
+		request = new Request(HttpMethod.GET,BASE_URL);	
+		return gson.fromJson(Restcomm.getJSONResponse(),CallsList.class);
 	}
+    
     public CallsList addFilterParam(String param,String value) throws Exception
     {
     	request.addGetParameters(param,value);
     	return this;
     }
-    public void Filter()
+    public CallsList Filter()
     {
-
-		Restcomm.sendRequest(this.request);
-		Type ListType = new TypeToken< ArrayList<Call> >(){}.getType();
+    	Restcomm.sendRequest(this.request);
 		Gson gson = new Gson();
-		List = gson.fromJson(Restcomm.getJSONResponse(),ListType);
+		request = new Request(HttpMethod.GET,BASE_URL);	
+		//System.out.println(Restcomm.getJSONResponse());
+		return gson.fromJson(Restcomm.getJSONResponse(),CallsList.class);
     }
 
 }

restcomm-connect.java.sdk/src/test/java/org/restcomm/connect/java/sdk/Calls/CallTest.java

@@ -110,5 +110,23 @@ public void testModifyLiveCall() throws Exception{
 		assertEquals("COMPLETED",a.getStatus());
 	}
 	/* Need to add test for CallsList*/
+	@Test
+	public void testGetCallList() throws Exception{
+		WireMock.stubFor(WireMock.get(WireMock.urlPathMatching("/Accounts/"+Restcomm.getAuthID()+"/Calls.json/"))
+				  .withBasicAuth(Restcomm.getAuthID(),Restcomm.getPassword())
+				  .willReturn(WireMock.aResponse()
+				  .withStatus(200)
+				  .withHeader("Content-Type", "application/json")
+				  .withBody(readFile(path+"getCallList.txt"))));
+		
+		CallsList a = CallsList.getCallsList();
+		
+		Call b = a.get(0);
 
+		
+		WireMock.verify(WireMock.getRequestedFor(WireMock.urlEqualTo("/Accounts/"+Restcomm.getAuthID()+"/Calls.json/")));
+		assertEquals(200,Restcomm.getStatusCode());
+		assertNotNull(a);
+		assertEquals("mithileshkarnati",b.getTo());
+	}
 }

restcomm-connect.java.sdk/src/test/java/org/restcomm/connect/java/sdk/Calls/TextFiles/getCallList.txt

@@ -0,0 +1,30 @@
+{
+  "page": 0,
+  "num_pages": 182,
+  "page_size": 1,
+  "total": 182,
+  "start": "0",
+  "end": "0",
+  "uri": "/2012-04-24/Accounts/AC13b4372c92ed5c07d951cf842e2664ff/Calls.json",
+  "first_page_uri": "/2012-04-24/Accounts/AC13b4372c92ed5c07d951cf842e2664ff/Calls.json?Page\u003d0\u0026PageSize\u003d1",
+  "previous_page_uri": "null",
+  "next_page_uri": "/2012-04-24/Accounts/AC13b4372c92ed5c07d951cf842e2664ff/Calls.json?Page\u003d1\u0026PageSize\u003d1\u0026AfterSid\u003dCA014fffb9a47b421f934d49e0afd490a3",
+  "last_page_uri": "/2012-04-24/Accounts/AC13b4372c92ed5c07d951cf842e2664ff/Calls.json?Page\u003d182\u0026PageSize\u003d1",
+  "calls": [
+    {
+      "sid": "CA014fffb9a47b421f934d49e0afd490a3",
+      "InstanceId": "ID8deb35fc5121429fa96635aebe3976d2",
+      "date_created": "Wed, 17 May 2017 11:07:39 +0000",
+      "date_updated": "Wed, 17 May 2017 11:07:40 +0000",
+      "account_sid": "AC13b4372c92ed5c07d951cf842e2664ff",
+      "to": "mithileshkarnati",
+      "from": "paras",
+      "status": "FAILED",
+      "price_unit": "USD",
+      "direction": "Client-To-Client",
+      "api_version": "2012-04-24",
+      "caller_name": "paras",
+      "uri": "/2012-04-24/Accounts/AC13b4372c92ed5c07d951cf842e2664ff/Calls/CLf14ad69d87034f338630b2a63b4a4d5b.json"
+    }
+  ]
+}