Index: src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java =================================================================== diff -u -ra8c371165f5a10d09d30559a2eee5b703caa5145 -r7beea852ef5e094d79b06defd9434346e3e0797a --- src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java (.../HubSpokeNetworkDAOImpl.java) (revision a8c371165f5a10d09d30559a2eee5b703caa5145) +++ src/main/java/com/napa/pulse/dao/impl/HubSpokeNetworkDAOImpl.java (.../HubSpokeNetworkDAOImpl.java) (revision 7beea852ef5e094d79b06defd9434346e3e0797a) @@ -138,7 +138,7 @@ LOGGER.error ( "Exception in updateHubSpokeNetwork for userId: " + userId + "-Network Name-" + createRequestDto.getNetworkName ( ) ); LOGGER.error ( "Exception message is: " + ex.getMessage ( ) ); LOGGER.error ( "Exception stacktrace is: " + ex.getStackTrace ( ) ); - result.setMessage ( "Cannot Update Other's User Data" ); + //result.setMessage ( "Cannot Update Other's User Data" ); throw new RuntimeException ( ex.getMessage ( ) ); } return result; @@ -1270,16 +1270,19 @@ LOGGER.error ( "Exception in deleteSiteFromNetwork for siteId: " + siteId ); LOGGER.error ( "Exception message is: " + ex.getMessage ( ) ); LOGGER.error ( "Exception stacktrace is: " + ex.getStackTrace ( ) ); + throw new RuntimeException ( ex.getMessage ( ) ); + } } private void insertSitesInNetwork ( List siteIds , Integer userId , Integer networkId ) { for (Integer siteId : siteIds) { -// jdbcTemplate.update("INSERT INTO hub_spoke_network_mapping (HSN_NETWORK_ID,HSN_SITE_ID,CREATED_BY,CREATED_DATE,MODIFIED_BY,MODIFIED_DATE,IS_ACTIVE) " + -// "VALUES(?,?,?,?,?,?,?)", networkId, siteId, userId, java.sql.Date.valueOf(java.time.LocalDate.now()), 0, null, 1); - String dateFormat = "'yyyy/mm/dd'"; - String sql = "update hub_spoke_network_mapping set CREATED_BY = " + userId + ",CREATED_DATE = " + null + ", MODIFIED_BY = " + userId + ", MODIFIED_DATE = TO_DATE('" + java.sql.Date.valueOf ( java.time.LocalDate.now ( ) ) + "'," + dateFormat + "), IS_ACTIVE=" + 1 + " where HSN_NETWORK_ID = " + networkId + " and HSN_SITE_ID = " + siteId + ""; - jdbcTemplate.update ( sql ); + + jdbcTemplate.update("INSERT INTO hub_spoke_network_mapping (HSN_NETWORK_ID,HSN_SITE_ID,CREATED_BY,CREATED_DATE,MODIFIED_BY,MODIFIED_DATE,IS_ACTIVE) " + + "VALUES(?,?,?,?,?,?,?)", networkId, siteId, userId, java.sql.Date.valueOf(java.time.LocalDate.now()), 0, null, 1); + //String dateFormat = "'yyyy/mm/dd'"; + // String sql = "update hub_spoke_network_mapping set CREATED_BY = " + userId + ",CREATED_DATE = " + null + ", MODIFIED_BY = " + userId + ", MODIFIED_DATE = TO_DATE('" + java.sql.Date.valueOf ( java.time.LocalDate.now ( ) ) + "'," + dateFormat + "), IS_ACTIVE=" + 1 + " where HSN_NETWORK_ID = " + networkId + " and HSN_SITE_ID = " + siteId + ""; + //jdbcTemplate.update ( sql ); } } @@ -1291,6 +1294,7 @@ } } catch ( Exception e ) { LOGGER.error ( "Error in revertSelectedIdListToRecommended(), Reverting Hierarchy Ids failed" ); + throw new RuntimeException ( e.getMessage () ); } } @@ -1316,6 +1320,7 @@ parametersDAO.revertToRecommended ( siteId , productId , sessionId , userId );// productId & nodeId are same term } catch ( PulseException e ) { LOGGER.error ( "Error in revertProductsToRecommended()" , e ); + throw new RuntimeException ( e.getMessage () ); } } ); } @@ -1339,6 +1344,7 @@ } } catch ( Exception e ) { LOGGER.error ( "Error in prepareRevertObject() networkId : {}, siteId : {}" , networkId , siteId ); + throw new RuntimeException ( e.getMessage () ); } return list; } @@ -1361,7 +1367,7 @@ public List getAllNetworkNames ( ) { List list = new ArrayList<> ( ); try { - String sql = "SELECT HS_NETWORK_NAME FROM HUB_SPOKE_NETWORK WHERE IS_ACTIVE = 1"; + String sql = "SELECT HS_NETWORK_NAME FROM HUB_SPOKE_NETWORK"; SqlRowSet rs = jdbcTemplate.queryForRowSet ( sql ); while (rs.next ( )) {