Index: src/main/java/com/napa/pulse/dao/impl/PulseConfigurationDAOImpl.java =================================================================== diff -u -rd9c761e9e818a85806d277679a1283567bed4ebc -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/dao/impl/PulseConfigurationDAOImpl.java (.../PulseConfigurationDAOImpl.java) (revision d9c761e9e818a85806d277679a1283567bed4ebc) +++ src/main/java/com/napa/pulse/dao/impl/PulseConfigurationDAOImpl.java (.../PulseConfigurationDAOImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -15,12 +15,8 @@ private JdbcTemplate jdbcTemplate; @Override - public List> getAllConfig() throws Exception { + public List> getAllConfig() throws Exception { return jdbcTemplate.queryForList("SELECT CONFIG_CODE, CONFIG_DESC, CONFIG_VALUE FROM PULSE_CONFIG"); } - @Override - public void getSpecificConfig() throws Exception { - } - -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/dao/interfaces/PulseConfigurationDAO.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/dao/interfaces/PulseConfigurationDAO.java (.../PulseConfigurationDAO.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/dao/interfaces/PulseConfigurationDAO.java (.../PulseConfigurationDAO.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,22 +1,16 @@ package com.napa.pulse.dao.interfaces; +import com.napa.pulse.exception.PulseException; + import java.util.List; import java.util.Map; -import com.napa.pulse.exception.PulseException; - public interface PulseConfigurationDAO { - - /** - * @return - * @throws PulseException - */ - List> getAllConfig() throws Exception; - - /** - * @return - * @throws PulseException - */ - void getSpecificConfig() throws Exception; -} + /** + * @return + * @throws PulseException + */ + List> getAllConfig() throws Exception; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/AcoServiceImpl.java =================================================================== diff -u -r3985830da990714ff02eaf811201524792b5f8d7 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/AcoServiceImpl.java (.../AcoServiceImpl.java) (revision 3985830da990714ff02eaf811201524792b5f8d7) +++ src/main/java/com/napa/pulse/service/impl/AcoServiceImpl.java (.../AcoServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,68 +1,68 @@ package com.napa.pulse.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.AcoDAO; import com.napa.pulse.dto.AcoCoverageData; import com.napa.pulse.dto.AcoDashboardData; import com.napa.pulse.dto.AcoReviewPageData; import com.napa.pulse.dto.AcoValidation; import com.napa.pulse.service.interfaces.AcoService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + @Service -public class AcoServiceImpl implements AcoService{ +public class AcoServiceImpl implements AcoService { - @Autowired - private AcoDAO acoDAO; - - public void xferBlendingData(int sessionId, int siteId, int hierarchyId) throws Exception { - acoDAO.xferBlendingData(sessionId, siteId, hierarchyId); - } - - public AcoValidation acoValidationChecks(Integer[] sites) { - return acoDAO.acoValidationChecks(sites); - } - - public void updateSiteHierarchy(int siteId, int hierarchyId, int status, int userId) { - acoDAO.updateSiteHierarchy(siteId, hierarchyId, status, userId); - } - - public void updateACOSlider(int sessionId, int siteId, int hierarchyId, double offset){ - acoDAO.updateACOSlider(sessionId, siteId, hierarchyId, offset); - } - - public void acoChangeLineStatus(int siteId, int parentId, int hierarchyId, String statusCode) { - acoDAO.acoChangeLineStatus(siteId, parentId, hierarchyId, statusCode); - } - - public List getAcoDashboardList(int sessionId, int siteId, String nodeIds) { - return acoDAO.getAcoDashboardList(sessionId, siteId, nodeIds); - } - - public List getAcoCoverageData(int sessionId, int siteId, String nodeIds) { - return acoDAO.getAcoCoverageData(sessionId, siteId, nodeIds); - } - - public void updateAcoSessionStatus(int sessionId, int hierarchyId, int acoStatusId) { - acoDAO.updateAcoSessionStatus(sessionId, hierarchyId, acoStatusId); - } - - public List getAcoReviewTableData(int sessionId, int siteId, int pageNumber, int recordsPerPage){ - return acoDAO.getAcoReviewTableData(sessionId, siteId, pageNumber, recordsPerPage); - } - - public int getAcoReviewTableDataCnt(int sessionId, int siteId){ - return acoDAO.getAcoReviewTableDataCnt(sessionId, siteId); - } - - public void updateOrder(int sessionId, int siteId, int productId, int orderQty) { - acoDAO.updateOrder(sessionId, siteId, productId, orderQty); - } - - public void updateKeep(int sessionId, int siteId, int productId, int keepQty){ - acoDAO.updateKeep(sessionId, siteId, productId, keepQty); - } -} + @Autowired + private AcoDAO acoDAO; + + public void xferBlendingData(int sessionId, int siteId, int hierarchyId) throws Exception { + acoDAO.xferBlendingData(sessionId, siteId, hierarchyId); + } + + public AcoValidation acoValidationChecks(Integer[] sites) { + return acoDAO.acoValidationChecks(sites); + } + + public void updateSiteHierarchy(int siteId, int hierarchyId, int status, int userId) { + acoDAO.updateSiteHierarchy(siteId, hierarchyId, status, userId); + } + + public void updateACOSlider(int sessionId, int siteId, int hierarchyId, double offset) { + acoDAO.updateACOSlider(sessionId, siteId, hierarchyId, offset); + } + + public void acoChangeLineStatus(int siteId, int parentId, int hierarchyId, String statusCode) { + acoDAO.acoChangeLineStatus(siteId, parentId, hierarchyId, statusCode); + } + + public List getAcoDashboardList(int sessionId, int siteId, String nodeIds) { + return acoDAO.getAcoDashboardList(sessionId, siteId, nodeIds); + } + + public List getAcoCoverageData(int sessionId, int siteId, String nodeIds) { + return acoDAO.getAcoCoverageData(sessionId, siteId, nodeIds); + } + + public void updateAcoSessionStatus(int sessionId, int hierarchyId, int acoStatusId) { + acoDAO.updateAcoSessionStatus(sessionId, hierarchyId, acoStatusId); + } + + public List getAcoReviewTableData(int sessionId, int siteId, int pageNumber, int recordsPerPage) { + return acoDAO.getAcoReviewTableData(sessionId, siteId, pageNumber, recordsPerPage); + } + + public int getAcoReviewTableDataCnt(int sessionId, int siteId) { + return acoDAO.getAcoReviewTableDataCnt(sessionId, siteId); + } + + public void updateOrder(int sessionId, int siteId, int productId, int orderQty) { + acoDAO.updateOrder(sessionId, siteId, productId, orderQty); + } + + public void updateKeep(int sessionId, int siteId, int productId, int keepQty) { + acoDAO.updateKeep(sessionId, siteId, productId, keepQty); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/AdHocRefreshServiceImpl.java =================================================================== diff -u -rac3fd486e67b434ca93a8a034445ad1c973c3e6f -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/AdHocRefreshServiceImpl.java (.../AdHocRefreshServiceImpl.java) (revision ac3fd486e67b434ca93a8a034445ad1c973c3e6f) +++ src/main/java/com/napa/pulse/service/impl/AdHocRefreshServiceImpl.java (.../AdHocRefreshServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,86 +1,86 @@ /** - * + * */ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - +import com.napa.pulse.dao.interfaces.AdHocRefreshDAO; +import com.napa.pulse.dto.AdhocRefreshStatus; +import com.napa.pulse.entity.security.User; +import com.napa.pulse.exception.PulseException; +import com.napa.pulse.service.interfaces.AdHocRefreshService; import com.napa.pulse.utils.informatica.InformaticaServiceClient; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.context.annotation.Lazy; import org.springframework.stereotype.Service; -import com.napa.pulse.dao.interfaces.AdHocRefreshDAO; -import com.napa.pulse.dto.AdhocRefreshStatus; -import com.napa.pulse.entity.security.User; -import com.napa.pulse.exception.PulseException; -import com.napa.pulse.service.interfaces.AdHocRefreshService; +import java.util.List; +import java.util.Map; /** * @author Tathagata * */ @Service public class AdHocRefreshServiceImpl implements AdHocRefreshService { - private static final Logger LOGGER = LoggerFactory.getLogger(AdHocRefreshServiceImpl.class); - - @Autowired - AdHocRefreshDAO dao; + private static final Logger LOGGER = LoggerFactory.getLogger(AdHocRefreshServiceImpl.class); - @Lazy - @Autowired - InformaticaServiceClient informaticaServiceClient; + @Autowired + AdHocRefreshDAO dao; - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.AdHocRefreshService#runAdHocRefresh(com.napa.pulse.entity.security.User, java.lang.Integer[], java.lang.Integer, java.lang.String, java.lang.Integer, java.util.Date) - */ - @Override - public void runAdHocRefresh(User user, Integer[] sites, Integer reasonId, String environment, Integer requestorId) - throws PulseException { + @Lazy + @Autowired + InformaticaServiceClient informaticaServiceClient; - Integer requestId = dao.runAdHocRefresh(user, sites, reasonId, environment, requestorId); + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.AdHocRefreshService#runAdHocRefresh(com.napa.pulse.entity.security.User, + * java.lang.Integer[], java.lang.Integer, java.lang.String, java.lang.Integer, java.util.Date) + */ + @Override + public void runAdHocRefresh(User user, Integer[] sites, Integer reasonId, String environment, Integer requestorId) + throws PulseException { + Integer requestId = dao.runAdHocRefresh(user, sites, reasonId, environment, requestorId); - if (requestId != null) { - informaticaServiceClient.startWorkflowAdhoc(requestId); - } + if (requestId != null) { + informaticaServiceClient.startWorkflowAdhoc(requestId); + } - LOGGER.info("runAdHocRefresh finished..."); - } + LOGGER.info("runAdHocRefresh finished..."); + } - @Override - public boolean startAdhocWorkflow(int reqLogId) { - try { - informaticaServiceClient.startWorkflowAdhoc(reqLogId); - return true; - } catch (Exception e) { - return false; - } - } + @Override + public boolean startAdhocWorkflow(int reqLogId) { + try { + informaticaServiceClient.startWorkflowAdhoc(reqLogId); + return true; + } catch (Exception e) { + return false; + } + } - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.AdHocRefreshService#getStateOfQueue() - */ - @Override - public List> getStateOfQueue(User user) throws PulseException { - return dao.getStateOfQueue(user); - } + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.AdHocRefreshService#getStateOfQueue() + */ + @Override + public List> getStateOfQueue(User user) throws PulseException { + return dao.getStateOfQueue(user); + } - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.AdHocRefreshService#restrictedWindow() - */ - @Override - public Boolean restrictedWindow() throws PulseException { - return dao.restrictedWindow(); - } + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.AdHocRefreshService#restrictedWindow() + */ + @Override + public Boolean restrictedWindow() throws PulseException { + return dao.restrictedWindow(); + } - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.AdHocRefreshService#getRefreshStatus() - */ - @Override - public AdhocRefreshStatus getRefreshStatus(int siteCount) throws PulseException{ - return dao.getRefreshStatus(siteCount); - } -} + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.AdHocRefreshService#getRefreshStatus() + */ + @Override + public AdhocRefreshStatus getRefreshStatus(int siteCount) throws PulseException { + return dao.getRefreshStatus(siteCount); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/AdminServiceImpl.java =================================================================== diff -u -r54af28f91298ad9bec31eb456b459a890ea17752 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/AdminServiceImpl.java (.../AdminServiceImpl.java) (revision 54af28f91298ad9bec31eb456b459a890ea17752) +++ src/main/java/com/napa/pulse/service/impl/AdminServiceImpl.java (.../AdminServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -181,4 +181,4 @@ return siteRepository.findInactiveSites(); } -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/FeatureAccessServiceImpl.java =================================================================== diff -u -r02dc98b890901f842c0bab7fa03fe6e7ec65e03c -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/FeatureAccessServiceImpl.java (.../FeatureAccessServiceImpl.java) (revision 02dc98b890901f842c0bab7fa03fe6e7ec65e03c) +++ src/main/java/com/napa/pulse/service/impl/FeatureAccessServiceImpl.java (.../FeatureAccessServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,36 +1,38 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.FeatureAccessDAO; import com.napa.pulse.dto.ActionResult; import com.napa.pulse.service.interfaces.FeatureAccessService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + @Service -public class FeatureAccessServiceImpl implements FeatureAccessService{ +public class FeatureAccessServiceImpl implements FeatureAccessService { - @Autowired - private FeatureAccessDAO featureAccessDAO; - - public List> getAccessItems(){ - return featureAccessDAO.getAccessItems(); - } - - public List> getRoleAccess(){ - return featureAccessDAO.getRoleAccess(); - } - - public ActionResult updateFeatureAccess(Integer accessItemId, Integer[] roleIdsArray){ - return featureAccessDAO.updateFeatureAccess(accessItemId, roleIdsArray); - } + @Autowired + private FeatureAccessDAO featureAccessDAO; - @Override - public ActionResult updateItemStatus(Integer accessItemId, String statusCode) { - - return featureAccessDAO.updateItemStatus(accessItemId, statusCode); - } -} + @Override + public List> getAccessItems() { + return featureAccessDAO.getAccessItems(); + } + + @Override + public List> getRoleAccess() { + return featureAccessDAO.getRoleAccess(); + } + + @Override + public ActionResult updateFeatureAccess(Integer accessItemId, Integer[] roleIdsArray) { + return featureAccessDAO.updateFeatureAccess(accessItemId, roleIdsArray); + } + + @Override + public ActionResult updateItemStatus(Integer accessItemId, String statusCode) { + return featureAccessDAO.updateItemStatus(accessItemId, statusCode); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/LoginServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/LoginServiceImpl.java (.../LoginServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/LoginServiceImpl.java (.../LoginServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,26 +1,23 @@ package com.napa.pulse.service.impl; +import com.napa.pulse.dao.interfaces.LoginDAO; +import com.napa.pulse.entity.pulseui.UserLoginRecord; +import com.napa.pulse.service.interfaces.LoginService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.napa.pulse.dao.interfaces.LoginDAO; -import com.napa.pulse.entity.pulseui.UserLoginRecord; -import com.napa.pulse.service.interfaces.LoginService; - @Service public class LoginServiceImpl implements LoginService { - @Autowired - private LoginDAO loginDAO; + @Autowired + private LoginDAO loginDAO; - @Override - @Transactional - public void addUserLoginInfo(int userId, String loginUrl, int screenWidth, int screenHeight, int browserWidth, int browserHeight) { + @Override + @Transactional + public void addUserLoginInfo(int userId, String loginUrl, int screenWidth, int screenHeight, int browserWidth, int browserHeight) { + UserLoginRecord record = new UserLoginRecord(userId, loginUrl, screenWidth, screenHeight, browserWidth, browserHeight); + loginDAO.addUserLoginRecord(record); + } - UserLoginRecord record = new UserLoginRecord(userId, loginUrl, screenWidth, screenHeight, browserWidth, browserHeight); - - loginDAO.addUserLoginRecord(record); - } - -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/MIOExternalServiceImpl.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/MIOExternalServiceImpl.java (.../MIOExternalServiceImpl.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/service/impl/MIOExternalServiceImpl.java (.../MIOExternalServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,22 +1,22 @@ package com.napa.pulse.service.impl; +import com.napa.pulse.dao.interfaces.MIOExternalDAO; +import com.napa.pulse.service.interfaces.MIOExternalService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; + import java.util.Date; import java.util.List; import java.util.Map; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - -import com.napa.pulse.dao.interfaces.MIOExternalDAO; -import com.napa.pulse.service.interfaces.MIOExternalService; - @Service public class MIOExternalServiceImpl implements MIOExternalService { - - @Autowired - MIOExternalDAO mioExternalDAO; - - public List> getMIOReturnData(Date targetDt) throws Exception { - return mioExternalDAO.getMIOReturnData(targetDt); - } -} + + @Autowired + MIOExternalDAO mioExternalDAO; + + public List> getMIOReturnData(Date targetDt) throws Exception { + return mioExternalDAO.getMIOReturnData(targetDt); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/MajorAccountServiceImpl.java =================================================================== diff -u -r7db254371d28a2cfdc1e1e5895885e189567a7bb -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/MajorAccountServiceImpl.java (.../MajorAccountServiceImpl.java) (revision 7db254371d28a2cfdc1e1e5895885e189567a7bb) +++ src/main/java/com/napa/pulse/service/impl/MajorAccountServiceImpl.java (.../MajorAccountServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,40 +1,25 @@ package com.napa.pulse.service.impl; -import java.sql.SQLException; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; -import java.util.Map; -import java.util.stream.Collectors; -import java.util.stream.StreamSupport; - +import com.napa.pulse.dao.interfaces.MajorAccountSiteDAO; +import com.napa.pulse.dto.MajorAccountSiteDTO; +import com.napa.pulse.dto.SiteInvCollTemplate; +import com.napa.pulse.entity.pulseui.*; +import com.napa.pulse.entity.security.User; +import com.napa.pulse.repository.*; +import com.napa.pulse.service.interfaces.MajorAccountService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.data.jpa.repository.Modifying; import org.springframework.stereotype.Service; import org.springframework.transaction.annotation.Transactional; -import com.napa.pulse.dao.interfaces.MajorAccountSiteDAO; -import com.napa.pulse.dto.MajorAccountSiteDTO; -import com.napa.pulse.dto.SiteInvCollTemplate; -import com.napa.pulse.entity.pulseui.ExportColumn; -import com.napa.pulse.entity.pulseui.InvestmentCollection; -import com.napa.pulse.entity.pulseui.InvestmentCollectionTemplate; -import com.napa.pulse.entity.pulseui.MajorAccount; -import com.napa.pulse.entity.pulseui.MajorAccountExportColumn; -import com.napa.pulse.entity.pulseui.MajorAccountExportColumnComparator; -import com.napa.pulse.entity.pulseui.MajorAccountExportColumnId; -import com.napa.pulse.entity.pulseui.PricingProfile; -import com.napa.pulse.entity.pulseui.Site; -import com.napa.pulse.entity.security.User; -import com.napa.pulse.repository.ExportColumnNameRepository; -import com.napa.pulse.repository.InvCollTemplateRepository; -import com.napa.pulse.repository.InvestmentCollectionRepository; -import com.napa.pulse.repository.MajorAccountRepository; -import com.napa.pulse.repository.PricingProfileRepository; -import com.napa.pulse.repository.SiteRepository; -import com.napa.pulse.service.interfaces.MajorAccountService; +import java.sql.SQLException; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; +import java.util.Map; +import java.util.stream.Collectors; @Service public class MajorAccountServiceImpl implements MajorAccountService { @@ -52,9 +37,9 @@ @Autowired private InvestmentCollectionRepository investmentCollectionRepository; - + @Autowired - private InvCollTemplateRepository invCollTemplateRepository; + private InvCollTemplateRepository invCollTemplateRepository; @Autowired private SiteRepository siteRepository; @@ -64,153 +49,157 @@ @Override public Iterable getAllMajorAccounts(boolean includeInactive) { - Iterable allColumns = getAllExportColumnNames(); - Iterable majorAccounts; - if(includeInactive) { - majorAccounts = majorAccountRepository.findAll(); - } - else { - majorAccounts = majorAccountRepository.findByActive(true); - } - majorAccounts.forEach((account) -> { - List newColumns = new ArrayList<>(); - Map map = StreamSupport - .stream(account.getExportColumns().spliterator(), false) - .collect(Collectors.toMap((item) -> item.getId().getExportColumn().getId(), (item) -> item)); - for (ExportColumn column : allColumns) { - MajorAccountExportColumn selectedColumn = map.get(column.getId()); - if (selectedColumn == null) { - MajorAccountExportColumn availableColumn = new MajorAccountExportColumn(); - MajorAccountExportColumnId id = new MajorAccountExportColumnId(); - id.setExportColumn(column); - availableColumn.setId(id); - availableColumn.setOrder(column.getColumnOrder()); - availableColumn.setSelected(false); - newColumns.add(availableColumn); - } - else { - newColumns.add(selectedColumn); - } - } - newColumns.sort(new MajorAccountExportColumnComparator()); - account.setExportColumns(newColumns); + Iterable allColumns = getAllExportColumnNames(); + Iterable majorAccounts; - }); - return majorAccounts; + if (includeInactive) { + majorAccounts = majorAccountRepository.findAll(); + } else { + majorAccounts = majorAccountRepository.findByActive(true); + } + + majorAccounts.forEach((account) -> { + List newColumns = new ArrayList<>(); + Map map = account.getExportColumns() + .stream() + .collect(Collectors.toMap((item) -> item.getId().getExportColumn().getId(), (item) -> item)); + + for (ExportColumn column : allColumns) { + MajorAccountExportColumn selectedColumn = map.get(column.getId()); + if (selectedColumn == null) { + MajorAccountExportColumn availableColumn = new MajorAccountExportColumn(); + MajorAccountExportColumnId id = new MajorAccountExportColumnId(); + id.setExportColumn(column); + availableColumn.setId(id); + availableColumn.setOrder(column.getColumnOrder()); + availableColumn.setSelected(false); + newColumns.add(availableColumn); + } else { + newColumns.add(selectedColumn); + } + } + + newColumns.sort(new MajorAccountExportColumnComparator()); + account.setExportColumns(newColumns); + }); + + return majorAccounts; } @Override @Transactional @Modifying public MajorAccount saveMajorAccount(MajorAccount majorAccount) { - // enforce/correct column order - List reqList = new ArrayList<>(); - List optList = new ArrayList<>(); - for(MajorAccountExportColumn column : majorAccount.getExportColumns()) { - if(column.getId().getExportColumn().isRequired()) { - reqList.add(column); - } - else { - optList.add(column); - } - } - int order = 0; - // sort the required columns based on their underlying order in export_column - reqList.sort((c1, c2) -> c1.getId().getExportColumn().getColumnOrder() < c2.getId().getExportColumn().getColumnOrder() ? -1 : 1); - // sort the option columns based on their order in ma_export_column - optList.sort((c1, c2) -> c1.getOrder() < c2.getOrder() ? -1 : 1); - // now assign their column order, first the required columns, then the optional in their requested order - for(MajorAccountExportColumn column : reqList) { - column.setOrder(order++); - column.setSelected(true); - } - for(MajorAccountExportColumn column : optList) { - column.setOrder(order++); - } - - return majorAccountRepository.save(majorAccount); + // enforce/correct column order + List reqList = new ArrayList<>(); + List optList = new ArrayList<>(); + + for (MajorAccountExportColumn column : majorAccount.getExportColumns()) { + if (column.getId().getExportColumn().isRequired()) { + reqList.add(column); + } else { + optList.add(column); + } + } + + int order = 0; + // sort the required columns based on their underlying order in export_column + reqList.sort((c1, c2) -> c1.getId().getExportColumn().getColumnOrder() < c2.getId().getExportColumn().getColumnOrder() ? -1 : 1); + // sort the option columns based on their order in ma_export_column + optList.sort((c1, c2) -> c1.getOrder() < c2.getOrder() ? -1 : 1); + // now assign their column order, first the required columns, then the optional in their requested order + + for (MajorAccountExportColumn column : reqList) { + column.setOrder(order++); + column.setSelected(true); + } + + for (MajorAccountExportColumn column : optList) { + column.setOrder(order++); + } + + return majorAccountRepository.save(majorAccount); } - + @Override public void deleteMajorAccount(Long majorAccountId) { - majorAccountRepository.deleteById(majorAccountId); + majorAccountRepository.deleteById(majorAccountId); } @Override public Iterable getAllExportColumnNames() { - return exportColumnNameRepository.findByExportTypeOrderByColumnOrder("major_account"); + return exportColumnNameRepository.findByExportTypeOrderByColumnOrder("major_account"); } @Override public Iterable getAllInvestmentCollections() { - return investmentCollectionRepository.findAll(); + return investmentCollectionRepository.findAll(); } - + @Override public Iterable getInvestmentCollectionsForSites(Integer[] siteIds) { return investmentCollectionRepository.loadBySiteId(Arrays.asList(siteIds)); } @Override public InvestmentCollection saveInvestmentCollection(InvestmentCollection investmentCollection) { - return investmentCollectionRepository.save(investmentCollection); + return investmentCollectionRepository.save(investmentCollection); } @Override public Iterable getAllPricingProfiles() { - return pricingProfileRepository.findAll(); + return pricingProfileRepository.findAll(); } @Override public Iterable getAllServicingStoresForDc(int dcId) { - return siteRepository.getAllServicingStoresForDc(dcId); + return siteRepository.getAllServicingStoresForDc(dcId); } @Override public Iterable getAllServicingDcs() { - return siteRepository.findAllServicingDcs(); + return siteRepository.findAllServicingDcs(); } @Override public void updateSite(User user, MajorAccountSiteDTO site) { - majorAccountSiteDao.updateSite(user, site); + majorAccountSiteDao.updateSite(user, site); } @Override public void createSite(User user, MajorAccountSiteDTO site) throws Exception { - int newSiteId = majorAccountSiteDao.createSite(user, site); + majorAccountSiteDao.createSite(user, site); } @Override public MajorAccountSiteDTO getSiteDetails(Long siteId) { - return majorAccountSiteDao.getSiteDetails(siteId); + return majorAccountSiteDao.getSiteDetails(siteId); } - + @Override public Iterable getAllInvestmentCollectionTemplates(boolean includeInactive) { - if(includeInactive) { - return invCollTemplateRepository.findAllByOrderByName(); - } - return invCollTemplateRepository.findByActiveOrderByName(true); + if (includeInactive) { + return invCollTemplateRepository.findAllByOrderByName(); + } + return invCollTemplateRepository.findByActiveOrderByName(true); } - + @Override - public InvestmentCollectionTemplate saveInvestmentCollectionTemplate( - InvestmentCollectionTemplate investmentCollectionTemplate) { - if(investmentCollectionTemplate.getId() > 0) { - investmentCollectionRepository.saveAll(investmentCollectionTemplate.getInvestmentCollections()); - } + public InvestmentCollectionTemplate saveInvestmentCollectionTemplate(InvestmentCollectionTemplate investmentCollectionTemplate) { + if (investmentCollectionTemplate.getId() > 0) { + investmentCollectionRepository.saveAll(investmentCollectionTemplate.getInvestmentCollections()); + } return invCollTemplateRepository.save(investmentCollectionTemplate); } - + @Override public void updateInvestmentCollectionForSites(Long investmentCollectionTemplateId, Long[] siteIds) { - majorAccountSiteDao.updateSitesMajorAcccount(siteIds, investmentCollectionTemplateId); - + majorAccountSiteDao.updateSitesMajorAcccount(siteIds, investmentCollectionTemplateId); } - + @Override public Iterable getInvCollTemplatesForSites(Integer[] siteIds) throws SQLException { - return majorAccountSiteDao.getInvCollTemplatesForSites(siteIds); + return majorAccountSiteDao.getInvCollTemplatesForSites(siteIds); } -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/MarketSelectionServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/MarketSelectionServiceImpl.java (.../MarketSelectionServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/MarketSelectionServiceImpl.java (.../MarketSelectionServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,58 +1,58 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.MarketSelectionDAO; import com.napa.pulse.dto.ZipcodeDTO; import com.napa.pulse.service.interfaces.MarketSelectionService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + @Service -public class MarketSelectionServiceImpl implements MarketSelectionService{ +public class MarketSelectionServiceImpl implements MarketSelectionService { - @Autowired - private MarketSelectionDAO marketDetailsDAO; - - public List> getTop100AppsList(Integer siteId){ - return marketDetailsDAO.getTop100AppsList(siteId); - } - - @Override - public List> getAllZipCodeDetails(Integer siteId) throws Exception { - return marketDetailsDAO.getAllZipCodeDetails(siteId); - } - - @Override - public List> getSiteCoordinatesForSession(Integer sessionId) { - return marketDetailsDAO.getSiteCoordinatesForSession(sessionId); - } - - public List> getSessionTop100AppsList(Integer sessionId, Integer siteId){ - return marketDetailsDAO.getSessionTop100AppsList(sessionId, siteId); - } - - public List> getTop100AppsList(String[] zipCodes){ - return marketDetailsDAO.getTop100AppsList(zipCodes); - } - - public List> getSessionAllZipCodeDetails(Integer sessionId, Integer siteId) throws Exception{ - return marketDetailsDAO.getSessionAllZipCodeDetails(sessionId, siteId); - } - - public List> getSiteCoordinates(Integer[] list){ - return marketDetailsDAO.getSiteCoordinates(list); - } + @Autowired + private MarketSelectionDAO marketDetailsDAO; - @Override - public List validateZipcodes(String[] list) throws Exception{ - return marketDetailsDAO.validateZipcodes(list); - } + public List> getTop100AppsList(Integer siteId) { + return marketDetailsDAO.getTop100AppsList(siteId); + } - @Override - public void updateZipcode(Integer siteId, String[] list) { - marketDetailsDAO.updateZipcode(siteId, list); - } -} + @Override + public List> getAllZipCodeDetails(Integer siteId) throws Exception { + return marketDetailsDAO.getAllZipCodeDetails(siteId); + } + + @Override + public List> getSiteCoordinatesForSession(Integer sessionId) { + return marketDetailsDAO.getSiteCoordinatesForSession(sessionId); + } + + public List> getSessionTop100AppsList(Integer sessionId, Integer siteId) { + return marketDetailsDAO.getSessionTop100AppsList(sessionId, siteId); + } + + public List> getTop100AppsList(String[] zipCodes) { + return marketDetailsDAO.getTop100AppsList(zipCodes); + } + + public List> getSessionAllZipCodeDetails(Integer sessionId, Integer siteId) throws Exception { + return marketDetailsDAO.getSessionAllZipCodeDetails(sessionId, siteId); + } + + public List> getSiteCoordinates(Integer[] list) { + return marketDetailsDAO.getSiteCoordinates(list); + } + + @Override + public List validateZipcodes(String[] list) throws Exception { + return marketDetailsDAO.validateZipcodes(list); + } + + @Override + public void updateZipcode(Integer siteId, String[] list) { + marketDetailsDAO.updateZipcode(siteId, list); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/MessagesServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/MessagesServiceImpl.java (.../MessagesServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/MessagesServiceImpl.java (.../MessagesServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,75 +1,71 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.MessagesDAO; import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.ImagesDTO; import com.napa.pulse.dto.Messages; import com.napa.pulse.entity.security.User; import com.napa.pulse.service.interfaces.MessagesService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + /** * Business Service Implementation for the messages + * * @author Diana Ivan * Created: Apr 02, 2015 */ @Service -public class MessagesServiceImpl implements MessagesService{ - - @Autowired - private MessagesDAO messagesDAO; - +public class MessagesServiceImpl implements MessagesService { - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.MessagesService#getMessagesTypes() - */ - @Override - public List> getMessagesTypes() { - return messagesDAO.getMessagesTypes(); - } - - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.MessagesService#updateMessageFlags(java.lang.Integer, java.lang.Integer, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean) - */ - @Override - public ActionResult updateMessageFlags(Integer userId, Integer messageId, Boolean starred, Boolean deleted, Boolean read){ - int updatedRows = messagesDAO.updateMessageFlags(userId, messageId, starred, deleted, read); - if (updatedRows > 0) { - return new ActionResult(true); - } - else { - return new ActionResult(false); - } - } - - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.MessagesService#getMessageDetails(int) - */ - @Override - public List getMessageDetails(User toUserId) - { - return messagesDAO.getMessageDetails(toUserId); - } - - public ActionResult publishMessage(Messages messages){ - if(messages.isBroadcast()){ - List userList = messagesDAO.getAllUsers(); - messages.setUserIdArray(userList.toArray(new Integer[0])); - } + @Autowired + private MessagesDAO messagesDAO; - return messagesDAO.publishMessage(messages); - } - + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.MessagesService#getMessagesTypes() + */ + @Override + public List> getMessagesTypes() { + return messagesDAO.getMessagesTypes(); + } - public ImagesDTO getImages(HttpServletRequest request){ - return messagesDAO.getImages(request); - } + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.MessagesService#updateMessageFlags(java.lang.Integer, java.lang.Integer, java.lang.Boolean, java.lang.Boolean, java.lang.Boolean) + */ + @Override + public ActionResult updateMessageFlags(Integer userId, Integer messageId, Boolean starred, Boolean deleted, Boolean read) { + int updatedRows = messagesDAO.updateMessageFlags(userId, messageId, starred, deleted, read); + if (updatedRows > 0) { + return new ActionResult(true); + } else { + return new ActionResult(false); + } + } -} + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.MessagesService#getMessageDetails(int) + */ + @Override + public List getMessageDetails(User toUserId) { + return messagesDAO.getMessageDetails(toUserId); + } + + public ActionResult publishMessage(Messages messages) { + if (messages.isBroadcast()) { + List userList = messagesDAO.getAllUsers(); + messages.setUserIdArray(userList.toArray(new Integer[0])); + } + + return messagesDAO.publishMessage(messages); + } + + @Override + public ImagesDTO getImages(HttpServletRequest request) { + return messagesDAO.getImages(request); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/NicheStockingServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/NicheStockingServiceImpl.java (.../NicheStockingServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/NicheStockingServiceImpl.java (.../NicheStockingServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,44 +1,38 @@ -/** - * - */ package com.napa.pulse.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.NicheStockingDAO; import com.napa.pulse.dto.NicheCategoryDTO; import com.napa.pulse.dto.NicheCategoryHierarchyDTO; import com.napa.pulse.dto.NicheStockingDTO; import com.napa.pulse.entity.security.User; import com.napa.pulse.exception.PulseException; import com.napa.pulse.service.interfaces.NicheStockingService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + /** * @author PCTR98154 - * */ @Service public class NicheStockingServiceImpl implements NicheStockingService { - - @Autowired - NicheStockingDAO dao; - - /* (non-Javadoc) - * @see com.napa.pulse.service.NicheStockingService#getNicheStockingSite(int) - */ - @Override - public List getNicheStockingSite(int siteId, User user) { - return dao.getNicheStockingSite(siteId, user); - } - - @Override - public void updateNicheStockingSite(Integer siteId, NicheCategoryDTO[] nicheArray, NicheCategoryHierarchyDTO[] hierarchyArray) - throws PulseException { - dao.updateNicheStockingSite(siteId, nicheArray, hierarchyArray); - } + @Autowired + NicheStockingDAO dao; -} + /* (non-Javadoc) + * @see com.napa.pulse.service.NicheStockingService#getNicheStockingSite(int) + */ + @Override + public List getNicheStockingSite(int siteId, User user) { + return dao.getNicheStockingSite(siteId, user); + } + + @Override + public void updateNicheStockingSite(Integer siteId, NicheCategoryDTO[] nicheArray, + NicheCategoryHierarchyDTO[] hierarchyArray) throws PulseException { + dao.updateNicheStockingSite(siteId, nicheArray, hierarchyArray); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/ParametersServiceImpl.java =================================================================== diff -u -rd5ba118de982d4833be1be9845e0a80ada95008d -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/ParametersServiceImpl.java (.../ParametersServiceImpl.java) (revision d5ba118de982d4833be1be9845e0a80ada95008d) +++ src/main/java/com/napa/pulse/service/impl/ParametersServiceImpl.java (.../ParametersServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,12 +1,5 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.napa.pulse.dao.interfaces.ParametersDAO; import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.ParameterStatDataDTO; @@ -15,106 +8,112 @@ import com.napa.pulse.entity.security.User; import com.napa.pulse.exception.PulseException; import com.napa.pulse.service.interfaces.ParametersService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Map; + /** * Business Service Implementation for the parameters page + * * @author Diana Ivan * Created: Dec 10, 2014 */ @Service -public class ParametersServiceImpl implements ParametersService{ +public class ParametersServiceImpl implements ParametersService { - @Autowired - private ParametersDAO parametersDao; + @Autowired + private ParametersDAO parametersDao; - @Override - @Transactional - public Map getHierarchyTree(User user) { - return parametersDao.getHierarchyTree(user); - } - - @Override - @Transactional - public List getLevel4ChildrenBySite(int node, int siteId, User user) { - return parametersDao.getLevel4ChildrenBySite(node, siteId, user); - } + @Override + @Transactional + public Map getHierarchyTree(User user) { + return parametersDao.getHierarchyTree(user); + } - - @Override - public List loadSiteParamForHierachyIds(int siteId, Integer[] nodeArray, Integer sessionId) { - return parametersDao.loadSiteParamForHierachyIds(siteId, nodeArray, sessionId); - } - - @Override - public ActionResult saveSliderValue(int siteId, int nodeId, Integer sessionId, float newOffset, int userId) - throws PulseException{ - parametersDao.saveSliderValue(siteId, nodeId, sessionId, newOffset, userId); - return new ActionResult(true); - } - - @Override - public List> getBarChartData(int siteId, int nodeId){ - return parametersDao.getBarChartData(siteId, nodeId); - } + @Override + @Transactional + public List getLevel4ChildrenBySite(int node, int siteId, User user) { + return parametersDao.getLevel4ChildrenBySite(node, siteId, user); + } - @Override - public ActionResult linkToParent(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException { - parametersDao.linkToParent(siteId, nodeId, sessionId, userId); - return new ActionResult(true); - } - - @Override - public ActionResult linkAllChildren(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException { - parametersDao.linkAllChildren(siteId, nodeId, sessionId, userId); - return new ActionResult(true); - } - - @Override - public ActionResult unlinkFromParent(int siteId, int nodeId, int userId) throws PulseException { - parametersDao.unlinkFromParent(siteId, nodeId, userId); - return new ActionResult(true); - } - - @Override - public ActionResult doNotStock(int nodeId, int siteId, boolean doNotStock, Integer sessionId, int userId) throws PulseException { - parametersDao.doNotStock(nodeId, siteId, doNotStock, sessionId, userId); - return new ActionResult(true); - } - - @Override - public ActionResult revertToRecommended(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException { - parametersDao.revertToRecommended(siteId, nodeId, sessionId, userId); - return new ActionResult(true); - } - - @Override - public ParameterStatDataDTO loadStatDataForHierarchyId(int siteId, int nodeId, Integer sessionId) { - return parametersDao.loadStatDataForHierarchyId(siteId, nodeId, sessionId); - } - - @Override - public List loadStatDataForHierarchyIds(int siteId, Integer[] nodeArray, Integer sessionId) { - return parametersDao.loadStatDataForHierarchyIds(siteId, nodeArray, sessionId); - } - - @Override - public void updateIgnoreStock(User user, int siteId, int nodeId, int period, Integer sessionId) throws PulseException { - parametersDao.updateIgnoreStock(user, siteId, nodeId, period, sessionId); - } - - @Override - public void unreviewedHierarchy(int siteId, int nodeId, Integer sessionId) throws PulseException { - parametersDao.unreviewedHierarchy(siteId, nodeId, sessionId); - } - - @Override - public void updateGlobalIgnoreStock(int siteId, int isp) throws PulseException { - parametersDao.updateGlobalIgnoreStock(siteId, isp); - } - - @Override - public void resetAllToRecommended(int siteId) throws PulseException { - parametersDao.resetAllToRecommended(siteId); - } - -} + @Override + public List loadSiteParamForHierachyIds(int siteId, Integer[] nodeArray, Integer sessionId) { + return parametersDao.loadSiteParamForHierachyIds(siteId, nodeArray, sessionId); + } + + @Override + public ActionResult saveSliderValue(int siteId, int nodeId, Integer sessionId, float newOffset, int userId) + throws PulseException { + parametersDao.saveSliderValue(siteId, nodeId, sessionId, newOffset, userId); + return new ActionResult(true); + } + + @Override + public List> getBarChartData(int siteId, int nodeId) { + return parametersDao.getBarChartData(siteId, nodeId); + } + + @Override + public ActionResult linkToParent(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException { + parametersDao.linkToParent(siteId, nodeId, sessionId, userId); + return new ActionResult(true); + } + + @Override + public ActionResult linkAllChildren(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException { + parametersDao.linkAllChildren(siteId, nodeId, sessionId, userId); + return new ActionResult(true); + } + + @Override + public ActionResult unlinkFromParent(int siteId, int nodeId, int userId) throws PulseException { + parametersDao.unlinkFromParent(siteId, nodeId, userId); + return new ActionResult(true); + } + + @Override + public ActionResult doNotStock(int nodeId, int siteId, boolean doNotStock, Integer sessionId, int userId) throws PulseException { + parametersDao.doNotStock(nodeId, siteId, doNotStock, sessionId, userId); + return new ActionResult(true); + } + + @Override + public ActionResult revertToRecommended(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException { + parametersDao.revertToRecommended(siteId, nodeId, sessionId, userId); + return new ActionResult(true); + } + + @Override + public ParameterStatDataDTO loadStatDataForHierarchyId(int siteId, int nodeId, Integer sessionId) { + return parametersDao.loadStatDataForHierarchyId(siteId, nodeId, sessionId); + } + + @Override + public List loadStatDataForHierarchyIds(int siteId, Integer[] nodeArray, Integer sessionId) { + return parametersDao.loadStatDataForHierarchyIds(siteId, nodeArray, sessionId); + } + + @Override + public void updateIgnoreStock(User user, int siteId, int nodeId, int period, Integer sessionId) throws PulseException { + parametersDao.updateIgnoreStock(user, siteId, nodeId, period, sessionId); + } + + @Override + public void unreviewedHierarchy(int siteId, int nodeId, Integer sessionId) throws PulseException { + parametersDao.unreviewedHierarchy(siteId, nodeId, sessionId); + } + + @Override + public void updateGlobalIgnoreStock(int siteId, int isp) throws PulseException { + parametersDao.updateGlobalIgnoreStock(siteId, isp); + } + + @Override + public void resetAllToRecommended(int siteId) throws PulseException { + parametersDao.resetAllToRecommended(siteId); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/ProductGroupServiceImpl.java =================================================================== diff -u -re7063fc6b7c52ce71826b3f71017d983293b47d3 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/ProductGroupServiceImpl.java (.../ProductGroupServiceImpl.java) (revision e7063fc6b7c52ce71826b3f71017d983293b47d3) +++ src/main/java/com/napa/pulse/service/impl/ProductGroupServiceImpl.java (.../ProductGroupServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,13 +1,5 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - -import org.apache.commons.lang.StringUtils; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; -import org.springframework.transaction.annotation.Transactional; - import com.napa.pulse.dao.interfaces.ProductGroupDAO; import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.ActionResultItem; @@ -18,105 +10,108 @@ import com.napa.pulse.entity.security.User; import com.napa.pulse.service.interfaces.ProductGroupService; import com.napa.pulse.utils.Utility; +import org.apache.commons.lang.StringUtils; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import org.springframework.transaction.annotation.Transactional; +import java.util.List; +import java.util.Map; + @Service @Transactional public class ProductGroupServiceImpl implements ProductGroupService { - - @Autowired - private ProductGroupDAO productGroupDAO; - - - @Override - public List getProductGroups(Integer userId){ - return productGroupDAO.getProductGroups(userId); - } - - @Override - public ActionResultItem> getProductsByGroup(User user, Integer groupId){ - - - if (productGroupDAO.isProductGroupForUser(user.getUserId(), groupId)){ - return new ActionResultItem<>(productGroupDAO.getProductsByGroup(groupId, user)); - } - else { - return new ActionResultItem<>("groupUnavailable"); - } - } - - @Override - public ActionResultItem> getFullHierarchy(User user){ - return new ActionResultItem<>(productGroupDAO.getFullHierarchy(user)); - } - - @Override - public List getProductGroupTypes(User user){ - return productGroupDAO.getProductGroupTypes(user); - } - - @Override - public ActionResultItem createNewProductGroup(User user, String groupName, Integer groupType, String listOfHierarchiesString){ - - // first check if the name belongs to any global group. If so do not allow the user to create a group - boolean exists = productGroupDAO.checkProductGroupExists(groupName, user.getUserId()); - - if (exists) { - //TODO: add language translation - return new ActionResultItem<>("groupNameExists"); - } - else { - return new ActionResultItem<>(productGroupDAO.create(user.getUserId(), groupName, groupType, + + @Autowired + private ProductGroupDAO productGroupDAO; + + @Override + public List getProductGroups(Integer userId) { + return productGroupDAO.getProductGroups(userId); + } + + @Override + public ActionResultItem> getProductsByGroup(User user, Integer groupId) { + if (productGroupDAO.isProductGroupForUser(user.getUserId(), groupId)) { + return new ActionResultItem<>(productGroupDAO.getProductsByGroup(groupId, user)); + } else { + return new ActionResultItem<>("groupUnavailable"); + } + } + + @Override + public ActionResultItem> getFullHierarchy(User user) { + return new ActionResultItem<>(productGroupDAO.getFullHierarchy(user)); + } + + @Override + public List getProductGroupTypes(User user) { + return productGroupDAO.getProductGroupTypes(user); + } + + @Override + public ActionResultItem createNewProductGroup(User user, String groupName, Integer groupType, + String listOfHierarchiesString) { + // first check if the name belongs to any global group. If so do not allow the user to create a group + boolean exists = productGroupDAO.checkProductGroupExists(groupName, user.getUserId()); + + if (exists) { + //TODO: add language translation + return new ActionResultItem<>("groupNameExists"); + } else { + return new ActionResultItem<>(productGroupDAO.create(user.getUserId(), groupName, groupType, Utility.parseProductGroupHierarchies(listOfHierarchiesString))); - } - } - - - @Override - public ActionResult addProductsToGroups(User user, String productIds, String groupIds){ - if (StringUtils.isEmpty(productIds)) - return new ActionResult("noProducts"); - if (StringUtils.isEmpty(groupIds)) - return new ActionResult("noProducts"); - - List groupIdList = Utility.parseIntegersAsArrayList(groupIds); - List newListOfHierarchies = Utility.parseProductGroupHierarchies(productIds); - - for (Integer gid : groupIdList) { - - if (productGroupDAO.isProductGroupForUser(user.getUserId(), gid)) { - productGroupDAO.addProductsToGroup(user.getUserId(), gid, newListOfHierarchies); - return new ActionResult(true); - } - else { - return new ActionResult("groupUnavailable"); - } - } - return new ActionResult(true); - } - + } + } + @Override + public ActionResult addProductsToGroups(User user, String productIds, String groupIds) { + if (StringUtils.isEmpty(productIds)) { + return new ActionResult("noProducts"); + } - @Override - public void saveKeyline(Integer userId,Integer siteId, String productListString) { - productGroupDAO.saveKeyline(userId, siteId, Utility.parseProductGroupHierarchies(productListString)); - } - - @Override - public ActionResultItem> getKeyline(Integer siteId, User user){ - return new ActionResultItem<>(productGroupDAO.getKeyline(siteId, user)); - } - - public void deleteProductGrp(Integer productGroupId){ - productGroupDAO.deleteProductGrp(productGroupId); - } - - public void updateProductGroup(Integer userId, Integer productGroupId, String newGroupName, Boolean newGlobalFlag, String newProductsString){ - - if(newProductsString != null){ - productGroupDAO.updateProductGroupMapping(productGroupId, Utility.parseProductGroupHierarchies(newProductsString)); - } - - productGroupDAO.updateProductGroup(userId, productGroupId, newGroupName, newGlobalFlag); - } + if (StringUtils.isEmpty(groupIds)) { + return new ActionResult("noGroups"); + } -} + List groupIdList = Utility.parseIntegersAsArrayList(groupIds); + List newListOfHierarchies = Utility.parseProductGroupHierarchies(productIds); + + for (Integer gid : groupIdList) { + if (productGroupDAO.isProductGroupForUser(user.getUserId(), gid)) { + productGroupDAO.addProductsToGroup(user.getUserId(), gid, newListOfHierarchies); + return new ActionResult(true); + } else { + return new ActionResult("groupUnavailable"); + } + } + + return new ActionResult(true); + } + + @Override + public void saveKeyline(Integer userId, Integer siteId, String productListString) { + productGroupDAO.saveKeyline(userId, siteId, Utility.parseProductGroupHierarchies(productListString)); + } + + @Override + public ActionResultItem> getKeyline(Integer siteId, User user) { + return new ActionResultItem<>(productGroupDAO.getKeyline(siteId, user)); + } + + @Override + public void deleteProductGrp(Integer productGroupId) { + productGroupDAO.deleteProductGrp(productGroupId); + } + + @Override + public void updateProductGroup(Integer userId, Integer productGroupId, String newGroupName, Boolean newGlobalFlag, + String newProductsString) { + if (newProductsString != null) { + productGroupDAO.updateProductGroupMapping(productGroupId, Utility.parseProductGroupHierarchies(newProductsString)); + } + + productGroupDAO.updateProductGroup(userId, productGroupId, newGroupName, newGlobalFlag); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/PulseConfigurationServiceImpl.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/PulseConfigurationServiceImpl.java (.../PulseConfigurationServiceImpl.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/service/impl/PulseConfigurationServiceImpl.java (.../PulseConfigurationServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,29 +1,22 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - +import com.napa.pulse.dao.interfaces.PulseConfigurationDAO; +import com.napa.pulse.service.interfaces.PulseConfigurationService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.napa.pulse.dao.interfaces.PulseConfigurationDAO; -import com.napa.pulse.service.interfaces.PulseConfigurationService; +import java.util.List; +import java.util.Map; @Service public class PulseConfigurationServiceImpl implements PulseConfigurationService { - - @Autowired - private PulseConfigurationDAO dao; - @Override - public List> getAllConfig() throws Exception { - return dao.getAllConfig(); - } + @Autowired + private PulseConfigurationDAO dao; - @Override - public void getSpecificConfig() throws Exception { - } - - + @Override + public List> getAllConfig() throws Exception { + return dao.getAllConfig(); + } -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/PulseDBRulesServicesImpl.java =================================================================== diff -u -r06afce5c6766e4a201850c86ad997c159e6290f1 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/PulseDBRulesServicesImpl.java (.../PulseDBRulesServicesImpl.java) (revision 06afce5c6766e4a201850c86ad997c159e6290f1) +++ src/main/java/com/napa/pulse/service/impl/PulseDBRulesServicesImpl.java (.../PulseDBRulesServicesImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,6 +1,5 @@ package com.napa.pulse.service.impl; - import com.napa.pulse.controller.rest.PulseDBRulesRestController; import com.napa.pulse.dao.interfaces.PulseDBRulesDAO; import com.napa.pulse.dto.RulesResponse; @@ -15,86 +14,81 @@ /** * @author Tathagata Bhattacharya - * + *

* Created on May 18, 2015 - * */ @Service public class PulseDBRulesServicesImpl implements PulseDBRulesServices { - - @Autowired - private PulseDBRulesDAO dao ; - - @Autowired - private PulseDBRulesServices services; - @Autowired - private InformaticaServiceClient informaticaServiceClient; - - private static final Logger LOGGER = LoggerFactory.getLogger(PulseDBRulesRestController.class); + @Autowired + private PulseDBRulesDAO dao; - /* (non-Javadoc) - * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callPulseRules() - */ - @Override - public List callPulseRules() throws Exception { - return dao.callPulseRules(); - } - - /* (non-Javadoc) - * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callPulseRulesOneSite(int) - */ - @Override - public void callPulseRulesOneSite(int siteId) throws Exception { - dao.callPulseRulesOneSite(siteId); - } - - /* (non-Javadoc) - * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callPulseRulesOneSite(int) - */ + @Autowired + private InformaticaServiceClient informaticaServiceClient; - @Override - public void callBusinessRulesForSites(Integer[] siteIds) throws Exception { - RulesResponse response = new RulesResponse(); - try { - dao.callBusinessRulesForSites(siteIds); - } catch (Exception e) { - response.setReturnMessage("Exception in Business Rules Execution for multiple sites..."); - LOGGER.error("Exception in Business Rules Execution for multiple sites...", e); - } - } + private static final Logger LOGGER = LoggerFactory.getLogger(PulseDBRulesRestController.class); - /* (non-Javadoc) - * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#terminatePulseRules() - */ - @Override - public void terminatePulseRules() throws Exception{ - dao.terminatePulseRules() ; - } + /* (non-Javadoc) + * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callPulseRules() + */ + @Override + public List callPulseRules() throws Exception { + return dao.callPulseRules(); + } - /* (non-Javadoc) - * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callUpdateSiteParameter() - */ - @Override - public List callUpdateSiteParameter() throws Exception{ - return dao.callUpdateSiteParameter() ; - } + /* (non-Javadoc) + * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callPulseRulesOneSite(int) + */ + @Override + public void callPulseRulesOneSite(int siteId) throws Exception { + dao.callPulseRulesOneSite(siteId); + } - /* (non-Javadoc) - * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#adHocRefreshStatus(int, int) - */ - @Override - public void adHocRefreshStatus(int statusId, int requestId) { - dao.adHocRefreshStatus(statusId, requestId); - } + /* (non-Javadoc) + * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callPulseRulesOneSite(int) + */ - @Override - public void adHocRefreshBR(int requestId) throws Exception { - Integer reqLogId = dao.adHocRefreshBR(requestId); - if (reqLogId != null) { - informaticaServiceClient.startWorkflowAdhoc(reqLogId); - } - } + @Override + public void callBusinessRulesForSites(Integer[] siteIds) throws Exception { + RulesResponse response = new RulesResponse(); + try { + dao.callBusinessRulesForSites(siteIds); + } catch (Exception e) { + response.setReturnMessage("Exception in Business Rules Execution for multiple sites..."); + LOGGER.error("Exception in Business Rules Execution for multiple sites...", e); + } + } -} + /* (non-Javadoc) + * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#terminatePulseRules() + */ + @Override + public void terminatePulseRules() throws Exception { + dao.terminatePulseRules(); + } + /* (non-Javadoc) + * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#callUpdateSiteParameter() + */ + @Override + public List callUpdateSiteParameter() throws Exception { + return dao.callUpdateSiteParameter(); + } + + /* (non-Javadoc) + * @see com.napa.pulse.businessrules.services.PulseDBRulesServices#adHocRefreshStatus(int, int) + */ + @Override + public void adHocRefreshStatus(int statusId, int requestId) { + dao.adHocRefreshStatus(statusId, requestId); + } + + @Override + public void adHocRefreshBR(int requestId) throws Exception { + Integer reqLogId = dao.adHocRefreshBR(requestId); + if (reqLogId != null) { + informaticaServiceClient.startWorkflowAdhoc(reqLogId); + } + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/PulseUtilityServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/PulseUtilityServiceImpl.java (.../PulseUtilityServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/PulseUtilityServiceImpl.java (.../PulseUtilityServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,42 +1,37 @@ -/** - * - */ package com.napa.pulse.service.impl; -import java.sql.SQLException; -import java.util.Map; - +import com.napa.pulse.dao.interfaces.PulseUtilityDao; +import com.napa.pulse.service.interfaces.PulseUtilityService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.napa.pulse.dao.interfaces.PulseUtilityDao; -import com.napa.pulse.service.interfaces.PulseUtilityService; +import java.sql.SQLException; +import java.util.Map; /** * @author PCTR98154 - * */ @Service public class PulseUtilityServiceImpl implements PulseUtilityService { - - @Autowired - PulseUtilityDao dao; - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.PulseUtilityService#getConnectionStats() - */ - @Override - public Map getConnectionStats() throws SQLException { - return dao.getConnectionStats(); - } + @Autowired + PulseUtilityDao dao; - /* (non-Javadoc) - * @see com.napa.pulse.service.interfaces.PulseUtilityService#healthCheck() - */ - @Override - public boolean healthCheck() throws Exception { - return dao.healthCheck(); - } + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.PulseUtilityService#getConnectionStats() + */ + @Override + public Map getConnectionStats() throws SQLException { + return dao.getConnectionStats(); + } -} + /* (non-Javadoc) + * @see com.napa.pulse.service.interfaces.PulseUtilityService#healthCheck() + */ + @Override + public boolean healthCheck() throws Exception { + return dao.healthCheck(); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/ReportsServiceImpl.java =================================================================== diff -u -r47001b70e8fa8e1ba24a282cfb3d628c2442f490 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/ReportsServiceImpl.java (.../ReportsServiceImpl.java) (revision 47001b70e8fa8e1ba24a282cfb3d628c2442f490) +++ src/main/java/com/napa/pulse/service/impl/ReportsServiceImpl.java (.../ReportsServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,22 +1,22 @@ package com.napa.pulse.service.impl; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.ReportsDAO; import com.napa.pulse.dto.ReportsDTO; import com.napa.pulse.entity.security.User; import com.napa.pulse.service.interfaces.ReportsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + @Service -public class ReportsServiceImpl implements ReportsService{ +public class ReportsServiceImpl implements ReportsService { - @Autowired - private ReportsDAO reportsDAO; - - public List getReports(User user){ - return reportsDAO.getReports(user); - } -} + @Autowired + private ReportsDAO reportsDAO; + + public List getReports(User user) { + return reportsDAO.getReports(user); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/ReviewServiceImpl.java =================================================================== diff -u -r6b5a553c729a1d10fac16a1732b2d0de6d2afab3 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/ReviewServiceImpl.java (.../ReviewServiceImpl.java) (revision 6b5a553c729a1d10fac16a1732b2d0de6d2afab3) +++ src/main/java/com/napa/pulse/service/impl/ReviewServiceImpl.java (.../ReviewServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -42,26 +42,28 @@ } @Override - public List> getSiteSKUDetailsTableData(Integer sessionId, Integer productId, Integer siteId, Integer vehicleCount) { + public List> getSiteSKUDetailsTableData(Integer sessionId, Integer productId, Integer siteId, + Integer vehicleCount) { return reviewDao.getSiteSKUDetailsTableData(sessionId, productId, siteId, vehicleCount); } @Override - public List> getSiteSKUDetailsTableDataCount( - int sessionId, int productId) { + public List> getSiteSKUDetailsTableDataCount(int sessionId, int productId) { return reviewDao.getSiteSKUDetailsTableDataCount(sessionId, productId); } @Override public ActionResultItem>> saveOrderReturn(User user, Integer sessionId, Integer siteId, Integer productId, - Integer orderQty, Double keepQty, Integer vehicleCount, boolean isSimilarPart, boolean isSimilarHubPart, Integer similarProductId, boolean isSimilarPartEdit) throws PulseException { - return reviewDao.saveOrderReturn(user, sessionId, siteId, productId, orderQty, keepQty, vehicleCount, isSimilarPart, isSimilarHubPart, similarProductId, isSimilarPartEdit); + Integer orderQty, Double keepQty, Integer vehicleCount, + boolean isSimilarPart, boolean isSimilarHubPart, + Integer similarProductId, boolean isSimilarPartEdit) throws PulseException { + return reviewDao.saveOrderReturn(user, sessionId, siteId, productId, orderQty, keepQty, vehicleCount, + isSimilarPart, isSimilarHubPart, similarProductId, isSimilarPartEdit); } @Override - public List> getUserViewPreference(Integer userId, - String preferenceKey) { + public List> getUserViewPreference(Integer userId, String preferenceKey) { return reviewDao.getUserViewPreference(userId, preferenceKey); } @@ -76,15 +78,14 @@ } @Override - public List> getUpdatedSiteSkuDetails(User user, - String mapFlag, Integer sessionId, Integer siteId, Integer productId, Integer vehicleCount) throws PulseException { + public List> getUpdatedSiteSkuDetails(User user, String mapFlag, Integer sessionId, Integer siteId, + Integer productId, Integer vehicleCount) throws PulseException { return reviewDao.getUpdatedSiteSkuDetails(user, mapFlag, sessionId, siteId, productId, vehicleCount); } @Override - public List> setMapFlagForList(Integer userId, String mapFlag, Integer sessionId, - Integer[] siteIds, Integer productId, Integer vehicleCount) throws PulseException { - + public List> setMapFlagForList(Integer userId, String mapFlag, Integer sessionId, Integer[] siteIds, + Integer productId, Integer vehicleCount) throws PulseException { return reviewDao.setMapFlagForList(userId, mapFlag, sessionId, siteIds, productId, vehicleCount); } @@ -118,19 +119,22 @@ return reviewDao.revertAllKeepsToRecomended(user, sessionId, productId); } - public ActionResultItem>> updateSkuTableWidgetSetReviewedList(Integer sessionId, SkuList[] skuListArr) { + public ActionResultItem>> updateSkuTableWidgetSetReviewedList(Integer sessionId, + SkuList[] skuListArr) { return reviewDao.updateSkuTableWidgetSetReviewedList(sessionId, skuListArr); } public ActionResultItem>> updateSkuTableWidgetSetReviewedFilter(SKUTableWidgetData skuTableWidgetData) { return reviewDao.updateSkuTableWidgetSetReviewedFilter(skuTableWidgetData); } - public List> getSimilarPartsWidgetData(Integer sessionId, Integer siteId, Integer productId, Integer vehicleCount, boolean f) { + public List> getSimilarPartsWidgetData(Integer sessionId, Integer siteId, Integer productId, + Integer vehicleCount, boolean f) { return reviewDao.getSimilarPartsWidgetData(sessionId, siteId, productId, vehicleCount, f); } - public List> getHubSimilarPartsWidgetData(Integer sessionId, Integer siteId, Integer productId, Integer vehicleCount, boolean f) { + public List> getHubSimilarPartsWidgetData(Integer sessionId, Integer siteId, Integer productId, + Integer vehicleCount, boolean f) { return reviewDao.getHubSimilarPartsWidgetData(sessionId, siteId, productId, vehicleCount, f); } Index: src/main/java/com/napa/pulse/service/impl/SessionAnalysisServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/SessionAnalysisServiceImpl.java (.../SessionAnalysisServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/SessionAnalysisServiceImpl.java (.../SessionAnalysisServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,52 +1,52 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.Map; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.SessionAnalysisDAO; import com.napa.pulse.dto.SessAnalysisStockingCatagoryDTO; import com.napa.pulse.dto.SessionAnalysisReturnBreakdownDTO; import com.napa.pulse.entity.security.User; import com.napa.pulse.service.interfaces.SessionAnalysisService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.Map; + @Service public class SessionAnalysisServiceImpl implements SessionAnalysisService { - @Autowired - private SessionAnalysisDAO sessionAnalysisDAO; - - public Integer getExpensiveItem(Integer sessionId){ - return sessionAnalysisDAO.getExpensiveItem(sessionId); - } - - public List> getRedUnlinkSliderCount(Integer sessionId){ - return sessionAnalysisDAO.getRedUnlinkSliderCount(sessionId); - } - - public SessAnalysisStockingCatagoryDTO getStockingCatagoryCount(Integer sessionId){ - return sessionAnalysisDAO.getStockingCatagoryCount(sessionId); - } - - public Integer getLargeOrderQty(Integer sessionId){ - return sessionAnalysisDAO.getLargeOrderQty(sessionId); - } - - public List> getHighSkuEdit(User user, Integer sessionId){ - return sessionAnalysisDAO.getHighSkuEdit(user, sessionId); - } + @Autowired + private SessionAnalysisDAO sessionAnalysisDAO; - public List> getNicheStockingCategory(User user, Integer sessionId){ - return sessionAnalysisDAO.getNicheStockingCategory(user, sessionId); - } - - public List> getPotentialHub(Integer sessionId){ - return sessionAnalysisDAO.getPotentialHub(sessionId); - } - - public List getReturnBreakdown(Integer sessionId){ - return sessionAnalysisDAO.getReturnBreakdown(sessionId); - } -} + public Integer getExpensiveItem(Integer sessionId) { + return sessionAnalysisDAO.getExpensiveItem(sessionId); + } + + public List> getRedUnlinkSliderCount(Integer sessionId) { + return sessionAnalysisDAO.getRedUnlinkSliderCount(sessionId); + } + + public SessAnalysisStockingCatagoryDTO getStockingCatagoryCount(Integer sessionId) { + return sessionAnalysisDAO.getStockingCatagoryCount(sessionId); + } + + public Integer getLargeOrderQty(Integer sessionId) { + return sessionAnalysisDAO.getLargeOrderQty(sessionId); + } + + public List> getHighSkuEdit(User user, Integer sessionId) { + return sessionAnalysisDAO.getHighSkuEdit(user, sessionId); + } + + public List> getNicheStockingCategory(User user, Integer sessionId) { + return sessionAnalysisDAO.getNicheStockingCategory(user, sessionId); + } + + public List> getPotentialHub(Integer sessionId) { + return sessionAnalysisDAO.getPotentialHub(sessionId); + } + + public List getReturnBreakdown(Integer sessionId) { + return sessionAnalysisDAO.getReturnBreakdown(sessionId); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java =================================================================== diff -u -rb4918c5f6b99f345f845905c8ee31757803b9c2c -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java (.../SessionServiceImpl.java) (revision b4918c5f6b99f345f845905c8ee31757803b9c2c) +++ src/main/java/com/napa/pulse/service/impl/SessionServiceImpl.java (.../SessionServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -38,8 +38,8 @@ */ @Override public List> getSessionList(String[] statusTypes, Integer[] siteIds, Integer[] siteGroups, - Integer[] statusIds, String[] createdDates, Integer[] createdByIds, User user, String userAccessSites, - String[] finalizeDateArray) throws Exception { + Integer[] statusIds, String[] createdDates, Integer[] createdByIds, + User user, String userAccessSites, String[] finalizeDateArray) throws Exception { return sessionDAO.getSessionList(statusTypes, siteIds, siteGroups, statusIds, createdDates, createdByIds, user, userAccessSites, finalizeDateArray); } @@ -59,12 +59,16 @@ * com.napa.pulse.entity.pulseui.ProductGroupOrderReturn[], * com.napa.pulse.entity.pulseui.HierarchyOrderReturn[]) */ + @Override public ActionResultItem createNewSession(User user, Boolean perCarOrder, Boolean includeFleets, - Boolean includeSystems, Boolean includeSpecials, Boolean includeObsoletes, Boolean includeOverstocks, - Boolean includeKeylinesOrders, Boolean includeKeylinesReturns, Boolean includeLessThanStdPkg, - Boolean useInvestmentCollections, Boolean provideStoreDepth, String comment, Integer siteGroupObj, - Integer[] sitesArray, ProductGroupOrderReturn[] productGroupsArray, SiteFleet[] fleetGroupsArray, - CustomProductGroup customProductGroup, String userAccessSites, Integer[] skuArray, Integer includeOrders, + Boolean includeSystems, Boolean includeSpecials, + Boolean includeObsoletes, Boolean includeOverstocks, + Boolean includeKeylinesOrders, Boolean includeKeylinesReturns, + Boolean includeLessThanStdPkg, Boolean useInvestmentCollections, + Boolean provideStoreDepth, String comment, Integer siteGroupObj, + Integer[] sitesArray, ProductGroupOrderReturn[] productGroupsArray, + SiteFleet[] fleetGroupsArray, CustomProductGroup customProductGroup, + String userAccessSites, Integer[] skuArray, Integer includeOrders, Integer includeReturns, Date expirationDate, String sessionType) throws Exception { /* * Single site vs Site Group change: - If a Saved Group was used then display @@ -152,6 +156,7 @@ * com.napa.pulse.service.interfaces.SessionService#finalizeSession(java.lang. * Integer, java.lang.Integer, com.napa.pulse.entity.pulseui.Transmission[]) */ + @Override public ActionResult finalizeSession(Integer userId, Integer sessionId, Transmission[] transmissionArray) { if (sessionDAO.isACO(sessionId)) { sessionDAO.finalizeACOSession(userId, sessionId, transmissionArray); @@ -172,6 +177,7 @@ * com.napa.pulse.service.interfaces.SessionService#getSessionTransmissions(java * .lang.Integer, java.lang.Integer) */ + @Override public ActionResultItem> getSessionTransmissions(User user, Integer sessionId) { return new ActionResultItem<>(sessionDAO.getSessionTransmissions(user, sessionId)); } @@ -183,6 +189,7 @@ * com.napa.pulse.service.interfaces.SessionService#resendTransmission(java.lang * .String, java.lang.Integer) */ + @Override public ActionResult resendTransmission(String orderReturn, int transmissionId) { if (sessionDAO.resendTransmission(orderReturn, transmissionId).isSuccess()) { // Sends Informatica an event that a session has been finalized @@ -199,8 +206,8 @@ * @see com.napa.pulse.service.interfaces.SessionService# * getSessionSitesHasOrdersOrReturns(java.lang.Integer, java.lang.Integer) */ - public ActionResultItem>> getSessionSitesWithOrderReturn(Integer userId, - Integer sessionId) { + @Override + public ActionResultItem>> getSessionSitesWithOrderReturn(Integer userId, Integer sessionId) { return new ActionResultItem<>( sessionDAO.getSessionSitesWithOrderReturn(userId, sessionId)); } @@ -213,6 +220,7 @@ * java.lang.Integer, java.lang.Integer, * com.napa.pulse.entity.pulseui.Transmission[]) */ + @Override public ActionResult updateSessionTransmissions(Integer userId, Integer sessionId, Transmission[] transmissions) { sessionDAO.updateSessionTransmissions(userId, sessionId, transmissions); return new ActionResult(true); @@ -241,6 +249,7 @@ } } + @Override public ActionResult updateSessionTransmissionStatusId(Integer transmissionId, String type, String newStatus) { return sessionDAO.updateSessionTransmissionStatusId(transmissionId, type, newStatus); } @@ -307,11 +316,12 @@ * java.lang.Boolean, java.lang.Integer, java.lang.Integer) */ public void getSessionDashboardData(Integer sessionId, Integer pageNumber, Integer numberOfRecordsPerPage, - String sortBy, String sortingOrder, Boolean isReturns, Boolean isOrders, Boolean isInSession, - Integer siteId, Integer level, Integer hierarchyId, String exportType, Boolean isUnReviewed, - Boolean aggressiveLeft, Boolean aggressiveRight, Boolean dnsCount, Boolean sjCount, Boolean highSkuEdit, - Integer highSkuEditHierarchyId, Boolean isDeclineOrder, Boolean isDeclineReturn, Integer hierarchyLevel, - HttpServletResponse response, User user) throws Exception { + String sortBy, String sortingOrder, Boolean isReturns, Boolean isOrders, + Boolean isInSession, Integer siteId, Integer level, Integer hierarchyId, + String exportType, Boolean isUnReviewed, Boolean aggressiveLeft, + Boolean aggressiveRight, Boolean dnsCount, Boolean sjCount, Boolean highSkuEdit, + Integer highSkuEditHierarchyId, Boolean isDeclineOrder, Boolean isDeclineReturn, + Integer hierarchyLevel, HttpServletResponse response, User user) throws Exception { sessionDAO.getSessionDashboardData(sessionId, pageNumber, numberOfRecordsPerPage, sortBy, sortingOrder, isReturns, isOrders, isInSession, siteId, level, hierarchyId, exportType, isUnReviewed, aggressiveLeft, @@ -379,6 +389,7 @@ * com.napa.pulse.service.interfaces.SessionService#getSessionOrderReturnTotals( * int) */ + @Override public List> getSessionOrderReturnTotals(int sessionId) { if (sessionDAO.isACO(sessionId)) { return sessionDAO.getACOSessionOrderReturnTotals(sessionId); @@ -393,6 +404,7 @@ * @see com.napa.pulse.service.interfaces.SessionService# * getSessonOrderReturnTotalsDetails(int) */ + @Override public List> getSessonOrderReturnTotalsDetails(int sessionId) { return sessionDAO.getSessonOrderReturnTotalsDetails(sessionId); } @@ -403,8 +415,10 @@ * @see * com.napa.pulse.service.interfaces.SessionService#getRecommendationChart(int) */ + @Override public List> getRecommendationChart(int sessionId, boolean isOrders, boolean isReturns, - Boolean isInSession, Integer siteId, Integer hierarchyId, Integer hierarchyLevel) { + Boolean isInSession, Integer siteId, Integer hierarchyId, + Integer hierarchyLevel) { return sessionDAO.getRecommendationChart(sessionId, isOrders, isReturns, isInSession, siteId, hierarchyId, hierarchyLevel); } @@ -416,6 +430,7 @@ * com.napa.pulse.service.interfaces.SessionService#getHierarchicalNames(java. * lang.Integer) */ + @Override public List> getHierarchicalNames(Integer sessionId, User user) { return sessionDAO.getHierarchicalNames(sessionId, user); } @@ -427,6 +442,7 @@ * com.napa.pulse.service.interfaces.SessionService#getHierarchicalNames(java. * lang.Integer, java.lang.Integer) */ + @Override public List> getHierarchicalNames(Integer sessionId, Integer hierarchyId, User user) { return sessionDAO.getHierarchicalNames(sessionId, hierarchyId, user); } @@ -438,10 +454,12 @@ * com.napa.pulse.service.interfaces.SessionService#getSessionDashboardCnt(int, * boolean, boolean, java.lang.Boolean, java.lang.Integer, java.lang.Integer) */ + @Override public Integer getSessionDashboardCnt(int sessionId, boolean isReturns, boolean isOrders, Boolean isInSession, - Integer siteId, Integer level, Integer hierarchyId, Boolean isUnreviewed, Boolean aggressiveLeft, - Boolean aggressiveRight, Boolean dnsCount, Boolean sjCount, Boolean highSkuEdit, - Integer highSkuEditHierarchyId, Boolean isDeclineOrder, Boolean isDeclineReturn, Integer hierarchyLevel) { + Integer siteId, Integer level, Integer hierarchyId, Boolean isUnreviewed, + Boolean aggressiveLeft, Boolean aggressiveRight, Boolean dnsCount, Boolean sjCount, + Boolean highSkuEdit, Integer highSkuEditHierarchyId, Boolean isDeclineOrder, + Boolean isDeclineReturn, Integer hierarchyLevel) { return sessionDAO.getSessionDashboardCnt(sessionId, isReturns, isOrders, isInSession, siteId, level, hierarchyId, isUnreviewed, aggressiveLeft, aggressiveRight, dnsCount, sjCount, highSkuEdit, highSkuEditHierarchyId, isDeclineOrder, isDeclineReturn, hierarchyLevel); @@ -454,10 +472,12 @@ * com.napa.pulse.service.interfaces.SessionService#getInventoryHistory(java. * lang.Integer, java.lang.Integer) */ + @Override public List> getInventoryHistory(Integer siteId, Integer hierarchyId) { return sessionDAO.getInventoryHistory(siteId, hierarchyId); } + @Override public List> getInventoryHistory(int sessionId, boolean isOrders, boolean isReturns, Boolean isInSession, Integer siteId, Integer hierarchyId) { return sessionDAO.getInventoryHistory(sessionId, isOrders, isReturns, isInSession, siteId, hierarchyId); @@ -488,10 +508,12 @@ return sessionDAO.getSessionSiteParameters(sessionId, siteId, nodeIds); } + @Override public String getSessionState(Integer sessionId, User user) { return sessionDAO.getSessionState(sessionId, user); } + @Override public ActionResult deleteSession(Integer sessionId, int userId) { return sessionDAO.deleteSession(sessionId, userId); } @@ -514,14 +536,12 @@ @Override public void updateSessionComment(int sessionId, String comment, String expirationDate) throws Exception { sessionDAO.updateSessionComment(sessionId, comment, expirationDate); - } @Override public ActionResultItem> getSelectedProductTree(Integer sessionId, Integer productGroupId, User user) { - return new ActionResultItem<>( - sessionDAO.getSelectedProductTree(sessionId, productGroupId, user)); + return new ActionResultItem<>(sessionDAO.getSelectedProductTree(sessionId, productGroupId, user)); } @Override @@ -544,10 +564,12 @@ return sessionDAO.getCustomSkuSessionProducts(sessionId); } + @Override public List> getExecutiveSummaryData(int sessionId) { return sessionDAO.getExecutiveSummaryData(sessionId); } + @Override public List> getCubicFeet(int sessionId) { return sessionDAO.getCubicFeet(sessionId); } @@ -557,18 +579,22 @@ return sessionDAO.requestFinalizeSession(sessionId, requestDatesArr, messageText, user); } + @Override public ActionResult rejectFinalizeSession(int sessionId, String reasonText, int userId) { return sessionDAO.rejectFinalizeSession(sessionId, reasonText, userId); } + @Override public SessionModificationInfoDTO wasSessionModified(int sessionId) { return sessionDAO.wasSessionModified(sessionId); } + @Override public void updateSession(int sessionId) throws Exception { sessionDAO.updateSession(sessionId); } + @Override public List getSessionTransmissionStatus(Integer sessionId) { return sessionDAO.getSessionTransmissionStatus(sessionId); } @@ -589,11 +615,13 @@ return new ActionResultItem<>(sessionDAO.recreateSession(user, sessionId, userAccessSites)); } + @Override public ActionResult declineOrderReturns(User user, Integer sessionId, Integer siteId, Integer hierarchyId, Boolean declineOrder, Boolean declineReturn) throws PulseException { return sessionDAO.declineOrderReturns(user, sessionId, siteId, hierarchyId, declineOrder, declineReturn); } + @Override public boolean revertDeclineOrderReturns(int sessionId) { return sessionDAO.revertDeclineOrderReturns(sessionId); } @@ -604,15 +632,18 @@ return new ActionResult(true); } + @Override public SessionLimit getSessionlimits(User user) { return sessionDAO.getSessionlimits(user); } + @Override public List getSitelimits(Integer siteGroupObj, Integer[] sitesArray) { if (siteGroupObj != null) { sitesArray = sessionDAO.getGroupSites(siteGroupObj); } return sessionDAO.getSiteLimits(sitesArray); } -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/SiteQueueServiceImpl.java =================================================================== diff -u -r6e1148e8a8b1b66a7d127a36c4fc3d3aaaaefc98 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/SiteQueueServiceImpl.java (.../SiteQueueServiceImpl.java) (revision 6e1148e8a8b1b66a7d127a36c4fc3d3aaaaefc98) +++ src/main/java/com/napa/pulse/service/impl/SiteQueueServiceImpl.java (.../SiteQueueServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,76 +1,74 @@ package com.napa.pulse.service.impl; -import java.util.List; -import java.util.StringJoiner; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.SiteQueueDAO; import com.napa.pulse.dto.SiteQueueDTO; import com.napa.pulse.service.interfaces.SiteQueueService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; +import java.util.StringJoiner; + @Service -public class SiteQueueServiceImpl implements SiteQueueService{ +public class SiteQueueServiceImpl implements SiteQueueService { - @Autowired - private SiteQueueDAO siteQueueDAO; - - - public String siteIsQueued(int siteId){ - return siteQueueDAO.siteIsQueued(siteId); - } - - public String siteIsQueuedExceptSlider(int siteId){ - return siteQueueDAO.siteIsQueuedExceptSlider(siteId); - } - - public String siteIsQueued(List siteIds){ - StringJoiner sj = new StringJoiner(","); - for(Integer siteId : siteIds){ - sj.add(siteId.toString()); - } - - return siteQueueDAO.siteIsQueued(sj.toString()); - } - - public int addClearFlags(List siteIds, int reason, int userId, String metaData){ - int id = getQueueId(); - siteQueueDAO.add(id, reason, userId, metaData); - - for(int siteId : siteIds){ - siteQueueDAO.addMapping(id, siteId); - } - - return id; - } - - public int addSlider(int siteId, int userId){ - int id = getQueueId(); - siteQueueDAO.add(id, 1, userId); - siteQueueDAO.addMapping(id, siteId); - return id; - } - - public void processing(int id){ - siteQueueDAO.processing(id); + @Autowired + private SiteQueueDAO siteQueueDAO; + + public String siteIsQueued(int siteId) { + return siteQueueDAO.siteIsQueued(siteId); } - - public void completed(int id){ - siteQueueDAO.completed(id); + + public String siteIsQueuedExceptSlider(int siteId) { + return siteQueueDAO.siteIsQueuedExceptSlider(siteId); } - - public void error(int id){ - siteQueueDAO.error(id); + + public String siteIsQueued(List siteIds) { + StringJoiner sj = new StringJoiner(","); + + for (Integer siteId : siteIds) { + sj.add(siteId.toString()); + } + + return siteQueueDAO.siteIsQueued(sj.toString()); } - - public List getSiteQueue(){ - return siteQueueDAO.getSiteQueue(); + + public int addClearFlags(List siteIds, int reason, int userId, String metaData) { + int id = getQueueId(); + siteQueueDAO.add(id, reason, userId, metaData); + + for (int siteId : siteIds) { + siteQueueDAO.addMapping(id, siteId); + } + + return id; } - - - private int getQueueId(){ - return siteQueueDAO.getQueueId(); - } - -} + + public int addSlider(int siteId, int userId) { + int id = getQueueId(); + siteQueueDAO.add(id, 1, userId); + siteQueueDAO.addMapping(id, siteId); + return id; + } + + public void processing(int id) { + siteQueueDAO.processing(id); + } + + public void completed(int id) { + siteQueueDAO.completed(id); + } + + public void error(int id) { + siteQueueDAO.error(id); + } + + public List getSiteQueue() { + return siteQueueDAO.getSiteQueue(); + } + + private int getQueueId() { + return siteQueueDAO.getQueueId(); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/SiteServiceImpl.java =================================================================== diff -u -r6b5a553c729a1d10fac16a1732b2d0de6d2afab3 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/SiteServiceImpl.java (.../SiteServiceImpl.java) (revision 6b5a553c729a1d10fac16a1732b2d0de6d2afab3) +++ src/main/java/com/napa/pulse/service/impl/SiteServiceImpl.java (.../SiteServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -42,6 +42,7 @@ return siteGroupDAO.findUserSiteGroups(user, userAccessSites); } + @Override public List> getSiteGroupsInventorySnapShot(User user, String userAccessSites) { return siteGroupDAO.getSiteGroupsInventorySnapShot(user, userAccessSites); } @@ -52,6 +53,7 @@ return new ActionResult(true); } + @Override public boolean checkGroupNameUnique(String groupName, User user) { return siteGroupDAO.checkGroupNameUnique(groupName, user); } @@ -136,18 +138,22 @@ return new ActionResult(true); } + @Override public List> getSiteGroupsTypes(User user) { return siteGroupDAO.getSiteGroupsTypes(user); } + @Override public int getSiteCount(int siteGroupId, User user, String userAccessSites) throws Exception { return siteGroupDAO.getSiteCount(siteGroupId, user, userAccessSites); } + @Override public List> getInventorySnapShotData(User user, String userAccessSites, int groupId) { return siteGroupDAO.getInventorySnapShotData(user, userAccessSites, groupId); } + @Override public List> getInventorySnapShotCustomGroupData(Integer[] siteIds) { return siteGroupDAO.getInventorySnapShotCustomGroupData(siteIds); } Index: src/main/java/com/napa/pulse/service/impl/SystemServiceImpl.java =================================================================== diff -u -r2bceb87880adc55ca703f908da8605a4a866255e -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/SystemServiceImpl.java (.../SystemServiceImpl.java) (revision 2bceb87880adc55ca703f908da8605a4a866255e) +++ src/main/java/com/napa/pulse/service/impl/SystemServiceImpl.java (.../SystemServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,20 +1,19 @@ package com.napa.pulse.service.impl; -import java.util.List; - -import org.slf4j.Logger; -import org.slf4j.LoggerFactory; -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.SystemDAO; import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.SystemStatusDTO; import com.napa.pulse.entity.pulseui.SystemCategory; import com.napa.pulse.entity.pulseui.SystemCategoryDetails; import com.napa.pulse.service.interfaces.SystemService; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.List; + @Service public class SystemServiceImpl implements SystemService { @@ -23,45 +22,49 @@ @Autowired SystemDAO systemDAO; - @Override public List getSystemsForSite(int siteId) { - return systemDAO.findBySiteId(siteId); + return systemDAO.findBySiteId(siteId); } @Override public boolean assignSystemToSite(Integer siteId, Integer systemId, Boolean use) { - return systemDAO.assignSystemToSite(siteId, systemId, use); + return systemDAO.assignSystemToSite(siteId, systemId, use); } - + @Override public boolean assignSystemsToSite(Integer siteId, Integer[] systemIds, Boolean use) { - return systemDAO.assignSystemsToSite(siteId, systemIds, use); + return systemDAO.assignSystemsToSite(siteId, systemIds, use); } - + @Override public boolean updateAllSiteSystems(Integer siteId, Boolean use) { - return systemDAO.updateAllSiteSystems(siteId, use); + return systemDAO.updateAllSiteSystems(siteId, use); } @Override public SystemCategoryDetails getSystemDetail(Integer systemId) { - return systemDAO.getSystemDetail(systemId); + return systemDAO.getSystemDetail(systemId); } - - public SystemStatusDTO getStatus(Integer sessionId){ - return systemDAO.getStatus(sessionId); + + @Override + public SystemStatusDTO getStatus(Integer sessionId) { + return systemDAO.getStatus(sessionId); } - - public ActionResult executeSystems(int userId, int sessionId){ - return systemDAO.executeSystems(userId, sessionId); + + @Override + public ActionResult executeSystems(int userId, int sessionId) { + return systemDAO.executeSystems(userId, sessionId); } - - public ActionResult setOutdatedStatus(Integer sessionId){ - return systemDAO.setOutdatedStatus(sessionId); + + @Override + public ActionResult setOutdatedStatus(Integer sessionId) { + return systemDAO.setOutdatedStatus(sessionId); } - - public boolean isSystems(Integer sessionId){ - return systemDAO.isSystems(sessionId); + + @Override + public boolean isSystems(Integer sessionId) { + return systemDAO.isSystems(sessionId); } -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/TransferMapsServiceImpl.java =================================================================== diff -u -raf96735a57ead4fc0f4121425b74d38b5656e7e4 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/TransferMapsServiceImpl.java (.../TransferMapsServiceImpl.java) (revision af96735a57ead4fc0f4121425b74d38b5656e7e4) +++ src/main/java/com/napa/pulse/service/impl/TransferMapsServiceImpl.java (.../TransferMapsServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,41 +1,41 @@ package com.napa.pulse.service.impl; -import java.util.ArrayList; -import java.util.List; - -import org.springframework.beans.factory.annotation.Autowired; -import org.springframework.stereotype.Service; - import com.napa.pulse.dao.interfaces.TransferMapDAO; import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.TransferMapActionDTO; import com.napa.pulse.dto.TransferMapDTO; import com.napa.pulse.dto.TransferMappingHub; import com.napa.pulse.service.interfaces.TransferMapsService; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Service; +import java.util.ArrayList; +import java.util.List; + @Service public class TransferMapsServiceImpl implements TransferMapsService { - @Autowired + @Autowired private TransferMapDAO transferMapDAO; - - @Override + + @Override public List getTransferMaps(Integer sourceSite) { - return transferMapDAO.getTransferMaps(sourceSite); + return transferMapDAO.getTransferMaps(sourceSite); } - - @Override + + @Override public TransferMapActionDTO createNewTransferMap(Integer hubSiteId, String name, Integer userId) { - return transferMapDAO.createNewTransferMap(hubSiteId, name, userId); + return transferMapDAO.createNewTransferMap(hubSiteId, name, userId); } - - @Override + + @Override public ArrayList getTransferMapHierarchy(Integer transferMapId) { - return transferMapDAO.getTransferMapHierarchy(transferMapId); + return transferMapDAO.getTransferMapHierarchy(transferMapId); } - - - public ActionResult updateTransferMap(TransferMappingHub transferMappingHub) { - return transferMapDAO.updateTransferMap(transferMappingHub); - } -} + + @Override + public ActionResult updateTransferMap(TransferMappingHub transferMappingHub) { + return transferMapDAO.updateTransferMap(transferMappingHub); + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/TransferServiceImpl.java =================================================================== diff -u -re882628d94e7acee04fb43609e874affcd8c50d6 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/TransferServiceImpl.java (.../TransferServiceImpl.java) (revision e882628d94e7acee04fb43609e874affcd8c50d6) +++ src/main/java/com/napa/pulse/service/impl/TransferServiceImpl.java (.../TransferServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,57 +1,53 @@ package com.napa.pulse.service.impl; -import java.util.List; - +import com.napa.pulse.dao.interfaces.TransferDAO; +import com.napa.pulse.dto.*; +import com.napa.pulse.service.interfaces.TransferService; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.napa.pulse.dao.interfaces.TransferDAO; -import com.napa.pulse.dto.TransferDTO; -import com.napa.pulse.dto.TransferDetailDTO; -import com.napa.pulse.dto.TransferMappingDTO; -import com.napa.pulse.dto.TransferSiteDTO; -import com.napa.pulse.dto.TransferSiteDetailsDTO; -import com.napa.pulse.service.interfaces.TransferService; +import java.util.List; @Service public class TransferServiceImpl implements TransferService { @Autowired private TransferDAO transferDAO; + @Override public List getTransferSites(Integer[] sourceSitesArray) { - return transferDAO.getTransferSites(sourceSitesArray); + return transferDAO.getTransferSites(sourceSitesArray); } + @Override public void saveTransferSites(TransferSiteDTO[] transferSitesDTOArray) { - transferDAO.saveTransferSites(transferSitesDTOArray); + transferDAO.saveTransferSites(transferSitesDTOArray); } @Override public TransferDetailDTO getTransferDetail(Integer sourceSite) { - return transferDAO.getTransferDetail(sourceSite); + return transferDAO.getTransferDetail(sourceSite); } @Override public void saveTransferSiteHierarchies(TransferMappingDTO[] transferMappingDTOArray) { - transferDAO.saveTransferSiteHierarchies(transferMappingDTOArray); + transferDAO.saveTransferSiteHierarchies(transferMappingDTOArray); } @Override public List getTransferSiteHierarchies(Long[] sourceSitesArray) { - return transferDAO.getTransferSiteHierarchies(sourceSitesArray); + return transferDAO.getTransferSiteHierarchies(sourceSitesArray); } - + @Override public TransferSiteDetailsDTO getTransferHierarchyDetail(Integer sourceSite) { - return transferDAO.getTransferHierarchyDetail(sourceSite); + return transferDAO.getTransferHierarchyDetail(sourceSite); } - @Override - public void deleteTransferMap(Integer transferMapId) { - transferDAO.deleteTransferMap(transferMapId); - - } - + @Override + public void deleteTransferMap(Integer transferMapId) { + transferDAO.deleteTransferMap(transferMapId); -} + } + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/TranslationItemServiceImpl.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/TranslationItemServiceImpl.java (.../TranslationItemServiceImpl.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/impl/TranslationItemServiceImpl.java (.../TranslationItemServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,30 +1,29 @@ package com.napa.pulse.service.impl; +import com.napa.pulse.entity.pulseui.TranslationItem; +import com.napa.pulse.repository.TranslationItemRepository; +import com.napa.pulse.service.interfaces.TranslationItemService; import org.slf4j.Logger; import org.slf4j.LoggerFactory; import org.springframework.beans.factory.annotation.Autowired; import org.springframework.stereotype.Service; -import com.napa.pulse.entity.pulseui.TranslationItem; -import com.napa.pulse.repository.TranslationItemRepository; -import com.napa.pulse.service.interfaces.TranslationItemService; - @Service public class TranslationItemServiceImpl implements TranslationItemService { private static final Logger LOGGER = LoggerFactory.getLogger(TranslationItemServiceImpl.class); - + @Autowired private TranslationItemRepository repository; - + @Override public Iterable getAllTranslationItems() { - return repository.findAll(); + return repository.findAll(); } - + @Override public TranslationItem saveTranslationItem(TranslationItem translationItem) { - return repository.save(translationItem); + return repository.save(translationItem); } -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/UserServiceImpl.java =================================================================== diff -u -r6b5a553c729a1d10fac16a1732b2d0de6d2afab3 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/UserServiceImpl.java (.../UserServiceImpl.java) (revision 6b5a553c729a1d10fac16a1732b2d0de6d2afab3) +++ src/main/java/com/napa/pulse/service/impl/UserServiceImpl.java (.../UserServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -52,4 +52,4 @@ return userDAO.getAllAdminUsers(); } -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/impl/VinServiceImpl.java =================================================================== diff -u -r6b5a553c729a1d10fac16a1732b2d0de6d2afab3 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/VinServiceImpl.java (.../VinServiceImpl.java) (revision 6b5a553c729a1d10fac16a1732b2d0de6d2afab3) +++ src/main/java/com/napa/pulse/service/impl/VinServiceImpl.java (.../VinServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -13,22 +13,24 @@ @Service public class VinServiceImpl implements VinService { + private static final Logger LOGGER = LoggerFactory.getLogger(VinServiceImpl.class); @Value("${nicap.service.url}") - String nicapServiceUrl; + private String nicapServiceUrl; @Value("${nicap.application.id}") - String applicationId; + private String applicationId; @Value("${nicap.store.id}") - String storeId; + private String storeId; final RestTemplate restTemplate = new RestTemplate(); @Override public VinResponseDTO getVinInformation(String vin) { ResponseEntity response; + try { VinRequestDTO request = new VinRequestDTO(); ClientDataDTO clientData = new ClientDataDTO(); @@ -39,12 +41,14 @@ request.setClientData(clientData); request.setVin(vin); response = restTemplate.postForEntity(nicapServiceUrl, request, VinResponseDTO.class); + if (response.getStatusCode().is2xxSuccessful()) { return response.getBody(); } } catch (Exception e) { LOGGER.error("Invalid respose for NICAP service: ", e); } + return null; } Index: src/main/java/com/napa/pulse/service/impl/VirtualSiteServiceImpl.java =================================================================== diff -u -rb1b67b9a68753ee5fec4614691fcc0805c28f347 -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/impl/VirtualSiteServiceImpl.java (.../VirtualSiteServiceImpl.java) (revision b1b67b9a68753ee5fec4614691fcc0805c28f347) +++ src/main/java/com/napa/pulse/service/impl/VirtualSiteServiceImpl.java (.../VirtualSiteServiceImpl.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -1,6 +1,3 @@ -/** - * - */ package com.napa.pulse.service.impl; import com.napa.pulse.dao.interfaces.VirtualSiteDAO; @@ -21,7 +18,6 @@ /** * @author Mr T - * */ @Service public class VirtualSiteServiceImpl implements VirtualSiteService { @@ -41,8 +37,8 @@ */ @Override public void createVirtualSite(User user, String siteTypeCode, int dcSiteId, String name, String address1, - String address2, String city, String state, String country, String postalCode, BigDecimal latitude, - BigDecimal longitude, String dcAbbrev) { + String address2, String city, String state, String country, String postalCode, + BigDecimal latitude, BigDecimal longitude, String dcAbbrev) { vsDao.createVirtualSite(user, siteTypeCode, dcSiteId, name, address1, address2, city, state, country, postalCode, latitude, longitude, dcAbbrev); } @@ -55,11 +51,10 @@ */ @Override public void updateVirtualSite(User user, int siteId, String name, String address1, - String address2, String city, String state, String country, String postalCode, BigDecimal latitude, - BigDecimal longitude) { - vsDao.updateVirtualSite(user, siteId, name, address1, - address2, city, state, country, postalCode, latitude, - longitude); + String address2, String city, String state, String country, String postalCode, + BigDecimal latitude, BigDecimal longitude) { + vsDao.updateVirtualSite( + user, siteId, name, address1, address2, city, state, country, postalCode, latitude, longitude); } /* @@ -73,10 +68,12 @@ vsDao.deleteVirtualSite(siteId); } + @Override public List getUserDCs(User user) { return vsDao.getUserDCs(user); } + @Override public List getUserSiteTypes(User user) { return vsDao.getUserSiteTypes(user); } @@ -86,15 +83,19 @@ return vsDao.getVirtualSiteDetail(siteId); } + @Override public void exportVirtualSite(int sessionId, int siteId, HttpServletResponse response, User user) throws IOException, SQLException { vsDao.exportVirtualSite(sessionId, siteId, response, user); } + @Override public List getSites(User user, String userAccessSitesNoVS, int siteId) { return vsDao.getSites(user, userAccessSitesNoVS, siteId); } + @Override public void linkVirtualSite(int virtualSiteId, int actualSiteId) { vsDao.linkVirtualSite(virtualSiteId, actualSiteId); } -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/PulseConfigurationService.java =================================================================== diff -u -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b -rbe92f77f11e0334ea9b3a6ad6df77288d58fbfee --- src/main/java/com/napa/pulse/service/interfaces/PulseConfigurationService.java (.../PulseConfigurationService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) +++ src/main/java/com/napa/pulse/service/interfaces/PulseConfigurationService.java (.../PulseConfigurationService.java) (revision be92f77f11e0334ea9b3a6ad6df77288d58fbfee) @@ -13,10 +13,4 @@ */ List> getAllConfig() throws Exception; - /** - * @return - * @throws PulseException - */ - void getSpecificConfig() throws Exception; - } \ No newline at end of file