WebSVN – SmartDukaan – Diff – /trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java

 package com.spice.profitmandi.service;
+import com.spice.profitmandi.service.warehouse.BillingWarehouseService;
 import com.google.gson.Gson;
 import com.spice.profitmandi.common.enumuration.ReporticoProject;
 import com.spice.profitmandi.common.exception.ProfitMandiBusinessException;
 import com.spice.profitmandi.common.model.*;
 import com.spice.profitmandi.dao.entity.auth.AuthUser;
 import java.util.stream.LongStream;
 @Component
 public class AdminUser {
+    @Autowired
+    private BillingWarehouseService billingWarehouseService;
     // These users see every sidebar menu regardless of auth.menu_category (as do L5 position holders).
     public static final List<String> ALL_MENU_EMAILS = Arrays.asList("amit.gupta@smartdukaan.com", "ranu.rajput@smartdukaan.com",
             "vikas.jangra@smartdukaan.com", "tanay.gupta@smartdukaan.com", "rudy.kanwar@smartdukaan.com");
     @Autowired
     private Gson gson;
     public Map<String, Object> getFilter(int warehouseId, String email, LocalDateTime date, LocalDateTime endDate)
             throws ProfitMandiBusinessException {
         Map<String, Object> map = new HashMap<>();
         Map<Integer, CustomRetailer> customRetailerMap = retailerService.getAllFofoRetailers();
         Map<Integer, CustomRetailer> crm = null;
-        Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
+        Map<Integer, String> warehouseMap = billingWarehouseService.getActiveWarehouses();
         Set<Integer> fofoIds = csService1.getAuthFofoIds(email, true);
         if (warehouseId != 0) {
             Map<Integer, PartnerDetailModel> warehousePartnerDetailMap = null;
             Map<Integer, WarehouseWiseStockModel> warehouseStockMap;
             LinkedHashMap<Integer, WarehouseWiseStockModel> warehouseStockSortedMap = new LinkedHashMap<>();
-            Map<Integer, String> warehouseMap = ProfitMandiConstants.WAREHOUSE_MAP;
+            Map<Integer, String> warehouseMap = billingWarehouseService.getActiveWarehouses();
             Map<Integer, String> wm = new LinkedHashMap<>();
             Map<AuthUser, Long> authUserTicketCount = null;
             LoanSummary loanSummary = sdCreditService.getLoanSummary();
     private Map<Integer, List<Integer>> getWarehouseIdFofoIdMap(Set<Integer> fofoIds) throws ProfitMandiBusinessException {
         Map<Integer, List<Integer>> warehouseIdFofoIdMap = fofoStoreRepository
                 .selectActivePartnersByRetailerIds(new ArrayList<>(fofoIds)).stream()
                 .collect(Collectors.groupingBy(FofoStore::getWarehouseId,
                         Collectors.mapping(FofoStore::getId, Collectors.toList())));
-        // Every warehouse holding stock gets a row, even with no franchise store of its own - a hub such as the
+        // Dashboards list the ACTIVE warehouses: each gets a row even with no franchise store of its own (a hub such
-        // HR warehouses carries only internal movement stores, so the store grouping above never lists it.
+        // as the HR warehouses carries only internal movement stores), and a suspended or closed one gets none even
+        // while it still holds stock.
-        for (Integer stockWarehouseId : saholicInventoryCISRepository.selectWarehouseIdsWithStock()) {
+        Set<Integer> activeWarehouseIds = billingWarehouseService.getActiveWarehouses().keySet();
+        for (Integer activeWarehouseId : activeWarehouseIds) {
-            warehouseIdFofoIdMap.putIfAbsent(stockWarehouseId, new ArrayList<>());
+            warehouseIdFofoIdMap.putIfAbsent(activeWarehouseId, new ArrayList<>());
+        }
+        warehouseIdFofoIdMap.keySet().retainAll(activeWarehouseIds);
         return warehouseIdFofoIdMap;
+    }
     private List<Menu> prepareMenu(List<Menu> menus) {
         List<Menu> returnMenu = new ArrayList<>();
     private String getWarehouses(Set<CustomRetailer> positionRetailers) {
         Map<Integer, String> warehouses = new HashMap<>();
         positionRetailers.stream().forEach(x -> {
             if (x.getWarehouseId() != 0) {
-                warehouses.put(x.getWarehouseId(), ProfitMandiConstants.WAREHOUSE_MAP.get(x.getWarehouseId()));
+                warehouses.put(x.getWarehouseId(), billingWarehouseService.getName(x.getWarehouseId()));
+            }
         });
         return gson.toJson(warehouses);
+    }

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-dao/src/main/java/com/spice/profitmandi/service/AdminUser.java – Rev 37834 → 37845