get issue count per remote project

TAMULib · Aug 2, 2018 · 6fbbda6 · 6fbbda6
1 parent 5718931
commit 6fbbda6
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 7 deletions.
diff --git a/src/main/java/edu/tamu/app/cache/model/RemoteProject.java b/src/main/java/edu/tamu/app/cache/model/RemoteProject.java
@@ -12,6 +12,8 @@ public class RemoteProject implements Serializable {
 
     private final int requestCount;
 
+    private final int issueCount;
+
     private final int storyCount;
 
     private final int defectCount;
@@ -21,15 +23,17 @@ public RemoteProject() {
         scopeId = "";
         name = "";
         requestCount = 0;
+        issueCount = 0;
         storyCount = 0;
         defectCount = 0;
     }
 
-    public RemoteProject(String scopeId, String name, int requestCount, int storyCount, int defectCount) {
+    public RemoteProject(String scopeId, String name, int requestCount, int issueCount, int storyCount, int defectCount) {
         super();
         this.scopeId = scopeId;
         this.name = name;
         this.requestCount = requestCount;
+        this.issueCount = issueCount;
         this.storyCount = storyCount;
         this.defectCount = defectCount;
     }
@@ -46,6 +50,10 @@ public int getRequestCount() {
         return requestCount;
     }
 
+    public int getIssueCount() {
+        return issueCount;
+    }
+
     public int getStoryCount() {
         return storyCount;
     }

diff --git a/src/main/java/edu/tamu/app/service/manager/VersionOneService.java b/src/main/java/edu/tamu/app/service/manager/VersionOneService.java
@@ -85,15 +85,17 @@ public List<RemoteProject> getRemoteProjects() throws ConnectionException, APIEx
             String scopeId = parseId(project.getOid());
             String name = project.getAttribute(nameAttributeDefinition).getValue().toString();
             int requestCount = getPrimaryWorkItemCount("Request", scopeId);
+            int issueCount = getPrimaryWorkItemCount("Issue", scopeId);
             int storyCount = getPrimaryWorkItemCount("Story", scopeId);
             int defectCount = getPrimaryWorkItemCount("Defect", scopeId);
             System.out.println("Project");
             System.out.println("   id: " + scopeId);
             System.out.println("   name: " + name);
             System.out.println("   requests: " + requestCount);
+            System.out.println("   issues: " + issueCount);
             System.out.println("   stories: " + storyCount);
             System.out.println("   defects: " + defectCount);
-            remoteProjects.add(new RemoteProject(scopeId, name, requestCount, storyCount, defectCount));
+            remoteProjects.add(new RemoteProject(scopeId, name, requestCount, issueCount, storyCount, defectCount));
 
         }
         return remoteProjects;
@@ -111,15 +113,17 @@ public RemoteProject getRemoteProjectByScopeId(final String scopeId) throws Conn
         Asset project = result.getAssets()[0];
         String name = project.getAttribute(nameAttributeDefinition).getValue().toString();
         int requestCount = getPrimaryWorkItemCount("Request", scopeId);
+        int issueCount = getPrimaryWorkItemCount("Issue", scopeId);
         int storyCount = getPrimaryWorkItemCount("Story", scopeId);
         int defectCount = getPrimaryWorkItemCount("Defect", scopeId);
         System.out.println("Project");
         System.out.println("   id: " + scopeId);
         System.out.println("   name: " + name);
         System.out.println("   requests: " + requestCount);
+        System.out.println("   issues: " + issueCount);
         System.out.println("   stories: " + storyCount);
         System.out.println("   defects: " + defectCount);
-        return new RemoteProject(scopeId, name, requestCount, storyCount, defectCount);
+        return new RemoteProject(scopeId, name, requestCount, issueCount, storyCount, defectCount);
     }
 
     public int getPrimaryWorkItemCount(final String type, final String scopeId) throws ConnectionException, APIException, OidException {

diff --git a/src/test/java/edu/tamu/app/cache/RemoteProjectsCacheTest.java b/src/test/java/edu/tamu/app/cache/RemoteProjectsCacheTest.java
@@ -54,13 +54,14 @@ public void testGetCache() {
         assertEquals("Cached remote project had incorrect id!", "0001", remoteProjectsCache.get(1L).get(0).getScopeId());
         assertEquals("Cached remote project had incorrect name!", "Sprint 1", remoteProjectsCache.get(1L).get(0).getName());
         assertEquals("Cached remote project had incorrect number of requests!", 2, remoteProjects.get(0).getRequestCount());
+        assertEquals("Cached remote project had incorrect number of issues!", 3, remoteProjects.get(0).getIssueCount());
         assertEquals("Cached remote project had incorrect number of stories!", 10, remoteProjects.get(0).getStoryCount());
         assertEquals("Cached remote project had incorrect number of defects!", 3, remoteProjects.get(0).getDefectCount());
         assertEquals("Cached remote project had incorrect total backlog items!", 13, remoteProjects.get(0).getBacklogItemCount());
     }
 
     private RemoteProject getMockRemoteProject() {
-        return new RemoteProject("0001", "Sprint 1", 2, 10, 3);
+        return new RemoteProject("0001", "Sprint 1", 2, 3, 10, 3);
     }
 
 }
diff --git a/src/test/java/edu/tamu/app/cache/controller/RemoteProjectsCacheControllerTest.java b/src/test/java/edu/tamu/app/cache/controller/RemoteProjectsCacheControllerTest.java
@@ -69,6 +69,7 @@ private void assertRemoteProjects(Map<Long, List<RemoteProject>> remoteProjectsC
         assertEquals("0001", remoteProjects.get(0).getScopeId());
         assertEquals("Sprint 1", remoteProjects.get(0).getName());
         assertEquals(2, remoteProjects.get(0).getRequestCount());
+        assertEquals(3, remoteProjects.get(0).getIssueCount());
         assertEquals(10, remoteProjects.get(0).getStoryCount());
         assertEquals(3, remoteProjects.get(0).getDefectCount());
         assertEquals(13, remoteProjects.get(0).getBacklogItemCount());
@@ -83,7 +84,7 @@ private Map<Long, List<RemoteProject>> getMockRemoteProjectsCache() {
     }
 
     private RemoteProject getMockRemoteProject() {
-        return new RemoteProject("0001", "Sprint 1", 2, 10, 3);
+        return new RemoteProject("0001", "Sprint 1", 2, 3, 10, 3);
     }
 
 }
diff --git a/src/test/java/edu/tamu/app/cache/model/RemoteProjectTest.java b/src/test/java/edu/tamu/app/cache/model/RemoteProjectTest.java
@@ -11,10 +11,11 @@ public class RemoteProjectTest {
 
     @Test
     public void testNewRemoteProject() {
-        RemoteProject remoteProject = new RemoteProject("0001", "Sprint 1", 2, 10, 3);
+        RemoteProject remoteProject = new RemoteProject("0001", "Sprint 1", 2, 3, 10, 3);
         assertEquals("0001", remoteProject.getScopeId());
         assertEquals("Sprint 1", remoteProject.getName());
         assertEquals(2, remoteProject.getRequestCount());
+        assertEquals(3, remoteProject.getIssueCount());
         assertEquals(10, remoteProject.getStoryCount());
         assertEquals(3, remoteProject.getDefectCount());
         assertEquals(13, remoteProject.getBacklogItemCount());

diff --git a/src/test/java/edu/tamu/app/cache/service/RemoteProjectsScheduledCacheServiceTest.java b/src/test/java/edu/tamu/app/cache/service/RemoteProjectsScheduledCacheServiceTest.java
@@ -103,7 +103,7 @@ private Map<Long, List<RemoteProject>> getMockRemoteProjectsCache() {
     }
 
     private RemoteProject getMockRemoteProject() {
-        return new RemoteProject("0001", "Sprint 1", 2, 10, 3);
+        return new RemoteProject("0001", "Sprint 1", 2, 3, 10, 3);
     }
 
     private void assertRemoteProjects(Map<Long, List<RemoteProject>> remoteProjectsCache) {
@@ -115,6 +115,7 @@ private void assertRemoteProjects(Map<Long, List<RemoteProject>> remoteProjectsC
         assertEquals("0001", remoteProjects.get(0).getScopeId());
         assertEquals("Sprint 1", remoteProjects.get(0).getName());
         assertEquals(2, remoteProjects.get(0).getRequestCount());
+        assertEquals(3, remoteProjects.get(0).getIssueCount());
         assertEquals(10, remoteProjects.get(0).getStoryCount());
         assertEquals(3, remoteProjects.get(0).getDefectCount());
         assertEquals(13, remoteProjects.get(0).getBacklogItemCount());

diff --git a/src/test/java/edu/tamu/app/service/manager/VersionOneServiceTest.java b/src/test/java/edu/tamu/app/service/manager/VersionOneServiceTest.java
@@ -211,6 +211,7 @@ public void testGetRemoteProjects() throws ConnectionException, APIException, Oi
         when(services.retrieve(any(Query.class))).thenReturn(result);
 
         doReturn(2).when(versionOneService).getPrimaryWorkItemCount(matches("Request"), any(String.class));
+        doReturn(3).when(versionOneService).getPrimaryWorkItemCount(matches("Issue"), any(String.class));
         doReturn(4).when(versionOneService).getPrimaryWorkItemCount(matches("Story"), any(String.class));
         doReturn(1).when(versionOneService).getPrimaryWorkItemCount(matches("Defect"), any(String.class));
 
@@ -247,6 +248,7 @@ public void testGetRemoteProjectByScopeId() throws ConnectionException, APIExcep
         when(services.retrieve(any(Query.class))).thenReturn(result);
 
         doReturn(2).when(versionOneService).getPrimaryWorkItemCount("Request", "1934");
+        doReturn(3).when(versionOneService).getPrimaryWorkItemCount("Issue", "1934");
         doReturn(4).when(versionOneService).getPrimaryWorkItemCount("Story", "1934");
         doReturn(1).when(versionOneService).getPrimaryWorkItemCount("Defect", "1934");