From 363d6eef239da2327aa6c65e0b3b316c5eac16a9 Mon Sep 17 00:00:00 2001
From: jendib <benjamin.gam@gmail.com>
Date: Sun, 4 Aug 2013 16:45:37 +0200
Subject: [PATCH] Order tags by name in all requests

---
 .../src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java    | 3 ++-
 .../src/test/java/com/sismics/docs/rest/TestTagResource.java   | 2 +-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java b/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java
index c77d4c2c..1de018aa 100644
--- a/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java
+++ b/docs-core/src/main/java/com/sismics/docs/core/dao/jpa/TagDao.java
@@ -45,7 +45,7 @@ public class TagDao {
     @SuppressWarnings("unchecked")
     public List<Tag> getByUserId(String userId) {
         EntityManager em = ThreadLocalContext.get().getEntityManager();
-        Query q = em.createQuery("select t from Tag t where t.userId = :userId and t.deleteDate is null order by t.id");
+        Query q = em.createQuery("select t from Tag t where t.userId = :userId and t.deleteDate is null order by t.name");
         q.setParameter("userId", userId);
         return q.getResultList();
     }
@@ -118,6 +118,7 @@ public class TagDao {
         sb.append(" left join T_DOCUMENT d on d.DOC_ID_C = dt.DOT_IDDOCUMENT_C and d.DOC_DELETEDATE_D is null and d.DOC_IDUSER_C = :userId ");
         sb.append(" where t.TAG_DELETEDATE_D is null ");
         sb.append(" group by t.TAG_ID_C ");
+        sb.append(" order by t.TAG_NAME_C ");
         
         // Perform the query
         Query q = em.createNativeQuery(sb.toString());
diff --git a/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java b/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java
index 37747d91..dab48e80 100644
--- a/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java
+++ b/docs-web/src/test/java/com/sismics/docs/rest/TestTagResource.java
@@ -110,7 +110,7 @@ public class TestTagResource extends BaseJerseyTest {
         json = response.getEntity(JSONObject.class);
         tags = json.getJSONArray("tags");
         Assert.assertTrue(tags.length() > 0);
-        Assert.assertEquals("Updated name", tags.getJSONObject(0).getString("name"));
+        Assert.assertEquals("Updated name", tags.getJSONObject(1).getString("name"));
         
         // Deletes a tag
         tagResource = resource().path("/tag/" + tag4Id);