Index: pom.xml
===================================================================
diff -u -r02411019c7a80cb91383e65fec0baf73fce9ce71 -r181eb6d2384a23bf06e3d5f917b1a46451ec6b55
--- pom.xml	(.../pom.xml)	(revision 02411019c7a80cb91383e65fec0baf73fce9ce71)
+++ pom.xml	(.../pom.xml)	(revision 181eb6d2384a23bf06e3d5f917b1a46451ec6b55)
@@ -21,7 +21,6 @@
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-web-services</artifactId>
         </dependency>
-
         <dependency>
             <groupId>org.springframework.boot</groupId>
             <artifactId>spring-boot-starter-tomcat</artifactId>
Index: src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java
===================================================================
diff -u -r6b94185047fb649204898fa1d71764c580dcffe8 -r181eb6d2384a23bf06e3d5f917b1a46451ec6b55
--- src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java	(.../ReviewDAOImpl.java)	(revision 6b94185047fb649204898fa1d71764c580dcffe8)
+++ src/main/java/com/napa/pulse/dao/impl/ReviewDAOImpl.java	(.../ReviewDAOImpl.java)	(revision 181eb6d2384a23bf06e3d5f917b1a46451ec6b55)
@@ -244,34 +244,8 @@
                         + "and ssp.SITE_ID=sp.SITE_ID and SSP.LEVEL4_PARENT_ID=sp.HIERARCHY_ID and sp.SITE_ID=s.SITE_ID "
                         + " and (ssp.effective_pts = 230 and ssp.RECOMMENDED_ORDER_QTY > 0) ";
             }
-        //dcSales Filter
-        if(skuTableWidgetData.getDcSalesMonth() != null ) {
-            //dcSales 12 Filter
-            if (skuTableWidgetData.getDcSalesMonth() == 12) {
-                sql += "and ssp.dc_sales_last_12_months  ";
-                if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMax() >= skuTableWidgetData.getDcSalesMin()) {
-                    sql += "  between " + skuTableWidgetData.getDcSalesMin() + " and " + skuTableWidgetData.getDcSalesMax() ;
-                } else if (skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMin() == null) {
-                    sql += " <= " + skuTableWidgetData.getDcSalesMax();
-                } else if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() == null) {
-                    sql += " >= " + skuTableWidgetData.getDcSalesMin();
-                }
-            }
-            //DcSales 24 Filter
-            if (skuTableWidgetData.getDcSalesMonth() == 24) {
-                sql += "and ssp.dc_sales_last_24_months  ";
-                if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMax() >= skuTableWidgetData.getDcSalesMin()) {
-                    sql += "  between " + skuTableWidgetData.getDcSalesMin() + " and " + skuTableWidgetData.getDcSalesMax() ;
-                } else if (skuTableWidgetData.getDcSalesMax() != null && skuTableWidgetData.getDcSalesMin() == null) {
-                    sql += " <= " + skuTableWidgetData.getDcSalesMax();
-                } else if (skuTableWidgetData.getDcSalesMin() != null && skuTableWidgetData.getDcSalesMax() == null) {
-                    sql += " >= " + skuTableWidgetData.getDcSalesMin();
-                }
-            }
 
-        }
 
-
             //PUL-7923 Stocked and Non Stocked
             if (skuTableWidgetData.isDcStocking() && ("stockedatdc").equals(skuTableWidgetData.getSelectedStockNonStockOption().trim())) {
                 sql += " and (ssp.product_id = dc_sp.product_id(+) AND NVL(dc_sp.max_stocking_qty, 0) > 0 ) ";
@@ -450,7 +424,6 @@
 
             }
 
-
             // New Parts filter
             if (skuTableWidgetData.isProspectParts()) {
                 sql += " and ((ssp.FORECAST_MODEL_ID IN (0,200, 20000) AND ssp.RECOMMENDED_ORDER_QTY > 0) "
Index: src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java
===================================================================
diff -u -r6b94185047fb649204898fa1d71764c580dcffe8 -r181eb6d2384a23bf06e3d5f917b1a46451ec6b55
--- src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java	(.../SessionServiceImpl.java)	(revision 6b94185047fb649204898fa1d71764c580dcffe8)
+++ src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java	(.../SessionServiceImpl.java)	(revision 181eb6d2384a23bf06e3d5f917b1a46451ec6b55)
@@ -39,10 +39,8 @@
     @Autowired
     private InformaticaServiceClient informaticaServiceClient;
     @Autowired
-    SessionServiceImpl(SessionDAO sessionDAO,AcoDAO acoDAO,InformaticaServiceClient informaticaServiceClient) {
+    SessionServiceImpl(SessionDAO sessionDAO) {
         this.sessionDAO = sessionDAO;
-        this.acoDAO= acoDAO;
-        this.informaticaServiceClient=informaticaServiceClient;
     }
 
     /*
Index: src/test/java/com/napa/pulse/dao/impl/ReviewDAOImplUnitTest.java
===================================================================
diff -u -r02411019c7a80cb91383e65fec0baf73fce9ce71 -r181eb6d2384a23bf06e3d5f917b1a46451ec6b55
--- src/test/java/com/napa/pulse/dao/impl/ReviewDAOImplUnitTest.java	(.../ReviewDAOImplUnitTest.java)	(revision 02411019c7a80cb91383e65fec0baf73fce9ce71)
+++ src/test/java/com/napa/pulse/dao/impl/ReviewDAOImplUnitTest.java	(.../ReviewDAOImplUnitTest.java)	(revision 181eb6d2384a23bf06e3d5f917b1a46451ec6b55)
@@ -105,10 +105,10 @@
         List<Map<String, Object>> skuTableData = new ArrayList<>();
         skuTableData.add(resultMap);
         ReflectionTestUtils.setField(mockReviewDAO, "jdbcTemplate", jdbcTemplate);
-//        when(jdbcTemplate.queryForList(anyString(), anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(skuTableData);
+        when(jdbcTemplate.queryForList(anyString(), anyInt(), anyInt(), anyInt(), anyInt())).thenReturn(skuTableData);
 
         List<Map<String, Object>> result = mockReviewDAO.getSKUTableData(buildSKUTableWidgetData(), buildUser());
-        //assertEquals(1, result.size());
+        assertEquals(1, result.size());
         assertNotNull(result);
     }
     @Test
@@ -119,10 +119,9 @@
         List<Map<String, Object>> skuTableData = new ArrayList<>();
         skuTableData.add(resultMap);
         ReflectionTestUtils.setField(mockReviewDAO, "jdbcTemplate", jdbcTemplate);
-//when(jdbcTemplate.queryForList(anyString() ,anyInt(),anyInt(),anyInt(),anyInt())).thenReturn(skuTableData);
+        when(jdbcTemplate.queryForList(anyString() ,anyInt(),anyInt(),anyInt(),anyInt())).thenReturn(skuTableData);
         List<Map<String, Object>> result =mockReviewDAO.getSKUTableData(buildSKUTableFSDWidgetData(),buildUser());
-        // Assertions.assertEquals(skuTableData,result);
-        assertNotNull(result);
+       Assertions.assertEquals(skuTableData,result);
     }
 
 
@@ -139,7 +138,7 @@
         ReflectionTestUtils.setField(mockReviewDAO, "jdbcTemplate", jdbcTemplate);
         //ReflectionTestUtils.setField(mockSessionDAO,"SimpleJdbcCall", simpleJdbcCall);
         when(jdbcTemplate.queryForRowSet(anyString() ,anyInt())).thenReturn(rs);
-        Boolean result =mockReviewDAO.reviewBulkEdit(buildSKUTableFSDWidgetData(),buildUser());
+        Boolean result =mockReviewDAO.reviewBulkEdit(buildSKUTableFSDWidgetData());
         Assertions.assertEquals(true,result);
     }
 
@@ -152,10 +151,10 @@
         skuTableData.add(resultMap);
         Integer count=1;
         ReflectionTestUtils.setField(mockReviewDAO, "jdbcTemplate", jdbcTemplate);
-        //  when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class) ,anyInt())).thenReturn(count);
-//        when(jdbcTemplate.queryForList(anyString() ,anyInt(),anyInt(),anyInt(),anyInt())).thenReturn(skuTableData);
+        when(jdbcTemplate.queryForObject(anyString(), eq(Integer.class) ,anyInt())).thenReturn(count);
+        when(jdbcTemplate.queryForList(anyString() ,anyInt(),anyInt(),anyInt(),anyInt())).thenReturn(skuTableData);
         List<Map<String, Object>> result =mockReviewDAO.getSKUTableData(buildSKUTableFSDWidgetData(),buildUser());
-
+        Assertions.assertEquals(skuTableData,result);
     }
 
 
@@ -188,10 +187,6 @@
         skuTableWidgetData.setAction("orderAll");
         skuTableWidgetData.setReturn(true);
         skuTableWidgetData.setOrder(true);
-        List<Integer> list = new ArrayList<>();
-        list.add(1);
-        list.add(2);
-        skuTableWidgetData.setBulkEditProductIds(list);
         return skuTableWidgetData;
 
     }
FishEye: Tag 181eb6d2384a23bf06e3d5f917b1a46451ec6b55 refers to a dead (removed) revision in file `src/test/java/com/napa/pulse/service/impl/SessionServiceImplUnitTest.java'.
FishEye: No comparison available.  Pass `N' to diff?