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

 import com.spice.profitmandi.common.model.UserInfo;
 import com.spice.profitmandi.common.solr.SolrService;
 import com.spice.profitmandi.common.web.client.RestClient;
 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.entity.catalog.*;
+import com.spice.profitmandi.dao.entity.dtr.WebListing;
 import com.spice.profitmandi.dao.entity.dtr.WebOffer;
 import com.spice.profitmandi.dao.entity.fofo.FofoStore;
 import com.spice.profitmandi.dao.entity.fofo.SuggestedPo;
 import com.spice.profitmandi.dao.entity.fofo.SuggestedPoDetail;
 import com.spice.profitmandi.dao.entity.inventory.SaholicCISTable;
 import com.spice.profitmandi.dao.entity.inventory.SaholicPOItem;
+import com.spice.profitmandi.dao.enumuration.dtr.WebListingType;
 import com.spice.profitmandi.dao.model.CreateOfferRequest;
 import com.spice.profitmandi.dao.model.UserCart;
 import com.spice.profitmandi.dao.repository.catalog.*;
 import com.spice.profitmandi.dao.repository.dtr.FofoStoreRepository;
 import com.spice.profitmandi.dao.repository.dtr.Mongo;
 import com.spice.profitmandi.dao.repository.dtr.WebOfferRepository;
 import com.spice.profitmandi.dao.repository.fofo.SuggestedPoDetailRepository;
 import com.spice.profitmandi.dao.repository.fofo.SuggestedPoRepository;
 import com.spice.profitmandi.dao.repository.inventory.SaholicCISTableRepository;
 import com.spice.profitmandi.service.authentication.RoleManager;
+import com.spice.profitmandi.service.catalog.BrandsService;
 import com.spice.profitmandi.service.inventory.*;
 import com.spice.profitmandi.service.pricecircular.PriceCircularItemModel;
 import com.spice.profitmandi.service.pricecircular.PriceCircularModel;
 import com.spice.profitmandi.service.pricecircular.PriceCircularService;
 import com.spice.profitmandi.service.pricing.PricingService;
 	private ComboModelRepository comboModelRepository;
 	@Autowired
 	private ComboMappedModelRepository comboMappedModelRepository;
+	@Autowired
+	private BrandsService brandsService;
 	List<String> filterableParams = Arrays.asList("brand");
 	@RequestMapping(value = "/fofo/buckets", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getBuckets(HttpServletRequest request) throws ProfitMandiBusinessException {
 		logger.info("Request " + request.getParameterMap());
 		return responseSender.ok(dealResponse);
+	}
 	@RequestMapping(value = "/suggestedPo/status", method = RequestMethod.POST, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "")
 	public ResponseEntity<?> changeSuggestedPoStatus(HttpServletRequest request, @RequestParam int id)
 			throws ProfitMandiBusinessException {
 		SuggestedPo suggestedPo = suggestedPoRepository.selectById(id);
 		suggestedPo.setStatus("closed");
+		}
 		return String.join(",", strTagIds);
+	}
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/fofo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getFofo(HttpServletRequest request,
-									 @RequestParam(value = "categoryId", required = false, defaultValue = "3") String categoryId,
+			@RequestParam(value = "categoryId", required = false, defaultValue = "3") String categoryId,
-									 @RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
+			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
-									 @RequestParam(value = "sort", required = false) String sort,
+			@RequestParam(value = "sort", required = false) String sort,
-									 @RequestParam(value = "brand", required = false) String brand,
+			@RequestParam(value = "brand", required = false) String brand,
-									 @RequestParam(value = "subCategoryId", required = false) int subCategoryId,
+			@RequestParam(value = "subCategoryId", required = false) int subCategoryId,
-									 @RequestParam(value = "q", required = false) String queryTerm,
+			@RequestParam(value = "q", required = false) String queryTerm,
-									 @RequestParam(value = "hotDeal", required = false) boolean hotDeal) throws Throwable {
+			@RequestParam(value = "hotDeal", required = false) boolean hotDeal) throws Throwable {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		FofoStore fs = fofoStoreRepository.selectByRetailerId(userInfo.getRetailerId());
 		sort = "w" + fs.getWarehouseId() + "_i desc";
 		dealResponse = this.getCatalogResponse(
 		return responseSender.ok(dealResponse);
+	}
 	@RequestMapping(value = "/online-deals", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get online deals")
 	public ResponseEntity<?> getOnlineDeals(HttpServletRequest request,
-											@RequestParam(value = "categoryId") String categoryId, @RequestParam(value = "offset") String offset,
+			@RequestParam(value = "categoryId") String categoryId, @RequestParam(value = "offset") String offset,
-											@RequestParam(value = "limit") String limit, @RequestParam(value = "sort", required = false) String sort,
+			@RequestParam(value = "limit") String limit, @RequestParam(value = "sort", required = false) String sort,
-											@RequestParam(value = "direction", required = false) String direction,
+			@RequestParam(value = "direction", required = false) String direction,
-											@RequestParam(value = "filterData", required = false) String filterData) throws Throwable {
+			@RequestParam(value = "filterData", required = false) String filterData) throws Throwable {
 		logger.info("Request " + request.getParameterMap());
 		String response = null;
 		int userId = (int) request.getAttribute("userId");
 		String uri = "/deals/" + userId;
 		return new Gson().fromJson(jsonObject.toString(), DealsResponse.class);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_BRANDS, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get brand list and count for category")
 	public ResponseEntity<?> getBrands(HttpServletRequest request,
-									   @RequestParam(value = "category_id") String category_id) throws ProfitMandiBusinessException {
+			@RequestParam(value = "category_id") String category_id) throws ProfitMandiBusinessException {
 		logger.info("Request " + request.getParameterMap());
 		String response = null;
 		// TODO: move to properties
 		String uri = ProfitMandiConstants.URL_BRANDS;
 		RestClient rc = new RestClient();
 		return responseSender.ok(dealBrandsResponse);
+	}
 	@RequestMapping(value = ProfitMandiConstants.URL_UNIT_DEAL, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get unit deal object")
 	public ResponseEntity<?> getUnitDeal(HttpServletRequest request, @PathVariable(value = "id") long id)
 			throws ProfitMandiBusinessException {
 		String response = null;
 		// TODO: move to properties
 		return responseSender.ok(dealsResponse);
+	}
 	@RequestMapping(value = "/partnerdeals/{id}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@ApiOperation(value = "Get unit deal object")
 	public ResponseEntity<?> getUnitFocoDeal(HttpServletRequest request, @PathVariable(value = "id") long id)
 			throws Exception {
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		List<Integer> tagIds = Arrays.asList(4);
 		return responseSender.ok(dealResponse.get(0));
+	}
 	@RequestMapping(value = "/fofo/brands", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getBrandsToDisplay(HttpServletRequest request,
-												@RequestParam(required = false, defaultValue = "0") int categoryId) throws Exception {
+			@RequestParam(required = false, defaultValue = "0") int categoryId) throws Exception {
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		logger.info("userInfo [{}]", userInfo);
 		List<DBObject> brandsDisplay = mongoClient.getMongoBrands(userInfo.getRetailerId(), userInfo.getEmail(),
 				categoryId);
 		return new ResponseEntity<>(brandsDisplay, HttpStatus.OK);
+	}
+	@RequestMapping(value = "/fofo/brandCatalog", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+	public ResponseEntity<?> getBrands(HttpServletRequest request,
+			@RequestParam(required = false, defaultValue = "0") int categoryId) throws Exception {
+		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
+		logger.info("userInfo [{}]", userInfo);
+		List<BrandCatalog> brandsDisplay = brandsService.getBrands(userInfo.getRetailerId(), userInfo.getEmail(),
+				categoryId);
+		return new ResponseEntity<>(brandsDisplay, HttpStatus.OK);
+	}
 	@RequestMapping(value = "/fofo/accessory/all-categories", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getSubCategoriesToDisplay(HttpServletRequest request) throws Exception {
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		logger.info("userInfo [{}]", userInfo);
 		List<DBObject> subCategoriesDisplay = this.getSubCategoriesToDisplay();
 	public ResponseEntity<?> getSubcategoriesToDisplay() {
 		return new ResponseEntity<>(mongoClient.getSubcategoriesToDisplay(), HttpStatus.OK);
+	}
 	@ApiImplicitParams({
-			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header")})
+			@ApiImplicitParam(name = "Auth-Token", value = "Auth-Token", required = true, dataType = "string", paramType = "header") })
 	@RequestMapping(value = "/deals/skus/{skus}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	public ResponseEntity<?> getDealsBySkus(@PathVariable String skus) throws ProfitMandiBusinessException {
 		StringBuffer sb = new StringBuffer("/getDealsForNotification/");
 		String uri = sb.append(skus).toString();
 		RestClient rc = new RestClient();
+			}
 			fofoCatalogResponse.setBrand(doc.getJSONArray("brand_ss").getString(0));
 			if (doc.has("_childDocuments_")) {
 				String modelColorClass = "grey";
 				FofoAvailabilityInfo fdiAnyColour = null;
-				//Iterating itemIds
+				// Iterating itemIds
 				for (int j = 0; j < doc.getJSONArray("_childDocuments_").length(); j++) {
 					PriceCircularItemModel priceCircularItemModel = priceCircularItemModelMap
 							.get(fofoCatalogResponse.getCatalogId());
 					JSONObject childItem = doc.getJSONArray("_childDocuments_").getJSONObject(j);
 					int itemId = childItem.getInt("itemId_i");
 					float sellingPrice = (float) childItem.getDouble("sellingPrice_f");
-					if (!fofoAvailabilityInfoMap.containsKey(itemId))  {
+					if (!fofoAvailabilityInfoMap.containsKey(itemId)) {
 						FofoAvailabilityInfo fdi = new FofoAvailabilityInfo();
-						List<SaholicCISTable> currentAvailability = saholicCISTableRepository.selectByItemWarehouse(itemId, warehouseId);
+						List<SaholicCISTable> currentAvailability = saholicCISTableRepository
+								.selectByItemWarehouse(itemId, warehouseId);
 						List<SaholicPOItem> poItemAvailability = null;
 						if (poItemAvailabilityMap != null) {
 							poItemAvailability = poItemAvailabilityMap.get(itemId);
+						}
 						fdi.setNlc(priceCircularItemModel == null ? 0 : priceCircularItemModel.getNetPrice());
 									saholicCISTable.setReserved(0);
 									saholicCISTable.setItemId(itemId);
 									saholicCISTable.setWarehouseId(warehouseId);
 									saholicCISTable.setPopendingQty(saholicPOItem.getUnfulfilledQty());
 									saholicCISTable.setWarehouseFrom(saholicPOItem.getWarehouseFrom());
-									saholicCISTable.setWarehouseName(ProfitMandiConstants.WAREHOUSE_MAP
+									saholicCISTable.setWarehouseName(
-											.get(saholicPOItem.getWarehouseFrom()));
+											ProfitMandiConstants.WAREHOUSE_MAP.get(saholicPOItem.getWarehouseFrom()));
 									map.put(saholicPOItem.getWarehouseFrom(), saholicCISTable);
+								}
+							}
+						}
 						fdi.setSaholicCISTableList(new ArrayList<>(map.values()));
 						} else if (poItemAvailability != null && poItemAvailability.stream()
 								.collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty)) > 0) {
 							if (currentAvailability != null && poItemAvailability.stream()
 									.collect(Collectors.summingInt(SaholicPOItem::getUnfulfilledQty))
 									+ currentAvailability.stream()
-									.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)) <= 0) {
+											.collect(Collectors.summingInt(SaholicCISTable::getNetAvailability)) <= 0) {
 								poColor = "grey";
 							} else {
 								poColor = "yellow";
 								if (modelColorClass != "green") {
 									modelColorClass = poColor;
 		return dealResponse;
+	}
 	private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray docs, Map<Integer, Integer> itemFilter,
-																  boolean hotDeal) throws ProfitMandiBusinessException {
+			boolean hotDeal) throws ProfitMandiBusinessException {
 		Map<Integer, TagListing> itemTagListingMap = null;
 		List<FofoCatalogResponse> dealResponse = new ArrayList<>();
 		List<Integer> tagIds = Arrays.asList(4);
 		itemTagListingMap = tagListingRepository.selectByItemIdsAndTagIds(itemFilter.keySet(), new HashSet<>(tagIds))

Subversion Repositories SmartDukaan

(root)/trunk/profitmandi-web/src/main/java/com/spice/profitmandi/web/controller/DealsController.java – Rev 31324 → 31507