WebSVN – SmartDukaan – Diff – /trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemController.java

 import java.util.HashMap;
 import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
+import java.util.stream.Collectors;
 import javax.servlet.http.HttpServletRequest;
 import org.apache.logging.log4j.LogManager;
 import org.apache.logging.log4j.Logger;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.annotation.Qualifier;
 import org.springframework.stereotype.Controller;
 import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.PathVariable;
 import org.springframework.web.bind.annotation.RequestBody;
 import org.springframework.web.bind.annotation.RequestMapping;
 import org.springframework.web.bind.annotation.RequestMethod;
 import org.springframework.web.bind.annotation.RequestParam;
 import com.spice.profitmandi.dao.entity.nonbillable.PartnerCurrentInventorySnapshot;
 import com.spice.profitmandi.dao.entity.nonbillable.ScanOutPartnerItem;
 import com.spice.profitmandi.dao.entity.nonbillable.Vendor;
 import com.spice.profitmandi.dao.entity.nonbillable.Warehouse;
 import com.spice.profitmandi.dao.entity.user.Address;
-import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
 import com.spice.profitmandi.dao.enumuration.nonbillable.InstructionItemStatus;
 import com.spice.profitmandi.dao.repository.dtr.RetailerRegisteredAddressRepository;
 import com.spice.profitmandi.dao.repository.dtr.RoleRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRepository;
 import com.spice.profitmandi.dao.repository.dtr.UserRoleRepository;
 import com.spice.profitmandi.service.nonbillable.InventoryService;
 import com.spice.profitmandi.service.user.RetailerService;
 import com.spice.profitmandi.service.user.UserService;
 import com.spice.profitmandi.web.model.LoginDetails;
 import com.spice.profitmandi.web.util.CookiesProcessor;
+import com.spice.profitmandi.web.util.MVCResponseSender;
 @Controller
 @Transactional
 public class ItemController {
 	@Autowired
 	@Qualifier("nonbillableItemRepository")
 	private ItemRepository itemRepository;
 	@Autowired
+	private MVCResponseSender mvcResponseSender;
+	@Autowired
 	@Qualifier("nonbillableInventoryService")
 	private InventoryService inventoryService;
 	@Autowired
 	private RoleRepository roleRepository;
 	@Autowired
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {} with body {}", request.getRequestURI(), scanInItemRequest);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<Integer> warehouseIds = userWarehouseRepository.selectWarehouseIdsByUserId(loginDetails.getFofoId());
-		List<Item> items = itemRepository.selectAll();
 		inventoryService.scanInItem(scanInItemRequest, loginDetails.getFofoId());
-		List<AdminCurrentInventorySnapshot> adminCurrentInventorySnapshots = adminCurrentInventorySnapshotRepository
-				.selectAllByAdminId(loginDetails.getFofoId(), offset, limit);
+		return getScanInItems(request, scanInItemRequest.getWarehouseId(), 0, 10, model);
-		Map<Integer, String> itemIdDescriptionMap = this
-				.adminCurrentInventorySnapshotsToItemIdDescriptionMap(adminCurrentInventorySnapshots);
-		long size = adminCurrentInventorySnapshotRepository.selectAllCountByAdminId(loginDetails.getFofoId());
-		if (!warehouseIds.isEmpty()) {
-			model.addAttribute("warehouses", warehouseRepository.selectByIds(new HashSet<>(warehouseIds)));
-		}
+	}
-		model.addAttribute("items", items);
+	@RequestMapping(value = "/authorisedWarehouses", method = RequestMethod.GET)
-		model.addAttribute("adminCurrentInventorySnapshots", adminCurrentInventorySnapshots);
+	public String getAuthorisedWarehouses(HttpServletRequest request, Model model) throws Throwable {
-		model.addAttribute("itemIdDescriptionMap", itemIdDescriptionMap);
+		LOGGER.info("Request Received at url {}", request.getRequestURI());
-		model.addAttribute("start", offset + 1);
+		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		model.addAttribute("size", size);
-		if (adminCurrentInventorySnapshots.size() < limit) {
+		List<Integer> warehouseIds = userWarehouseRepository.selectWarehouseIdsByUserId(loginDetails.getFofoId());
-			model.addAttribute("end", offset + adminCurrentInventorySnapshots.size());
+		List<Warehouse> authorisedWarehouses = warehouseRepository.selectByIds(new HashSet<>(warehouseIds));
-		} else {
-			model.addAttribute("end", offset + limit);
+		model.addAttribute("response", mvcResponseSender.createResponseString(authorisedWarehouses));
-		}
-		return "scan-in-items";
+		return "response";
+	}
-	@RequestMapping(value = "/getScanInItems", method = RequestMethod.GET)
+	@RequestMapping(value = "/getScanInItems/{warehouseId}", method = RequestMethod.GET)
-	public String getScanInItems(HttpServletRequest request,
+	public String getScanInItems(HttpServletRequest request, @PathVariable int warehouseId,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {}", request.getRequestURI());
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
+		LOGGER.info("Warehouse Id is  {}", request.getRequestURI());
-		List<Integer> warehouseIds = userWarehouseRepository.selectWarehouseIdsByUserId(loginDetails.getFofoId());
+		Warehouse warehouse = warehouseRepository.selectById(warehouseId);
 		List<Item> items = itemRepository.selectAll();
 		List<AdminCurrentInventorySnapshot> adminCurrentInventorySnapshots = adminCurrentInventorySnapshotRepository
-				.selectAllByAdminId(loginDetails.getFofoId(), offset, limit);
+				.selectAllByWarehouseId(warehouseId, offset, limit);
 		Map<Integer, String> itemIdDescriptionMap = this
 				.adminCurrentInventorySnapshotsToItemIdDescriptionMap(adminCurrentInventorySnapshots);
-		long size = adminCurrentInventorySnapshotRepository.selectAllCountByAdminId(loginDetails.getFofoId());
+		long size = adminCurrentInventorySnapshotRepository.selectAllCountByWarehouseId(warehouseId);
-		if (!warehouseIds.isEmpty()) {
-			model.addAttribute("warehouses", warehouseRepository.selectByIds(new HashSet<>(warehouseIds)));
-		}
 		model.addAttribute("items", items);
+		model.addAttribute("warehouse", warehouse);
 		model.addAttribute("adminCurrentInventorySnapshots", adminCurrentInventorySnapshots);
 		model.addAttribute("itemIdDescriptionMap", itemIdDescriptionMap);
 		model.addAttribute("start", offset + 1);
 		model.addAttribute("size", size);
 		if (adminCurrentInventorySnapshots.size() < limit) {
 			model.addAttribute("end", offset + limit);
+		}
 		return "scan-in-items";
+	}
-	@RequestMapping(value = "/getPaginatedScanInItems", method = RequestMethod.GET)
+	@RequestMapping(value = "/getPaginatedScanInItems/{warehouseId}", method = RequestMethod.GET)
-	public String getPaginatedScanInItems(HttpServletRequest request,
+	public String getPaginatedScanInItems(HttpServletRequest request, @PathVariable int warehouseId,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		List<AdminCurrentInventorySnapshot> adminCurrentInventorySnapshots = adminCurrentInventorySnapshotRepository
-				.selectAllByAdminId(loginDetails.getFofoId(), offset, limit);
+				.selectAllByWarehouseId(warehouseId);
 		Map<Integer, String> itemIdDescriptionMap = this
 				.adminCurrentInventorySnapshotsToItemIdDescriptionMap(adminCurrentInventorySnapshots);
 		model.addAttribute("adminCurrentInventorySnapshots", adminCurrentInventorySnapshots);
 		model.addAttribute("itemIdDescriptionMap", itemIdDescriptionMap);
 		return "scan-in-items-paginated";
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {} with body {}", request.getRequestURI(), instructionItemRequest);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		inventoryService.instructionItem(instructionItemRequest, loginDetails.getFofoId());
-		return this.getInstructionItems(request, offset, limit, model);
+		return this.getInstructionItems(request, instructionItemRequest.getWarehouseId(), offset, limit, model);
+	}
-	@RequestMapping(value = "/getInstructionItems", method = RequestMethod.GET)
+	@RequestMapping(value = "/getInstructionItems/{warehouseId}", method = RequestMethod.GET)
-	public String getInstructionItems(HttpServletRequest request,
+	public String getInstructionItems(HttpServletRequest request, @PathVariable int warehouseId,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {}", request.getRequestURI());
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<InstructionItem> instructionItems = instructionItemRepository.selectAllByAdminId(loginDetails.getFofoId(),
+		List<InstructionItem> instructionItems = instructionItemRepository.selectAllByWarehouseId(warehouseId, offset,
-				offset, limit);
+				limit);
 		LOGGER.info("instructionItems" + instructionItems);
 		Set<Integer> instructionItemWarehouseIds = this.instructionItemsToWarehouseIds(instructionItems);
 		LOGGER.info("instructionItemWarehouseIds" + instructionItemWarehouseIds);
-		List<Warehouse> warehouses = new ArrayList<>();
-		if (!instructionItemWarehouseIds.isEmpty()) {
-			warehouses = warehouseRepository.selectByIds(instructionItemWarehouseIds);
+		Warehouse warehouse = warehouseRepository.selectById(warehouseId);
-		}
-		Map<Integer, String> warehouseIdNameMap = this.warehouseIdNameMap(warehouses);
+		Map<Integer, String> userIdStoreNameMap = retailerService.getAllFofoRetailerIdNameMap();
-		List<Integer> warehouseIds = userWarehouseRepository.selectWarehouseIdsByUserId(loginDetails.getFofoId());
-		if (!warehouseIds.isEmpty()) {
-			model.addAttribute("warehouses", warehouseRepository.selectByIds(new HashSet<>(warehouseIds)));
-			LOGGER.info(warehouseRepository.selectByIds(new HashSet<>(warehouseIds)) + "warehouseIdNameMap");
-		}
-		List<Integer> userIds = userRoleRepository
-				.selectUserIdsByRoleId(roleRepository.selectByName(RoleType.FOFO_ADMIN.toString()).getId());
-		Map<Integer, String> userIdEmailIdMap = userService.getAllUseUserIdEmailIdMap(userIds);
-		model.addAttribute("fofoIdEmailIdMap", userIdEmailIdMap);
+		model.addAttribute("userIdStoreNameMap", userIdStoreNameMap);
-		long size = instructionItemRepository.selectCountByAdminId(loginDetails.getFofoId());
+		long size = instructionItemRepository.selectCountByWarehouseId(warehouseId);
-		model.addAttribute("warehouseIdNameMap", warehouseIdNameMap);
+		model.addAttribute("warehouse", warehouse);
 		model.addAttribute("instructionItems", instructionItems);
 		model.addAttribute("start", offset + 1);
 		model.addAttribute("size", size);
 		if (instructionItems.size() < limit) {
 			model.addAttribute("end", offset + instructionItems.size());
+		}
 		return "instruction-items";
+	}
-	@RequestMapping(value = "/getPaginatedInstructionItems", method = RequestMethod.GET)
+	@RequestMapping(value = "/getPaginatedInstructionItems/{warehouseId}", method = RequestMethod.GET)
-	public String getPaginatedInstructionItems(HttpServletRequest request,
+	public String getPaginatedInstructionItems(HttpServletRequest request, @PathVariable int warehouseId,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<InstructionItem> instructionItems = instructionItemRepository.selectAllByAdminId(loginDetails.getFofoId(),
+		List<InstructionItem> instructionItems = instructionItemRepository.selectAllByWarehouseId(warehouseId, offset,
-				offset, limit);
+				limit);
-		Set<Integer> warehouseIds = this.instructionItemsToWarehouseIds(instructionItems);
-		List<Warehouse> warehouses = warehouseRepository.selectByIds(warehouseIds);
+		Warehouse warehouse = warehouseRepository.selectById(warehouseId);
-		Map<Integer, String> warehouseIdNameMap = this.warehouseIdNameMap(warehouses);
-		model.addAttribute("warehouseIdNameMap", warehouseIdNameMap);
+		model.addAttribute("warehouse", warehouse);
 		model.addAttribute("instructionItems", instructionItems);
 		return "scan-out-partner-items-paginated";
+	}
 	@RequestMapping(value = "/scanOutPartnerItem", method = RequestMethod.POST)
 		if (adminDeliveryNote.getCompleteTimestamp() != null) {
 			throw new ProfitMandiBusinessException(
 					ProfitMandiConstants.DELIVERY_NOTE_ID + ", " + ProfitMandiConstants.FOFO_ID,
 					deliveryNoteId + ", " + loginDetails.getFofoId(), "NNBLBL_ITM_1002");
+		}
-		Warehouse warehouse = warehouseRepository.selectId(adminDeliveryNote.getWarehouseId());
+		Warehouse warehouse = warehouseRepository.selectById(adminDeliveryNote.getWarehouseId());
 		List<Integer> instructionItemIds = adminDeliveryNoteDetailRepository
 				.selectInstructionItemIdsByDeliveryNoteId(deliveryNoteId);
 		List<InstructionItemDetail> instructionItemDetails = instructionItemDetailRepository
 				.selectByInstructionItemIds(new HashSet<>(instructionItemIds));
 		Map<Integer, Integer> itemIdQuantityMap = this
 	public String getPendingInstructionItems(HttpServletRequest request,
 			@RequestParam(name = ProfitMandiConstants.WAREHOUSE_ID) int warehouseId,
 			@RequestParam(name = ProfitMandiConstants.USER_ID) int userId, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {}", request.getRequestURI());
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<InstructionItem> instructionItems = instructionItemRepository.selectByAdminIdWarehouseIdUserIdStatus(
+		List<InstructionItem> instructionItems = instructionItemRepository.selectByWarehouseIdUserIdStatus(warehouseId,
-				loginDetails.getFofoId(), warehouseId, userId, InstructionItemStatus.PENDING);
+				userId, InstructionItemStatus.PENDING);
 		Set<Integer> instructionItemIds = this.instructionItemsToInstructionItemIds(instructionItems);
 		List<InstructionItemDetail> instructionItemDetails = instructionItemDetailRepository
 				.selectByInstructionItemIds(instructionItemIds);
 		Set<Integer> itemIds = this.instructionItemDetailsToItemIds(instructionItemDetails);
 		Map<Integer, List<InstructionItemDetail>> instructionItemIdInstructionItemDetailsMap = this
 		model.addAttribute("itemIdDescriptionMap", itemIdDescriptionMap);
 		model.addAttribute("itemIdTypeMap", itemIdTypeMap);
 		return "pending-instruction-items";
+	}
-	@RequestMapping(value = "/getScanOutItems", method = RequestMethod.GET)
+	@RequestMapping(value = "/getScanOutItems/{warehouseId}", method = RequestMethod.GET)
-	public String getScanOutItems(HttpServletRequest request,
+	public String getScanOutItems(HttpServletRequest request, @PathVariable int warehouseId,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {}", request.getRequestURI());
-		// List<AdminCurrentInventorySnapshot> adminCurrentInventorySnapshots =
-		// adminCurrentInventorySnapshotRepository.selectAll();
-		// Set<Integer> adminIds = this.getAdminIds(adminCurrentInventorySnapshots);
+		List<InstructionItem> instructionItems = instructionItemRepository.selectByWarehouseIdStatus(warehouseId,
-		// Map<Integer, String> adminIdEmailIdMap =
+				InstructionItemStatus.PENDING);
-		// retailerService.getAllFofoRetailerIdEmailIdMap(adminIds);
+		Map<Integer, String> fofoIdNameMap = retailerService.getFofoRetailerIdNameMap(
-		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
-		List<InstructionItem> instructionItems = instructionItemRepository
+				instructionItems.stream().map(InstructionItem::getFofoId).collect(Collectors.toList()));
-				.selectByAdminIdStatus(loginDetails.getFofoId(), InstructionItemStatus.PENDING);
-		List<Warehouse> warehouses = new ArrayList<>();
-		Map<Integer, String> fofoIdEmailIdMap = new HashMap<>();
-		if (!instructionItems.isEmpty()) {
-			Set<Integer> warehouseIds = this.instructionItemsToWarehouseIds(instructionItems);
-			warehouses = warehouseRepository.selectByIds(warehouseIds);
+		Warehouse warehouse = warehouseRepository.selectById(warehouseId);
-			Set<Integer> fofoIds = this.instructionItemsToFofoIds(instructionItems);
-			fofoIdEmailIdMap = retailerService.getAllFofoRetailerIdEmailIdMap(fofoIds);
+		long deliveryNotesCount = adminDeliveryNoteRepository.selectAllByWarehouseIdCount(warehouseId);
-		}
-		List<AdminDeliveryNote> adminDeliveryNotes = adminDeliveryNoteRepository.selectAll(offset, limit);
+		List<AdminDeliveryNote> adminDeliveryNotes = null;
-		Map<Integer, String> warehouseIdNameMap = new HashMap<>();
-		if (!adminDeliveryNotes.isEmpty()) {
+		if (deliveryNotesCount > 0) {
-			List<Warehouse> adminDeliveryNoteWarehouses = warehouseRepository
+			adminDeliveryNotes = adminDeliveryNoteRepository.selectAllByWarehouseId(warehouseId, offset, limit);
-					.selectByIds(this.adminDeliveryNotesToWarehouseIds(adminDeliveryNotes));
-			warehouseIdNameMap = this.warehouseIdNameMap(adminDeliveryNoteWarehouses);
-			fofoIdEmailIdMap = retailerService
+		} else {
-					.getAllFofoRetailerIdEmailIdMap(this.adminDeliveryNotesToFofoIds(adminDeliveryNotes));
+			adminDeliveryNotes = new ArrayList<>();
+		}
 		long size = adminDeliveryNoteRepository.selectAllCount();
-		// model.addAttribute("adminIdEmailIdMap", adminIdEmailIdMap);
+		model.addAttribute("warehouse", warehouse);
 		model.addAttribute("adminDeliveryNotes", adminDeliveryNotes);
-		model.addAttribute("warehouses", warehouses);
-		model.addAttribute("warehouseIdNameMap", warehouseIdNameMap);
-		model.addAttribute("fofoIdEmailIdMap", fofoIdEmailIdMap);
+		model.addAttribute("fofoIdNameMap", fofoIdNameMap);
 		model.addAttribute("start", offset + 1);
 		model.addAttribute("size", size);
 		if (adminDeliveryNotes.size() < limit) {
 			model.addAttribute("end", offset + adminDeliveryNotes.size());
 		} else {
 			@RequestParam(name = "limit", defaultValue = "10") int limit, Model model)
 			throws ProfitMandiBusinessException {
 		LOGGER.info("Request Received at url {} with body {}", request.getRequestURI(), scanOutItemRequest);
 		LoginDetails loginDetails = cookiesProcessor.getCookiesObject(request);
 		inventoryService.scanOutItem(scanOutItemRequest, loginDetails.getFofoId());
-		return this.getScanOutItems(request, offset, limit, model);
+		return this.getScanOutItems(request, scanOutItemRequest.getWarehouseId(), offset, limit, model);
+	}
 	@RequestMapping(value = "/getPaginatedScanOutItems", method = RequestMethod.GET)
 	public String getPaginatedScanOutItems(HttpServletRequest request,
 			@RequestParam(name = "offset", defaultValue = "0") int offset,

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-fofo/src/main/java/com/spice/profitmandi/web/controller/ItemController.java @ 24282 – Rev 23984 → 24168