Merge pull request #271 from topcoder-platform/qa-maven

Deliverable fixes

Author: eisbilir

.circleci/config.yml

@@ -18,7 +18,9 @@ install_deploy_dependency: &install_deploy_dependency
 install_dependency: &install_dependency
   name: Installation of build dependencies.
   command: |
-    # sed -i '/jessie-updates/d' /etc/apt/sources.list
+    # sed -i '/stretch-updates/d' /etc/apt/sources.list
+    # sed -i 's/security.debian/archive.debian/' /etc/apt/sources.list
+    # sed -i 's/deb.debian/archive.debian/' /etc/apt/sources.list
     apt update
     apt install -y  openssl git zip jq
     mkdir ~/awscli
@@ -150,7 +152,7 @@ jobs:
       LOGICAL_ENV: "dev"
       DEPLOY_ENV: "DEV"
       COMPONENT_BRANCH: "dev"
-      OR_INT_BRANCH: "v0.0.3"
+      OR_INT_BRANCH: "v0.0.4"
       PLAT_INT_BRANCH: "v0.0.29"
       APPNAME: "tc-online-review"
     steps: *build_steps
@@ -162,7 +164,7 @@ jobs:
       LOGICAL_ENV: "qa"
       DEPLOY_ENV: "QA"
       COMPONENT_BRANCH: "qa"
-      OR_INT_BRANCH: "v0.0.3"
+      OR_INT_BRANCH: "v0.0.4"
       PLAT_INT_BRANCH: "v0.0.29"
       APPNAME: "tc-online-review"
     steps: *build_steps
@@ -174,7 +176,7 @@ jobs:
       LOGICAL_ENV: "prod"
       DEPLOY_ENV: "PROD"
       COMPONENT_BRANCH: "master"
-      OR_INT_BRANCH: "v0.0.3"
+      OR_INT_BRANCH: "v0.0.4"
       PLAT_INT_BRANCH: "v0.0.29"
       APPNAME: "tc-online-review"
     steps: *build_steps

src/main/java/com/cronos/onlinereview/actions/project/ListProjectsAction.java

@@ -28,6 +28,7 @@
 import com.topcoder.onlinereview.component.search.filter.AndFilter;
 import com.topcoder.onlinereview.component.search.filter.Filter;
 import com.topcoder.onlinereview.component.search.filter.InFilter;
+
 import org.springframework.beans.factory.annotation.Autowired;
 
 import java.util.ArrayList;
@@ -52,7 +53,6 @@
  * @version 2.0
  */
 public class ListProjectsAction extends BaseProjectAction {
-
     /**
      * Represents the serial version id.
      */
@@ -339,7 +339,6 @@ public String execute() throws BaseException {
                 } catch (NumberFormatException nfe) {
                     winnerId = null;
                 }
-
                 myDeliverables[i] = getMyDeliverablesForPhases(
                         this, allMyDeliverables, phases[i], myResources[i], winnerId);
 
@@ -587,7 +586,6 @@ private static String getMyDeliverablesForPhases(TextProvider textProvider,
             if (j == resources.length) {
                 continue;
             }
-
             // Get a resource this deliverable is for
             final Resource forResource = resources[j];
 

src/main/java/com/cronos/onlinereview/util/ActionsHelper.java

@@ -1478,7 +1478,7 @@ public static Deliverable[] getAllDeliverablesForPhases(Phase[] phases, Resource
         validateParameterNotNull(phases, "phases");
 
         // A filter to search for deliverables for specific phase(s) of the project
-        Filter filter;
+        Filter phaseFilter;
         switch (phases.length) {
         case 0:
             // No phases -- no deliverables
@@ -1487,7 +1487,7 @@ public static Deliverable[] getAllDeliverablesForPhases(Phase[] phases, Resource
         case 1:
             // If there is only one phase in the provided array,
             // create filter for it directly (no OR filters needed)
-            filter = DeliverableFilterBuilder.createPhaseIdFilter(phases[0].getId());
+            phaseFilter = DeliverableFilterBuilder.createPhaseIdFilter(phases[0].getId());
             break;
 
         default:
@@ -1497,9 +1497,12 @@ public static Deliverable[] getAllDeliverablesForPhases(Phase[] phases, Resource
                 phaseFilters.add(DeliverableFilterBuilder.createPhaseIdFilter(phase.getId()));
             }
             // Combine all filters using OR operator
-            filter = new OrFilter(phaseFilters);
+            phaseFilter = new OrFilter(phaseFilters);
         }
 
+        Filter resourceRoleFilter = new NotFilter(new EqualToFilter("resource_role_id", 1));
+        Filter filter = new AndFilter(Arrays.asList(phaseFilter, resourceRoleFilter));
+
         // Perform a search for the deliverables
         Deliverable[] allDeliverables = createDeliverableManager().searchDeliverables(filter, null);
 

web/includes/project/project_myrole_reskin.jsp

@@ -44,7 +44,6 @@
                         <c:if test="${not empty outstandingDeliverables}">
                             <c:forEach items="${outstandingDeliverables}" var="deliverable" varStatus="deliverableStatus">
                                 <div class="myInfoTable__deliverableItem">
-                                <c:if test="${deliverable.id != 1}">
                                     <c:set var="devrStatus" value="${outstandingDeliverableStatuses[deliverableStatus.index]}" />
                                     <c:choose>
                                         <c:when test="${deliverable.complete}">
@@ -68,7 +67,6 @@
                                             (<tc-webtag:handle coderId="${outstandingDeliverableSubmissionUserIds[deliverableStatus.index]}" context="${orfn:getHandlerContext(pageContext.request)}" />)
                                     </c:if>
                                     </c:if>
-                                </c:if>
                             </div>
                             </c:forEach>
                         </c:if>