Index: src/main/java/com/napa/pulse/controller/rest/OrderMultipleSitesRestController.java =================================================================== diff -u -r6b5a553c729a1d10fac16a1732b2d0de6d2afab3 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/controller/rest/OrderMultipleSitesRestController.java (.../OrderMultipleSitesRestController.java) (revision 6b5a553c729a1d10fac16a1732b2d0de6d2afab3) +++ src/main/java/com/napa/pulse/controller/rest/OrderMultipleSitesRestController.java (.../OrderMultipleSitesRestController.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -31,7 +31,7 @@ Integer[] siteIdList = gson.fromJson(siteIds, Integer[].class); OrderMultipleSitesDto oms = new OrderMultipleSitesDto(sessionId, siteIdList, productId, lowVehicleCount); - orderMultipleSitesService.updateOrderQuantites(oms); + orderMultipleSitesService.updateOrderQuantities(oms); ActionResult ar = new ActionResult(); ar.setSuccess(true); ar.setMessage("Update completed OK"); FishEye: Tag a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/service/impl/AppExceptionServiceImpl.java'. FishEye: No comparison available. Pass `N' to diff? FishEye: Tag a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/service/impl/GroupingServiceImpl.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/service/impl/OrderMultipleSitesServiceImpl.java =================================================================== diff -u -rc69fe16ddbf79a02a2827fadfdb0dc9b2dfb3a8e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/impl/OrderMultipleSitesServiceImpl.java (.../OrderMultipleSitesServiceImpl.java) (revision c69fe16ddbf79a02a2827fadfdb0dc9b2dfb3a8e) +++ src/main/java/com/napa/pulse/service/impl/OrderMultipleSitesServiceImpl.java (.../OrderMultipleSitesServiceImpl.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -14,7 +14,7 @@ private OrderMultipleSitesDAO OrderMultipleSitesDao; @Override - public void updateOrderQuantites(OrderMultipleSitesDto oms) throws PulseException { + public void updateOrderQuantities(OrderMultipleSitesDto oms) throws PulseException { OrderMultipleSitesDao.updateOrderQty(oms); } Index: src/main/java/com/napa/pulse/service/interfaces/AdHocRefreshService.java =================================================================== diff -u -r12591950ace19045c6c8d0e271f58d59888b1df7 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/AdHocRefreshService.java (.../AdHocRefreshService.java) (revision 12591950ace19045c6c8d0e271f58d59888b1df7) +++ src/main/java/com/napa/pulse/service/interfaces/AdHocRefreshService.java (.../AdHocRefreshService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,6 +1,3 @@ -/** - * - */ package com.napa.pulse.service.interfaces; import com.napa.pulse.dto.AdhocRefreshStatus; @@ -12,12 +9,10 @@ /** * @author Tathagata - * */ public interface AdHocRefreshService { /** - * * @param user * @param sites * @param reasonId @@ -29,7 +24,6 @@ throws PulseException; /** - * * @param reqLogId * @return */ @@ -55,4 +49,4 @@ */ AdhocRefreshStatus getRefreshStatus(int siteCount) throws PulseException; -} +} \ No newline at end of file FishEye: Tag a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/service/interfaces/AppExceptionService.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/service/interfaces/FeatureAccessService.java =================================================================== diff -u -r02dc98b890901f842c0bab7fa03fe6e7ec65e03c -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/FeatureAccessService.java (.../FeatureAccessService.java) (revision 02dc98b890901f842c0bab7fa03fe6e7ec65e03c) +++ src/main/java/com/napa/pulse/service/interfaces/FeatureAccessService.java (.../FeatureAccessService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,31 +1,34 @@ package com.napa.pulse.service.interfaces; +import com.napa.pulse.dto.ActionResult; + import java.util.List; import java.util.Map; -import com.napa.pulse.dto.ActionResult; - public interface FeatureAccessService { - /** - * - * @return - */ - List> getAccessItems(); - - /** - * - * @return - */ - List> getRoleAccess(); - - /** - * - * @param accessItemId - * @param roleIdsArray - * @return - */ - ActionResult updateFeatureAccess(Integer accessItemId, Integer[] roleIdsArray); + /** + * @return + */ + List> getAccessItems(); - ActionResult updateItemStatus(Integer accessItemId, String statusCode); -} + /** + * @return + */ + List> getRoleAccess(); + + /** + * @param accessItemId + * @param roleIdsArray + * @return + */ + ActionResult updateFeatureAccess(Integer accessItemId, Integer[] roleIdsArray); + + /** + * @param accessItemId + * @param statusCode + * @return + */ + ActionResult updateItemStatus(Integer accessItemId, String statusCode); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/FleetService.java =================================================================== diff -u -r12591950ace19045c6c8d0e271f58d59888b1df7 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/FleetService.java (.../FleetService.java) (revision 12591950ace19045c6c8d0e271f58d59888b1df7) +++ src/main/java/com/napa/pulse/service/interfaces/FleetService.java (.../FleetService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -134,4 +134,4 @@ */ ActionResult deleteVins(int fleetVehicleId, String vinList); -} +} \ No newline at end of file FishEye: Tag a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b refers to a dead (removed) revision in file `src/main/java/com/napa/pulse/service/interfaces/GroupingService.java'. FishEye: No comparison available. Pass `N' to diff? Index: src/main/java/com/napa/pulse/service/interfaces/MIOExternalService.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/MIOExternalService.java (.../MIOExternalService.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/service/interfaces/MIOExternalService.java (.../MIOExternalService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -6,5 +6,6 @@ public interface MIOExternalService { - List> getMIOReturnData(Date targetDt) throws Exception; -} + List> getMIOReturnData(Date targetDt) throws Exception; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/MajorAccountService.java =================================================================== diff -u -r03563aacf47cbe55e38cb27650d618c6ad8340bf -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/MajorAccountService.java (.../MajorAccountService.java) (revision 03563aacf47cbe55e38cb27650d618c6ad8340bf) +++ src/main/java/com/napa/pulse/service/interfaces/MajorAccountService.java (.../MajorAccountService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,27 +1,22 @@ package com.napa.pulse.service.interfaces; -import java.sql.SQLException; - 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.PricingProfile; -import com.napa.pulse.entity.pulseui.Site; +import com.napa.pulse.entity.pulseui.*; import com.napa.pulse.entity.security.User; +import java.sql.SQLException; + public interface MajorAccountService { Iterable getAllMajorAccounts(boolean includeInactive); MajorAccount saveMajorAccount(MajorAccount majorAccount); Iterable getAllInvestmentCollections(); - - Iterable getInvestmentCollectionsForSites(Integer[] siteIds); + Iterable getInvestmentCollectionsForSites(Integer[] siteIds); + Iterable getAllPricingProfiles(); Iterable getAllExportColumnNames(); @@ -41,13 +36,12 @@ InvestmentCollection saveInvestmentCollection(InvestmentCollection investmentCollection); Iterable getAllInvestmentCollectionTemplates(boolean includeInactive); - + InvestmentCollectionTemplate saveInvestmentCollectionTemplate( - InvestmentCollectionTemplate investmentCollectionTemplate); + InvestmentCollectionTemplate investmentCollectionTemplate); void updateInvestmentCollectionForSites(Long investmentCollectionTemplateId, Long[] siteIds); - Iterable getInvCollTemplatesForSites(Integer[] siteIds) throws SQLException; - + Iterable getInvCollTemplatesForSites(Integer[] siteIds) throws SQLException; -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/MarketSelectionService.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/MarketSelectionService.java (.../MarketSelectionService.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/interfaces/MarketSelectionService.java (.../MarketSelectionService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,30 +1,30 @@ package com.napa.pulse.service.interfaces; +import com.napa.pulse.dto.ZipcodeDTO; +import org.springframework.stereotype.Service; + import java.util.List; import java.util.Map; -import org.springframework.stereotype.Service; - -import com.napa.pulse.dto.ZipcodeDTO; - @Service public interface MarketSelectionService { - List> getTop100AppsList(Integer siteId); - - List> getAllZipCodeDetails(Integer siteId) throws Exception; - - List> getSiteCoordinatesForSession(Integer sessionId); - - List> getSiteCoordinates(Integer[] list); - - List> getSessionTop100AppsList(Integer sessionId, Integer siteId); - - List> getTop100AppsList(String[] zipCodes); - - List> getSessionAllZipCodeDetails(Integer sessionId, Integer siteId) throws Exception; + List> getTop100AppsList(Integer siteId); - List validateZipcodes(String[] list) throws Exception; + List> getAllZipCodeDetails(Integer siteId) throws Exception; - void updateZipcode(Integer siteId, String[] list); -} + List> getSiteCoordinatesForSession(Integer sessionId); + + List> getSiteCoordinates(Integer[] list); + + List> getSessionTop100AppsList(Integer sessionId, Integer siteId); + + List> getTop100AppsList(String[] zipCodes); + + List> getSessionAllZipCodeDetails(Integer sessionId, Integer siteId) throws Exception; + + List validateZipcodes(String[] list) throws Exception; + + void updateZipcode(Integer siteId, String[] list); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/MessagesService.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/MessagesService.java (.../MessagesService.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/interfaces/MessagesService.java (.../MessagesService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,58 +1,61 @@ package com.napa.pulse.service.interfaces; -import java.util.List; -import java.util.Map; - -import javax.servlet.http.HttpServletRequest; - -import org.springframework.stereotype.Service; - 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 org.springframework.stereotype.Service; +import javax.servlet.http.HttpServletRequest; +import java.util.List; +import java.util.Map; + /** * Business Service for the messages + * * @author Diana Ivan * Created: Apr 02, 2015 */ @Service public interface MessagesService { - - /** - * Get message type - * @return - */ - List> getMessagesTypes(); - - /** - * Update message flags (read/delete/starred) - * @param userId - * @param messageId - * @param starred - * @param deleted - * @param read - * @return - */ - ActionResult updateMessageFlags(Integer userId, Integer messageId, Boolean starred, Boolean deleted, Boolean read); - - /** - * get the list of messages and filter - * @param toUserId - * @return - */ - List getMessageDetails(User toUserId); - /** - * @param messages - * @return - */ - ActionResult publishMessage(Messages messages); - - /** - * @param request - * @return - */ - ImagesDTO getImages(HttpServletRequest request); -} + /** + * Get message type + * + * @return + */ + List> getMessagesTypes(); + + /** + * Update message flags (read/delete/starred) + * + * @param userId + * @param messageId + * @param starred + * @param deleted + * @param read + * @return + */ + ActionResult updateMessageFlags(Integer userId, Integer messageId, Boolean starred, Boolean deleted, Boolean read); + + /** + * get the list of messages and filter + * + * @param toUserId + * @return + */ + List getMessageDetails(User toUserId); + + /** + * @param messages + * @return + */ + ActionResult publishMessage(Messages messages); + + /** + * @param request + * @return + */ + ImagesDTO getImages(HttpServletRequest request); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/NicheStockingService.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/NicheStockingService.java (.../NicheStockingService.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/service/interfaces/NicheStockingService.java (.../NicheStockingService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,25 +1,21 @@ -/** - * - */ package com.napa.pulse.service.interfaces; -import java.util.List; - 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 java.util.List; + /** * @author PCTR98154 - * */ public interface NicheStockingService { - List getNicheStockingSite(int siteId, User user); - - void updateNicheStockingSite(Integer siteId, NicheCategoryDTO[] nicheArray, NicheCategoryHierarchyDTO[] hierarchyArray) - throws PulseException; + List getNicheStockingSite(int siteId, User user); -} + void updateNicheStockingSite(Integer siteId, NicheCategoryDTO[] nicheArray, NicheCategoryHierarchyDTO[] hierarchyArray) + throws PulseException; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/OrderMultipleSitesService.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/OrderMultipleSitesService.java (.../OrderMultipleSitesService.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/service/interfaces/OrderMultipleSitesService.java (.../OrderMultipleSitesService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -4,5 +4,7 @@ import com.napa.pulse.exception.PulseException; public interface OrderMultipleSitesService { - void updateOrderQuantites(OrderMultipleSitesDto oms) throws PulseException; -} + + void updateOrderQuantities(OrderMultipleSitesDto oms) throws PulseException; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/ParametersService.java =================================================================== diff -u -rd5ba118de982d4833be1be9845e0a80ada95008d -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/ParametersService.java (.../ParametersService.java) (revision d5ba118de982d4833be1be9845e0a80ada95008d) +++ src/main/java/com/napa/pulse/service/interfaces/ParametersService.java (.../ParametersService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,54 +1,56 @@ package com.napa.pulse.service.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.ParameterStatDataDTO; import com.napa.pulse.dto.SiteParameterDTO; import com.napa.pulse.entity.pulseui.HierarchyItem; import com.napa.pulse.entity.security.User; import com.napa.pulse.exception.PulseException; +import java.util.List; +import java.util.Map; /** * Business Service for the parameters page + * * @author Diana Ivan * Created: Dec 10, 2014 */ public interface ParametersService { - - Map getHierarchyTree(User user); - List getLevel4ChildrenBySite(int node, int siteId, User user); - - List loadSiteParamForHierachyIds(int siteId, Integer[] nodeArray, Integer sessionId); - - // method to save the updated param values - - ActionResult saveSliderValue(int siteId, int nodeId, Integer sessionId, float newOffset, int userId) throws PulseException; - List> getBarChartData(int siteId, int nodeId); + Map getHierarchyTree(User user); - ActionResult linkToParent(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; - - ActionResult linkAllChildren(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; - - ActionResult unlinkFromParent(int siteId, int nodeId, int userId) throws PulseException; - - ActionResult doNotStock(int nodeId, int siteId, boolean doNotStock, Integer sessionId, int userId) throws PulseException; - - ActionResult revertToRecommended(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; - - ParameterStatDataDTO loadStatDataForHierarchyId(int siteId, int nodeId, Integer sessionId); - - List loadStatDataForHierarchyIds(int siteId, Integer[] nodeArray,Integer sessionId); - - void updateIgnoreStock(User user, int siteId, int nodeId, int period, Integer updateSession) throws PulseException; - - void unreviewedHierarchy(int siteId, int nodeId, Integer sessionId) throws PulseException; - - void updateGlobalIgnoreStock(int siteId, int isp) throws PulseException; - - void resetAllToRecommended(int siteId) throws PulseException; -} + List getLevel4ChildrenBySite(int node, int siteId, User user); + + List loadSiteParamForHierachyIds(int siteId, Integer[] nodeArray, Integer sessionId); + + // method to save the updated param values + + ActionResult saveSliderValue(int siteId, int nodeId, Integer sessionId, float newOffset, int userId) throws PulseException; + + List> getBarChartData(int siteId, int nodeId); + + ActionResult linkToParent(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; + + ActionResult linkAllChildren(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; + + ActionResult unlinkFromParent(int siteId, int nodeId, int userId) throws PulseException; + + ActionResult doNotStock(int nodeId, int siteId, boolean doNotStock, Integer sessionId, int userId) throws PulseException; + + ActionResult revertToRecommended(int siteId, int nodeId, Integer sessionId, int userId) throws PulseException; + + ParameterStatDataDTO loadStatDataForHierarchyId(int siteId, int nodeId, Integer sessionId); + + List loadStatDataForHierarchyIds(int siteId, Integer[] nodeArray, Integer sessionId); + + void updateIgnoreStock(User user, int siteId, int nodeId, int period, Integer updateSession) throws PulseException; + + void unreviewedHierarchy(int siteId, int nodeId, Integer sessionId) throws PulseException; + + void updateGlobalIgnoreStock(int siteId, int isp) throws PulseException; + + void resetAllToRecommended(int siteId) throws PulseException; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/ProductGroupService.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/ProductGroupService.java (.../ProductGroupService.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/service/interfaces/ProductGroupService.java (.../ProductGroupService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,29 +1,36 @@ package com.napa.pulse.service.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.ActionResult; import com.napa.pulse.dto.ActionResultItem; import com.napa.pulse.dto.ProductGroupDTO; import com.napa.pulse.entity.pulseui.HierarchyItem; import com.napa.pulse.entity.pulseui.ProductGroupType; import com.napa.pulse.entity.security.User; +import java.util.List; +import java.util.Map; + public interface ProductGroupService { - List getProductGroups(Integer userId); - ActionResultItem> getProductsByGroup(User user, Integer groupId); - ActionResultItem> getFullHierarchy(User user); - List getProductGroupTypes(User user); + List getProductGroups(Integer userId); - ActionResultItem createNewProductGroup(User user, String groupName, Integer groupType, - String listOfHierarchiesString); + ActionResultItem> getProductsByGroup(User user, Integer groupId); - ActionResult addProductsToGroups(User user, String productIds, String groupIds); + ActionResultItem> getFullHierarchy(User user); - void saveKeyline(Integer userId, Integer siteId, String productListString); - ActionResultItem> getKeyline(Integer siteId, User user); - void deleteProductGrp(Integer productGroupId); - void updateProductGroup(Integer userId, Integer productGroupId, String newGroupName, Boolean newGlobalFlag, String newProductsString); -} + List getProductGroupTypes(User user); + + ActionResultItem createNewProductGroup(User user, String groupName, Integer groupType, + String listOfHierarchiesString); + + ActionResult addProductsToGroups(User user, String productIds, String groupIds); + + void saveKeyline(Integer userId, Integer siteId, String productListString); + + ActionResultItem> getKeyline(Integer siteId, User user); + + void deleteProductGrp(Integer productGroupId); + + void updateProductGroup(Integer userId, Integer productGroupId, String newGroupName, Boolean newGlobalFlag, String newProductsString); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/PulseConfigurationService.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/PulseConfigurationService.java (.../PulseConfigurationService.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/service/interfaces/PulseConfigurationService.java (.../PulseConfigurationService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,21 +1,22 @@ package com.napa.pulse.service.interfaces; +import com.napa.pulse.exception.PulseException; + import java.util.List; import java.util.Map; -import com.napa.pulse.exception.PulseException; - public interface PulseConfigurationService { - /** - * @return - * @throws PulseException - */ - List> getAllConfig() throws Exception; - - /** - * @return - * @throws PulseException - */ - void getSpecificConfig() throws Exception; -} + /** + * @return + * @throws PulseException + */ + List> getAllConfig() throws Exception; + + /** + * @return + * @throws PulseException + */ + void getSpecificConfig() throws Exception; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/PulseDBRulesServices.java =================================================================== diff -u -ra2bda6d4934123fca77921c84954a9e8f392bd37 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/PulseDBRulesServices.java (.../PulseDBRulesServices.java) (revision a2bda6d4934123fca77921c84954a9e8f392bd37) +++ src/main/java/com/napa/pulse/service/interfaces/PulseDBRulesServices.java (.../PulseDBRulesServices.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -2,53 +2,52 @@ import java.util.List; - /** * @author Tathagata Bhattacharya - * + *

* Created on May 18, 2015 - * */ public interface PulseDBRulesServices { - /** - * @return - */ - List callPulseRules() throws Exception ; + /** + * @return + * @throws Exception + */ + List callPulseRules() throws Exception; - /** - * @param siteId - * @throws Exception - */ - void callPulseRulesOneSite(int siteId) throws Exception; - - /** - * @param siteIds - * @throws Exception - */ - void callBusinessRulesForSites(Integer[] siteIds) throws Exception; + /** + * @param siteId + * @throws Exception + */ + void callPulseRulesOneSite(int siteId) throws Exception; - /** - * - */ - void terminatePulseRules() throws Exception; + /** + * @param siteIds + * @throws Exception + */ + void callBusinessRulesForSites(Integer[] siteIds) throws Exception; - /** - * @return - */ - List callUpdateSiteParameter() throws Exception; + /** + * @throws Exception + */ + void terminatePulseRules() throws Exception; - /** - * @param statusId - * @param requestId - * @throws Exception - */ - void adHocRefreshStatus(int statusId, int requestId); + /** + * @return + * @throws Exception + */ + List callUpdateSiteParameter() throws Exception; - /** - * @param requestId - * @throws Exception - */ - void adHocRefreshBR(int requestId) throws Exception; -} + /** + * @param statusId + * @param requestId + */ + void adHocRefreshStatus(int statusId, int requestId); + /** + * @param requestId + * @throws Exception + */ + void adHocRefreshBR(int requestId) throws Exception; + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/PulseUtilityService.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/PulseUtilityService.java (.../PulseUtilityService.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/service/interfaces/PulseUtilityService.java (.../PulseUtilityService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,29 +1,23 @@ -/** - * - */ package com.napa.pulse.service.interfaces; import java.sql.SQLException; import java.util.Map; /** * @author Tatha - * */ public interface PulseUtilityService { - /** - * @return - * @throws SQLException - */ - Map getConnectionStats() throws SQLException; + /** + * @return + * @throws SQLException + */ + Map getConnectionStats() throws SQLException; - /** - * @return - * @throws Exception - */ - boolean healthCheck() throws Exception; - - + /** + * @return + * @throws Exception + */ + boolean healthCheck() throws Exception; -} +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/ReportsService.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/ReportsService.java (.../ReportsService.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/interfaces/ReportsService.java (.../ReportsService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,14 +1,16 @@ package com.napa.pulse.service.interfaces; -import java.util.List; - import com.napa.pulse.dto.ReportsDTO; import com.napa.pulse.entity.security.User; +import java.util.List; + public interface ReportsService { - /** - * @return - */ - List getReports(User user); -} + /** + * @param user + * @return + */ + List getReports(User user); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/SessionAnalysisService.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/SessionAnalysisService.java (.../SessionAnalysisService.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/interfaces/SessionAnalysisService.java (.../SessionAnalysisService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,27 +1,28 @@ package com.napa.pulse.service.interfaces; -import java.util.List; -import java.util.Map; - import com.napa.pulse.dto.SessAnalysisStockingCatagoryDTO; import com.napa.pulse.dto.SessionAnalysisReturnBreakdownDTO; import com.napa.pulse.entity.security.User; +import java.util.List; +import java.util.Map; + public interface SessionAnalysisService { - Integer getExpensiveItem(Integer sessionId); - - List> getRedUnlinkSliderCount(Integer sessionId); - - SessAnalysisStockingCatagoryDTO getStockingCatagoryCount(Integer sessionId); - - Integer getLargeOrderQty(Integer sessionId); - - List> getHighSkuEdit(User user, Integer sessionId); + Integer getExpensiveItem(Integer sessionId); - List> getNicheStockingCategory(User user, Integer sessionId); - - List> getPotentialHub(Integer sessionId); - - List getReturnBreakdown(Integer sessionId); -} + List> getRedUnlinkSliderCount(Integer sessionId); + + SessAnalysisStockingCatagoryDTO getStockingCatagoryCount(Integer sessionId); + + Integer getLargeOrderQty(Integer sessionId); + + List> getHighSkuEdit(User user, Integer sessionId); + + List> getNicheStockingCategory(User user, Integer sessionId); + + List> getPotentialHub(Integer sessionId); + + List getReturnBreakdown(Integer sessionId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/SiteQueueService.java =================================================================== diff -u -r6e1148e8a8b1b66a7d127a36c4fc3d3aaaaefc98 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/SiteQueueService.java (.../SiteQueueService.java) (revision 6e1148e8a8b1b66a7d127a36c4fc3d3aaaaefc98) +++ src/main/java/com/napa/pulse/service/interfaces/SiteQueueService.java (.../SiteQueueService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,26 +1,27 @@ package com.napa.pulse.service.interfaces; -import java.util.List; - import com.napa.pulse.dto.SiteQueueDTO; +import java.util.List; + public interface SiteQueueService { - - int addClearFlags(List siteIds, int reason, int userId, String metaData); - - int addSlider(int siteId, int userId); - - void processing(int id); - - void completed(int id); - - void error(int id); - - String siteIsQueued(int siteId); - - String siteIsQueued(List siteIds); - - String siteIsQueuedExceptSlider(int siteId); - - List getSiteQueue(); -} + + int addClearFlags(List siteIds, int reason, int userId, String metaData); + + int addSlider(int siteId, int userId); + + void processing(int id); + + void completed(int id); + + void error(int id); + + String siteIsQueued(int siteId); + + String siteIsQueued(List siteIds); + + String siteIsQueuedExceptSlider(int siteId); + + List getSiteQueue(); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/SiteService.java =================================================================== diff -u -r99c26b121f01525e16adbbbe56c502f841e1e32b -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/SiteService.java (.../SiteService.java) (revision 99c26b121f01525e16adbbbe56c502f841e1e32b) +++ src/main/java/com/napa/pulse/service/interfaces/SiteService.java (.../SiteService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,26 +1,24 @@ package com.napa.pulse.service.interfaces; -import java.util.List; -import java.util.Map; - -import org.hibernate.HibernateException; - import com.napa.pulse.dto.ActionResult; import com.napa.pulse.entity.pulseui.Site; import com.napa.pulse.entity.pulseui.SiteType; import com.napa.pulse.entity.security.User; +import org.hibernate.HibernateException; +import java.util.List; +import java.util.Map; + public interface SiteService { List> getSiteGroups(User user, String userAccessSites) throws Exception; ActionResult updateSiteGroupName(User user, Integer siteGroupId, String newSiteGroupName); - int createNewSiteGroup(User user, String groupName, String groupTypeCode, - String siteListString); + int createNewSiteGroup(User user, String groupName, String groupTypeCode, String siteListString); List> getSitesByGroup(Integer groupId, User user, String userAccessSites, int userId) - throws Exception; + throws Exception; List getAllSites(User user, String userAccessSites, int userId) throws HibernateException; @@ -32,10 +30,6 @@ ActionResult replaceGroupSites(User user, String siteIds, Integer groupId); - /** - * - * @return - */ List> getSiteGroupsTypes(User user); int getSiteCount(int siteGroupId, User user, String userAccessSites) throws Exception; @@ -47,8 +41,9 @@ List> getInventorySnapShotCustomGroupData(Integer[] siteIds); List> getSiteAddresses(User user, String[] siteIds); - - List> getSitesByType(User user, String siteTypeCode) throws Exception; - + + List> getSitesByType(User user, String siteTypeCode) throws Exception; + boolean checkGroupNameUnique(String groupName, User user); -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/SystemService.java =================================================================== diff -u -r2bceb87880adc55ca703f908da8605a4a866255e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/SystemService.java (.../SystemService.java) (revision 2bceb87880adc55ca703f908da8605a4a866255e) +++ src/main/java/com/napa/pulse/service/interfaces/SystemService.java (.../SystemService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,29 +1,30 @@ package com.napa.pulse.service.interfaces; -import java.util.List; - 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 java.util.List; + public interface SystemService { - List getSystemsForSite(int siteId); + List getSystemsForSite(int siteId); - boolean assignSystemToSite(Integer siteId, Integer systemId, Boolean use); - - boolean assignSystemsToSite(Integer siteId, Integer[] systemIds, Boolean use); + boolean assignSystemToSite(Integer siteId, Integer systemId, Boolean use); - SystemCategoryDetails getSystemDetail(Integer systemId); - - boolean updateAllSiteSystems(Integer siteId, Boolean use); + boolean assignSystemsToSite(Integer siteId, Integer[] systemIds, Boolean use); - SystemStatusDTO getStatus(Integer sessionId); - - ActionResult executeSystems(int userId, int sessionId); + SystemCategoryDetails getSystemDetail(Integer systemId); - ActionResult setOutdatedStatus(Integer sessionId); - - boolean isSystems(Integer sessionId); -} + boolean updateAllSiteSystems(Integer siteId, Boolean use); + + SystemStatusDTO getStatus(Integer sessionId); + + ActionResult executeSystems(int userId, int sessionId); + + ActionResult setOutdatedStatus(Integer sessionId); + + boolean isSystems(Integer sessionId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/TransferMapsService.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/TransferMapsService.java (.../TransferMapsService.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/service/interfaces/TransferMapsService.java (.../TransferMapsService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,22 +1,21 @@ package com.napa.pulse.service.interfaces; -import java.util.ArrayList; -import java.util.List; - 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 java.util.ArrayList; +import java.util.List; + public interface TransferMapsService { - List getTransferMaps(Integer sourceSite); - TransferMapActionDTO createNewTransferMap(Integer hubSiteId, String name, Integer userId); - ArrayList getTransferMapHierarchy(Integer transferMapId); - /** - * - * @param transferMappingHub - * @return - */ - ActionResult updateTransferMap(TransferMappingHub transferMappingHub); -} + List getTransferMaps(Integer sourceSite); + + TransferMapActionDTO createNewTransferMap(Integer hubSiteId, String name, Integer userId); + + ArrayList getTransferMapHierarchy(Integer transferMapId); + + ActionResult updateTransferMap(TransferMappingHub transferMappingHub); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/TransferService.java =================================================================== diff -u -rfab91e28e659471aec6b27f5278652da26cc2667 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/TransferService.java (.../TransferService.java) (revision fab91e28e659471aec6b27f5278652da26cc2667) +++ src/main/java/com/napa/pulse/service/interfaces/TransferService.java (.../TransferService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,28 +1,23 @@ package com.napa.pulse.service.interfaces; +import com.napa.pulse.dto.*; + import java.util.List; -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; - public interface TransferService { - List getTransferSites(Integer[] sourceSitesArray); - - void saveTransferSites(TransferSiteDTO[] transferSitesDTOArray); - - TransferDetailDTO getTransferDetail(Integer sourceSite); + List getTransferSites(Integer[] sourceSitesArray); - void saveTransferSiteHierarchies(TransferMappingDTO[] transferMappingDTOArray); + void saveTransferSites(TransferSiteDTO[] transferSitesDTOArray); - List getTransferSiteHierarchies(Long[] sourceSitesArray); + TransferDetailDTO getTransferDetail(Integer sourceSite); - TransferSiteDetailsDTO getTransferHierarchyDetail(Integer sourceSite); + void saveTransferSiteHierarchies(TransferMappingDTO[] transferMappingDTOArray); + List getTransferSiteHierarchies(Long[] sourceSitesArray); - void deleteTransferMap(Integer transferMapId); + TransferSiteDetailsDTO getTransferHierarchyDetail(Integer sourceSite); -} + void deleteTransferMap(Integer transferMapId); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/TranslationItemService.java =================================================================== diff -u -r2e80f396c9f148c045cb5c736dc137f67b6c1ebe -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/TranslationItemService.java (.../TranslationItemService.java) (revision 2e80f396c9f148c045cb5c736dc137f67b6c1ebe) +++ src/main/java/com/napa/pulse/service/interfaces/TranslationItemService.java (.../TranslationItemService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -3,9 +3,9 @@ import com.napa.pulse.entity.pulseui.TranslationItem; public interface TranslationItemService { - + Iterable getAllTranslationItems(); - + TranslationItem saveTranslationItem(TranslationItem translationItem); - -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/UserService.java =================================================================== diff -u -rb519e237b8af2923218ebae658f7a67f2ccbbf55 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/UserService.java (.../UserService.java) (revision b519e237b8af2923218ebae658f7a67f2ccbbf55) +++ src/main/java/com/napa/pulse/service/interfaces/UserService.java (.../UserService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,19 +1,19 @@ package com.napa.pulse.service.interfaces; -import java.util.List; - import com.napa.pulse.entity.security.User; +import java.util.List; + public interface UserService { - User findUserByLogin(String login); + User findUserByLogin(String login); - User findUserByLoginForceCacheRefresh(String login); + User findUserByLoginForceCacheRefresh(String login); - boolean isSystemLocked(); - - String getSystemLockedMessage(); - - List getAllAdminUsers(); - -} + boolean isSystemLocked(); + + String getSystemLockedMessage(); + + List getAllAdminUsers(); + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/VinService.java =================================================================== diff -u -rf43afa853378a7b68afc7aac57054e3608f0494e -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/VinService.java (.../VinService.java) (revision f43afa853378a7b68afc7aac57054e3608f0494e) +++ src/main/java/com/napa/pulse/service/interfaces/VinService.java (.../VinService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -3,7 +3,7 @@ import com.napa.pulse.dto.VinResponseDTO; public interface VinService { - + VinResponseDTO getVinInformation(String vin); - -} + +} \ No newline at end of file Index: src/main/java/com/napa/pulse/service/interfaces/VirtualSiteService.java =================================================================== diff -u -rb1b67b9a68753ee5fec4614691fcc0805c28f347 -ra189a7d62fb2ea4c9cdef16d4cbb8583a929d80b --- src/main/java/com/napa/pulse/service/interfaces/VirtualSiteService.java (.../VirtualSiteService.java) (revision b1b67b9a68753ee5fec4614691fcc0805c28f347) +++ src/main/java/com/napa/pulse/service/interfaces/VirtualSiteService.java (.../VirtualSiteService.java) (revision a189a7d62fb2ea4c9cdef16d4cbb8583a929d80b) @@ -1,13 +1,9 @@ -/** - * - */ package com.napa.pulse.service.interfaces; import com.napa.pulse.dto.UserDCs; import com.napa.pulse.dto.UserSiteTypes; import com.napa.pulse.entity.pulseui.Site; import com.napa.pulse.entity.security.User; -import com.napa.pulse.exception.PulseException; import javax.servlet.http.HttpServletResponse; import java.io.IOException; @@ -18,7 +14,6 @@ /** * @author Mr T - * */ public interface VirtualSiteService { @@ -36,13 +31,12 @@ * @param latitude * @param longitude * @param dcAbbrev - * @throws PulseException */ 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 city, String state, String country, String postalCode, BigDecimal latitude, + BigDecimal longitude, String dcAbbrev); /** - * * @param user * @param siteId * @param name @@ -56,25 +50,23 @@ * @param longitude */ void updateVirtualSite(User user, int siteId, String name, String address1, String address2, - String city, String state, String country, String postalCode, BigDecimal latitude, BigDecimal longitude); + String city, String state, String country, String postalCode, BigDecimal latitude, + BigDecimal longitude); /** * @param siteId - * @throws PulseException */ void deleteVirtualSite(int siteId); /** * @param user * @return - * @throws PulseException */ List getUserDCs(User user); /** * @param user * @return - * @throws PulseException */ List getUserSiteTypes(User user); @@ -84,9 +76,7 @@ */ List> getVirtualSiteDetail(int siteId); - /** - * * @param sessionId * @param siteId * @param response @@ -104,9 +94,9 @@ List getSites(User user, String userAccessSitesNoVS, int siteId); /** - * * @param virtualSiteId * @param actualSiteId */ void linkVirtualSite(int virtualSiteId, int actualSiteId); -} + +} \ No newline at end of file