getApplicationsWithNumbers orders by date_created,sid instead of only date_created.

Also simplified getApplications() interface.

Refers #2517, PR #2550

Author: otsakir

Diff for: restcomm/restcomm.application/src/main/webapp/WEB-INF/scripts/mariadb/sql/applications.xml

@@ -42,7 +42,7 @@
     OR num.ussd_application_sid = app.sid
     OR num.refer_application_sid = app.sid
     WHERE (app.account_sid=#{account_sid} or app.account_sid is null)
-    ORDER BY app.date_created;
+    ORDER BY app.date_created, app.sid;
   </select>
 
   <delete id="removeApplication" parameterType="string">

Diff for: restcomm/restcomm.application/src/main/webapp/WEB-INF/sql/applications.xml

@@ -62,7 +62,7 @@
     OR "num"."ussd_application_sid" = "app"."sid"
     OR "num"."refer_application_sid" = "app"."sid"
     WHERE ("app"."account_sid"=#{account_sid} or "app"."account_sid" is null)
-    ORDER BY "app"."date_created";
+    ORDER BY "app"."date_created", "app"."sid";
   </select>
 
 

Diff for: restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/ApplicationsDao.java

@@ -37,7 +37,7 @@ public interface ApplicationsDao {
     List<Application> getApplications(Sid accountSid);
 
     // this may optionally return related numbers as part of an Application
-    List<Application> getApplications(Sid accountSid, boolean includeNumbers);
+    List<Application> getApplicationsWithNumbers(Sid accountSid);
 
     void removeApplication(Sid sid);
 

Diff for: restcomm/restcomm.dao/src/main/java/org/restcomm/connect/dao/mybatis/MybatisApplicationsDao.java

@@ -95,10 +95,7 @@ private Application getApplication(final String selector, final String parameter
     }
 
     @Override
-    public List<Application> getApplications(Sid accountSid, boolean includeNumbers) {
-        if (!includeNumbers)
-            return getApplications(accountSid);
-
+    public List<Application> getApplicationsWithNumbers(Sid accountSid) {
         final SqlSession session = sessions.openSession();
         try {
             final List<Map<String, Object>> results = session.selectList(namespace + "getApplicationsAndNumbers", accountSid.toString());

Diff for: restcomm/restcomm.dao/src/test/java/org/restcomm/connect/dao/mybatis/ApplicationRetrievalTest.java

@@ -80,12 +80,12 @@ public void retrieveApplications() {
     @Test
     public void retrieveApplicationsAndTheirNumbers() {
         ApplicationsDao dao = manager.getApplicationsDao();
-        List<Application> apps = dao.getApplications(new Sid("ACae6e420f425248d6a26948c17a9e2acf"), true);
+        List<Application> apps = dao.getApplicationsWithNumbers(new Sid("ACae6e420f425248d6a26948c17a9e2acf"));
 
         Assert.assertEquals(5, apps.size());
         Assert.assertNotNull(searchApplicationBySid(new Sid("AP73926e7113fa4d95981aa96b76eca854"),apps).getNumbers());
         // applications bound with many numbers are property returned
-        Assert.assertEquals("Three (3) numbers should be bound to this application", searchApplicationBySid(new Sid("AP73926e7113fa4d95981aa96b76eca854"),apps).getNumbers().size(), 3);
+        Assert.assertEquals("Three (3) numbers should be bound to this application", 3, searchApplicationBySid(new Sid("AP73926e7113fa4d95981aa96b76eca854"),apps).getNumbers().size());
         // applications bound with no numbers are properly returned
         Assert.assertNull(searchApplicationBySid(new Sid("AP00000000000000000000000000000004"),apps).getNumbers());
         // applications bound to numbers that belong to different account should not be returned (for now at least)

Diff for: restcomm/restcomm.dao/src/test/resources/applications.xml

@@ -62,7 +62,7 @@
     OR "num"."ussd_application_sid" = "app"."sid"
     OR "num"."refer_application_sid" = "app"."sid"
     WHERE ("app"."account_sid"=#{account_sid} or "app"."account_sid" is null)
-    ORDER BY "app"."date_created";
+    ORDER BY "app"."date_created", "app"."sid";
   </select>
 
 

Diff for: restcomm/restcomm.dao/src/test/resources/applicationsDao/applications.xml

@@ -62,7 +62,7 @@
             OR "num"."ussd_application_sid" = "app"."sid"
             OR "num"."refer_application_sid" = "app"."sid"
         WHERE ("app"."account_sid"=#{account_sid} or "app"."account_sid" is null)
-        ORDER BY "app"."date_created";
+        ORDER BY "app"."date_created", "app"."sid";
     </select>
 
 

Diff for: restcomm/restcomm.http/src/main/java/org/restcomm/connect/http/ApplicationsEndpoint.java

@@ -161,7 +161,7 @@ protected Response getApplications(final String accountSid, final MediaType resp
         if (tmp != null && tmp.equalsIgnoreCase("true"))
             includeNumbers = true;
 
-        final List<Application> applications = dao.getApplications(account.getSid(), includeNumbers);
+        final List<Application> applications = dao.getApplicationsWithNumbers(account.getSid());
         if (APPLICATION_XML_TYPE == responseType) {
             final RestCommResponse response = new RestCommResponse(new ApplicationList(applications));
             return ok(xstream.toXML(response), APPLICATION_XML).build();

Diff for: restcomm/restcomm.mrb/src/test/resources/mappers/applications.xml

@@ -62,7 +62,7 @@
     OR "num"."ussd_application_sid" = "app"."sid"
     OR "num"."refer_application_sid" = "app"."sid"
     WHERE ("app"."account_sid"=#{account_sid} or "app"."account_sid" is null)
-    ORDER BY "app"."date_created";
+    ORDER BY "app"."date_created", "app"."sid";
   </select>
 
 

Diff for: restcomm/restcomm.telephony/resources/mappers/applications.xml

@@ -62,7 +62,7 @@
     OR "num"."ussd_application_sid" = "app"."sid"
     OR "num"."refer_application_sid" = "app"."sid"
     WHERE ("app"."account_sid"=#{account_sid} or "app"."account_sid" is null)
-    ORDER BY "app"."date_created";
+    ORDER BY "app"."date_created", "app"."sid";
   </select>
 
 

Diff for: restcomm/restcomm.telephony/src/test/resources/mappers/applications.xml

@@ -62,7 +62,7 @@
     OR "num"."ussd_application_sid" = "app"."sid"
     OR "num"."refer_application_sid" = "app"."sid"
     WHERE ("app"."account_sid"=#{account_sid} or "app"."account_sid" is null)
-    ORDER BY "app"."date_created";
+    ORDER BY "app"."date_created", "app"."sid";
   </select>