Merge pull request #140 from zanata/rhbz998724

Fix unexpected error when requesting to join group: https://bugzilla.redhat.com/show_bug.cgi?id=998724
zanata · Aug 25, 2013 · b89e462 · b89e462
2 parents dc28f93 + 09d65da
commit b89e462
Show file tree

Hide file tree

Showing 4 changed files with 25 additions and 46 deletions.
diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
@@ -123,7 +123,8 @@ public void executePreSearch()
 
             if (paramSet.length == 2)
             {
-               HProjectIteration projectVersion = versionGroupServiceImpl.getProjectIterationBySlug(paramSet[0], paramSet[1]);
+               HProjectIteration projectVersion = versionGroupServiceImpl.getProjectIterationBySlug(paramSet[0],
+                     paramSet[1]);
                if (projectVersion != null)
                {
                   getSearchResults().add(new SelectableHProject(projectVersion, true));
@@ -159,7 +160,7 @@ public List<SelectableHProject> getSearchResults()
 
    public boolean isVersionInGroup(Long projectIterationId)
    {
-      return versionGroupServiceImpl.isVersionInGroup(group, projectIterationId);
+      return versionGroupServiceImpl.isVersionInGroup(group.getSlug(), projectIterationId);
    }
 
    @Transactional
@@ -225,7 +226,7 @@ public List<HIterationGroup> getAllVersionGroups()
       List<HIterationGroup> result = new ArrayList<HIterationGroup>();
       for (HIterationGroup group : allVersionGroups)
       {
-         if(filterGroupByStatus(group))
+         if (filterGroupByStatus(group))
          {
             result.add(group);
          }

diff --git a/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java b/zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
@@ -25,8 +25,10 @@
 import java.util.List;
 import java.util.Set;
 
-import org.apache.commons.lang.StringUtils;
+import lombok.Getter;
+import lombok.Setter;
 
+import org.apache.commons.lang.StringUtils;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Logger;
@@ -56,23 +58,29 @@ public class VersionGroupJoinAction implements Serializable
    @In
    private ProjectIterationDAO projectIterationDAO;
 
-   @In(create=true)
+   @In(create = true)
    private SendEmailAction sendEmail;
 
    @In(required = false, value = JpaIdentityStore.AUTHENTICATED_USER)
-   HAccount authenticatedAccount;
+   private HAccount authenticatedAccount;
 
    @Logger
-   Log log;
+   private Log log;
 
    private List<SelectableHProject> projectVersions;
 
    private HIterationGroup group;
 
+   @Getter
+   @Setter
    private String slug;
 
+   @Getter
+   @Setter
    private String iterationSlug;
 
+   @Getter
+   @Setter
    private String projectSlug;
 
    public void searchMaintainedProjectVersion()
@@ -89,13 +97,13 @@ public void searchMaintainedProjectVersion()
 
    public void searchProjectVersion()
    {
-      if(StringUtils.isNotEmpty(iterationSlug) && StringUtils.isNotEmpty(projectSlug))
+      if (StringUtils.isNotEmpty(iterationSlug) && StringUtils.isNotEmpty(projectSlug))
       {
-          HProjectIteration projectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug);
-          if(projectIteration != null)
-          {
+         HProjectIteration projectIteration = projectIterationDAO.getBySlug(projectSlug, iterationSlug);
+         if (projectIteration != null)
+         {
             getProjectVersions().add(new SelectableHProject(projectIteration, true));
-          }
+         }
 
       }
    }
@@ -111,7 +119,7 @@ public List<SelectableHProject> getProjectVersions()
 
    public boolean isVersionInGroup(Long projectIterationId)
    {
-      return versionGroupServiceImpl.isVersionInGroup(group, projectIterationId);
+      return versionGroupServiceImpl.isVersionInGroup(slug, projectIterationId);
    }
 
    public String cancel()
@@ -155,36 +163,6 @@ public HIterationGroup getGroup()
       return group;
    }
 
-   public String getSlug()
-   {
-      return slug;
-   }
-
-   public void setSlug(String slug)
-   {
-      this.slug = slug;
-   }
-
-   public String getIterationSlug()
-   {
-      return iterationSlug;
-   }
-
-   public void setIterationSlug(String iterationSlug)
-   {
-      this.iterationSlug = iterationSlug;
-   }
-
-   public String getProjectSlug()
-   {
-      return projectSlug;
-   }
-
-   public void setProjectSlug(String projectSlug)
-   {
-      this.projectSlug = projectSlug;
-   }
-
    public String getQuery()
    {
       StringBuilder queryBuilder = new StringBuilder();

diff --git a/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java b/zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
@@ -51,7 +51,7 @@ public interface VersionGroupService
 
    HProjectIteration getProjectIterationBySlug(String projectSlug, String iterationSlug);
 
-   boolean isVersionInGroup(HIterationGroup group, Long projectIterationId);
+   boolean isVersionInGroup(String groupSlug, Long projectIterationId);
 
    boolean isGroupInVersion(String groupSlug, Long id);
 

diff --git a/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java b/zanata-war/src/main/java/org/zanata/service/impl/VersionGroupServiceImpl.java
@@ -23,7 +23,6 @@
 import java.util.ArrayList;
 import java.util.List;
 
-import org.apache.commons.lang.StringUtils;
 import org.jboss.seam.ScopeType;
 import org.jboss.seam.annotations.In;
 import org.jboss.seam.annotations.Name;
@@ -157,8 +156,9 @@ public boolean leaveVersionGroup(String slug, Long projectIterationId)
    }
 
    @Override
-   public boolean isVersionInGroup(HIterationGroup group, Long projectIterationId)
+   public boolean isVersionInGroup(String groupSlug, Long projectIterationId)
    {
+      HIterationGroup group = getBySlug(groupSlug);
       if (group != null && projectIterationId != null)
       {
          for (HProjectIteration iteration : group.getProjectIterations())