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

 import com.spice.profitmandi.common.web.util.ResponseSender;
 import com.spice.profitmandi.dao.enumuration.dtr.RoleType;
 import com.spice.profitmandi.dao.model.UserCart;
 import com.spice.profitmandi.dao.repository.dtr.Mongo;
 import com.spice.profitmandi.dao.repository.dtr.UserAccountRepository;
-import com.spice.profitmandi.dao.service.inventory.InventoryService;
+import com.spice.profitmandi.service.inventory.InventoryService;
 import com.spice.profitmandi.service.pricing.PricingService;
 import com.spice.profitmandi.web.res.DealBrands;
 import com.spice.profitmandi.web.res.DealObjectResponse;
 import com.spice.profitmandi.web.res.DealsResponse;
 import com.spice.profitmandi.web.res.FofoAvailabilityInfo;
 	private static final Logger logger = LoggerFactory.getLogger(DealsController.class);
 	@Value("${python.api.host}")
 	private String host;
 	@Value("${python.api.port}")
 	private int port;
 	@Value("${fofo.warehouseIds}")
 	private int[] warehouseIds;
 	@Autowired
 	private UserAccountRepository userAccountRepository;
 	@Autowired
-	ResponseSender<?> responseSender;
+	private ResponseSender<?> responseSender;
 	@Autowired
-	InventoryService inventoryService;
+	private InventoryService inventoryService;
 	List<String> filterableParams = Arrays.asList("brand");
 	@RequestMapping(value = ProfitMandiConstants.URL_DEALS, method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
 	@ApiOperation(value = "Get deals")
 	public ResponseEntity<?> getDeals(HttpServletRequest request, @RequestParam(value = "categoryId") String categoryId,
 			@RequestParam(value = "offset") String offset, @RequestParam(value = "limit") String limit,
 			@RequestParam(value = "sort", required = false) String sort,
 			@RequestParam(value = "direction", required = false) String direction,
-			@RequestParam(value = "filterData", required = false) String filterData) throws Throwable {
+			@RequestParam(value = "filterData", required = false) String filterData) throws ProfitMandiBusinessException {
 		logger.info("Request " + request.getParameterMap());
 		String response = null;
 		int userId = (int) request.getAttribute("userId");
 		UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
 		// TODO: move to properties
 		params.put("source", "deals");
 		if (userInfo.getRoleNames().contains(RoleType.FOFO.toString())) {
 			params.put("tag_ids", getCommaSeparateTags(userId));
+		}
 		List<Object> responseObject = new ArrayList<>();
-		try {
-			response = rc.get(uri, params);
+		response = rc.get(uri, params);
-		} catch (Exception e) {
-			logger.error("Unable to get deals", e);
-			final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
-					request.getRequestURL().toString(), HttpStatus.INTERNAL_SERVER_ERROR.toString(),
-					HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.FAILURE, responseObject);
-			return new ResponseEntity<>(profitMandiResponse, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		JsonArray result_json = Json.parse(response).asArray();
 		for (JsonValue j : result_json) {
 			//logger.info("res " + j.asArray());
 			List<Object> innerObject = new ArrayList<>();
 			for (JsonValue jsonObject : j.asArray()) {
 				request.getRequestURL().toString(), HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS,
 				responseObject);
 		return new ResponseEntity<>(profitMandiResponse, HttpStatus.OK);
+	}
-	private String getCommaSeparateTags(int userId) throws Throwable {
+	private String getCommaSeparateTags(int userId){
 		UserCart uc = userAccountRepository.getUserCart(userId);
 		List<Integer> tagIds = pricingService.getTagsIdsByRetailerId(uc.getUserId());
 		List<String> strTagIds = new ArrayList<>();
 		for (Integer tagId : tagIds) {
 			strTagIds.add(String.valueOf(tagId));
 		params.put("filterData", filterData);
 		/*if (userInfo.getRoleNames().contains(RoleType.FOFO.toString())) {
 			params.put("tag_ids", getCommaSeparateTags(userId));
 		}*/
 		List<Object> responseObject = new ArrayList<>();
-		try {
-			response = rc.get(uri, params);
+		response = rc.get(uri, params);
-		} catch (Exception e) {
-			logger.error("Unable to get deals", e);
-			final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
-					request.getRequestURL().toString(), HttpStatus.INTERNAL_SERVER_ERROR.toString(),
-					HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.FAILURE, responseObject);
-			return new ResponseEntity<>(profitMandiResponse, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		JsonArray result_json = Json.parse(response).asArray();
 		for (JsonValue j : result_json) {
 			//logger.info("res " + j.asArray());
 			List<Object> innerObject = new ArrayList<>();
 			for (JsonValue jsonObject : j.asArray()) {
 	@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") })
 	@ApiOperation(value = "Get brand list and count for category")
 	public ResponseEntity<?> getBrands(HttpServletRequest request,
-			@RequestParam(value = "category_id") String category_id) {
+			@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(SchemeType.HTTP, host, port);
 		Map<String, String> params = new HashMap<>();
 		params.put("category_id", category_id);
 		List<DealBrands> dealBrandsResponse = null;
-		try {
-			response = rc.get(uri, params);
+		response = rc.get(uri, params);
-		} catch (Exception e) {
-			logger.error("Unable to get deals", e);
-			final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
-					request.getRequestURL().toString(), HttpStatus.INTERNAL_SERVER_ERROR.toString(),
-					HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.FAILURE, dealBrandsResponse);
-			return new ResponseEntity<>(profitMandiResponse, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		dealBrandsResponse = new Gson().fromJson(response, new TypeToken<List<DealBrands>>() {
 		}.getType());
 		final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
 				request.getRequestURL().toString(), HttpStatus.OK.toString(), HttpStatus.OK, ResponseStatus.SUCCESS,
 				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") })
 	@ApiOperation(value = "Get unit deal object")
-	public ResponseEntity<?> getUnitDeal(HttpServletRequest request, @PathVariable(value = "id") long id) {
+	public ResponseEntity<?> getUnitDeal(HttpServletRequest request, @PathVariable(value = "id") long id)
+			throws ProfitMandiBusinessException{
 		String response = null;
 		// TODO: move to properties
 		String uri = "getDealById/" + id;
 		System.out.println("Unit deal " + uri);
 		RestClient rc = new RestClient(SchemeType.HTTP, host, port);
 		Map<String, String> params = new HashMap<>();
 		DealsResponse dealsResponse = null;
-		try {
-			response = rc.get(uri, params);
+		response = rc.get(uri, params);
-		} catch (Exception e) {
-			logger.error("Unable to get deals", e);
-			final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
-					request.getRequestURL().toString(), HttpStatus.INTERNAL_SERVER_ERROR.toString(),
-					HttpStatus.INTERNAL_SERVER_ERROR, ResponseStatus.FAILURE, dealsResponse);
-			return new ResponseEntity<>(profitMandiResponse, HttpStatus.INTERNAL_SERVER_ERROR);
-		}
 		JsonObject result_json = Json.parse(response).asObject();
 		if (!result_json.isEmpty()) {
 			dealsResponse = new Gson().fromJson(response, DealsResponse.class);
+		}
 		final ProfitMandiResponse<?> profitMandiResponse = new ProfitMandiResponse<>(LocalDateTime.now(),
+	}
 	@ApiImplicitParams({
 		@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 Throwable {
+	public ResponseEntity<?> getDealsBySkus(@PathVariable String skus) throws ProfitMandiBusinessException {
 		StringBuffer sb = new StringBuffer("/getDealsForNotification/");
 		String uri = sb.append(skus).toString();
 		RestClient rc = new RestClient(SchemeType.HTTP, host, port);
 		String response = rc.get(uri, new HashMap<>());
 		JsonArray result_json = Json.parse(response).asArray();

Subversion Repositories SmartDukaan

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