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

 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.entity.similarModel.SimilarModel;
 import com.spice.profitmandi.dao.enumuration.dtr.WebListingSource;
 import com.spice.profitmandi.dao.enumuration.dtr.WebListingType;
 import com.spice.profitmandi.dao.model.AmountModel;
 import com.spice.profitmandi.dao.model.CreateOfferRequest;
 import com.spice.profitmandi.dao.model.UserCart;
             strTagIds.add(String.valueOf(tagId));
+        }
         return String.join(",", strTagIds);
+    }
+    @RequestMapping(value = "/fofo/similar-models/{modelId}", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> similarModels(HttpServletRequest httpServletRequest, @PathVariable int modelId) throws Throwable {
+        UserInfo userInfo = (UserInfo) httpServletRequest.getAttribute("userInfo");
+        //FofoStore fs = fofoStoreRepository.selectByRetailerId(userInfo.getRetailerId());
+        JSONObject jsonObject = solrService.getContentByCatalogIds(Arrays.asList(modelId)).get(modelId);
+        JSONArray similarModelsArray = jsonObject.getJSONArray("similarModels_ii");
+        List<Integer> similarCatalogIds = new ArrayList<>();
+        for (int j = 0; j < similarModelsArray.length(); j++) {
+            similarCatalogIds.add(similarModelsArray.getInt(j));
+        }
+        Map<String, String> params = new HashMap<>();
+        List<String> mandatoryQ = new ArrayList<>();
+        mandatoryQ.add(String.format(
+                "+{!parent which=\"catalogId_i:(" + StringUtils.join(similarCatalogIds, " ") + ")\"} AND active_b:true AND show_default_b:true"));
+        params.put("q", StringUtils.join(mandatoryQ, " "));
+        params.put("fl", "*, [child parentFilter=id:catalog* childFilter=active_b:true ]");
+        params.put("wt", "json");
+        params.put("rows", similarCatalogIds.size() + "");
+        try {
+            String response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+            JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
+            JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+            return responseSender.ok(this.getCatalogResponse(docs, false, userInfo.getRetailerId()));
+        } catch (HttpHostConnectException e) {
+            throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
+    }
     @ApiImplicitParams({@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 = "offset") int offset,
                                      @RequestParam(value = "limit") int limit, @RequestParam(value = "sort", required = false) String sort, @RequestParam(value = "brand", required = false) String brand, @RequestParam(value = "subCategoryId", required = false) int subCategoryId, @RequestParam(value = "q", required = false) String queryTerm, @RequestParam(value = "hotDeal", required = false) boolean hotDeal, @RequestParam(value = "endPoint", required = false) String endPoint) throws Throwable {
         List<FofoCatalogResponse> dealResponse;
         Map<Integer, List<Integer>> similarModelMap = dealResponse.stream().filter(x -> x.getSimilarModelIds() != null && x.getSimilarModelIds().size() > 0)
                 .collect(Collectors.toMap(x -> x.getCatalogId(), x -> x.getSimilarModelIds()));
         Set<Integer> similarModelIds = similarModelMap.values().stream().flatMap(x -> x.stream()).collect(Collectors.toSet());
         logger.info("similarModelIds - {}", similarModelIds);
-        if(similarModelIds.size() > 0) {
+        if (similarModelIds.size() > 0) {
-            WebListing webListing = new WebListing();
-            webListing.setType(WebListingType.solr);
-            webListing.setSolrQuery("catalogId_i:(" + String.join(" ", similarModelIds.stream().map(x -> String.valueOf(x)).collect(Collectors.toList())) + ")");
-            Map<Integer, FofoCatalogResponse> similarCatalogResponsesMap = this.getDealResponses(userInfo, webListing, 0, 300).stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
+            Map<Integer, FofoCatalogResponse> similarCatalogResponsesMap = this.getSimpleDocs(similarModelIds).stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
             logger.info("Similar Catalog ResponseMap - {}", similarCatalogResponsesMap.keySet());
             for (FofoCatalogResponse deal : dealResponse) {
                 if (similarModelMap.containsKey(deal.getCatalogId())) {
                     List<Integer> similarCatalogIds = similarModelMap.get(deal.getCatalogId());
                     logger.info("Similar Catalog Ids - {}", similarCatalogIds);
-                    List<FofoCatalogResponse> similarModels = similarCatalogIds.stream().filter(x->similarCatalogResponsesMap.containsKey(x)).map(x -> similarCatalogResponsesMap.get(x)).collect(Collectors.toList());
+                    List<FofoCatalogResponse> similarModels = similarCatalogIds.stream().filter(x -> similarCatalogResponsesMap.containsKey(x)).map(x -> similarCatalogResponsesMap.get(x)).collect(Collectors.toList());
                     deal.setSimilarModels(similarModels);
+                }
+            }
+        }
         return responseSender.ok(dealResponse);
+    }
+    private List<FofoCatalogResponse> getSimpleDocs(Set<Integer> catalogIds) throws ProfitMandiBusinessException {
+        List<FofoCatalogResponse> fofoCatalogResponses = new ArrayList<>();
+        Map<String, String> params = new HashMap<>();
+        List<String> mandatoryQ = new ArrayList<>();
+        mandatoryQ.add(String.format(
+                "+{!parent which=\"catalogId_i:(" + StringUtils.join(catalogIds, " ") + ")\"} AND active_b:true AND show_default_b:true"));
+        params.put("q", StringUtils.join(mandatoryQ, " "));
+        params.put("fl", "*, [child parentFilter=id:catalog* childFilter=active_b:true ]");
+        params.put("wt", "json");
+        params.put("rows", catalogIds.size() + "");
+        try {
+            String response = restClient.get(SchemeType.HTTP, solrUrl, 8984, "solr/demo/select", params);
+            JSONObject solrResponseJSONObj = new JSONObject(response).getJSONObject("response");
+            JSONArray docs = solrResponseJSONObj.getJSONArray("docs");
+            for (int i = 0; i < docs.length(); i++) {
+                JSONObject doc = docs.getJSONObject(i);
+                FofoCatalogResponse fofoCatalogResponse = this.toFofoCatalogResponse(doc);
+                fofoCatalogResponses.add(fofoCatalogResponse);
+            }
+        } catch (HttpHostConnectException e) {
+            throw new ProfitMandiBusinessException("", "", "Could not connect to host");
+        }
+        return fofoCatalogResponses;
+    }
+    private FofoCatalogResponse toFofoCatalogResponse(JSONObject doc) {
+        FofoCatalogResponse fofoCatalogResponse = new FofoCatalogResponse();
+        fofoCatalogResponse.setCatalogId(doc.getInt("catalogId_i"));
+        fofoCatalogResponse.setImageUrl(doc.getString("imageUrl_s"));
+        fofoCatalogResponse.setTitle(doc.getString("title_s"));
+        fofoCatalogResponse.setMop(doc.getFloat("mop_f"));
+        fofoCatalogResponse.setDp(doc.getFloat("dp_f"));
+        fofoCatalogResponse.setBrand(doc.getJSONArray("brand_ss").getString(0));
+        return fofoCatalogResponse;
+    }
     @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")})
     @ApiOperation(value = "Get online deals")
-    public ResponseEntity<?> getOnlineDeals(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 {
+    public ResponseEntity<?> getOnlineDeals(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 {
         logger.info("Request " + request.getParameterMap());
         String response = null;
         int userId = (int) request.getAttribute("userId");
         String uri = "/deals/" + userId;
+    }
     @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) throws ProfitMandiBusinessException {
+    public ResponseEntity<?> getBrands(HttpServletRequest request, @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();
+    }
     @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) throws ProfitMandiBusinessException {
+    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();
+    }
     @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")})
     @ApiOperation(value = "Get unit deal object")
-    public ResponseEntity<?> getUnitFocoDeal(HttpServletRequest request, @PathVariable(value = "id") long id) throws Exception {
+    public ResponseEntity<?> getUnitFocoDeal(HttpServletRequest request, @PathVariable(value = "id") long id) throws
+            Exception {
         List<FofoCatalogResponse> dealResponse = new ArrayList<>();
         List<Integer> tagIds = Arrays.asList(4);
         UserInfo userInfo = (UserInfo) request.getAttribute("userInfo");
         if (roleManagerService.isPartner(userInfo.getRoleIds())) {
             String categoryId = "(3 OR 6)";
+        }
         return responseSender.ok(dealResponse.get(0));
+    }
     @RequestMapping(value = "/fofo/brands", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
+    public ResponseEntity<?> getBrandsToDisplay(HttpServletRequest request,
-    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<BrandCatalog> brandsDisplay = brandsService.getBrandsToDisplay(categoryId);
         //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,
-    public ResponseEntity<?> getBrands(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<BrandCatalog> brandsDisplay = brandsService.getBrands(userInfo.getRetailerId(), userInfo.getEmail(), categoryId);
         return new ResponseEntity<>(brandsDisplay, HttpStatus.OK);
             if (webProducts.size() == 0) {
                 return new ArrayList<>();
+            }
             mandatoryQ.add(String.format(
-                    "+{!parent which=\"catalogId_i:" + StringUtils.join(webProducts, " ") + "\"} AND active_b:true AND show_default_b:true"));
+                    "+{!parent which=\"catalogId_i:(" + StringUtils.join(webProducts, " ") + ")\"} AND active_b:true AND show_default_b:true"));
+        }
         params.put("q", StringUtils.join(mandatoryQ, " "));
         params.put("fl", "*, [child parentFilter=id:catalog* childFilter=active_b:true ]");
+    }
     @Autowired
     private SaholicCISTableRepository saholicCISTableRepository;
-    private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId) throws Exception {
+    private List<FofoCatalogResponse> getCatalogResponse(JSONArray docs, boolean hotDeal, int fofoId) throws
+            Exception {
         List<FofoCatalogResponse> dealResponse = new ArrayList<>();
         List<Integer> tagIds = Arrays.asList(4);
         List<Integer> itemIds = new ArrayList<>();
         if (docs.length() > 0) {
             for (int i = 0; i < docs.length(); i++) {
             if (priceCircularItemModelNews != null) {
                 priceCircularItemModelMap = priceCircularItemModelNews.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
+            }
+        }
-        List<CatalogFavourite> catalogFavourites = catalogFavouriteRepository.selectBypartnerId(fofoId);
+        /*List<CatalogFavourite> catalogFavourites = catalogFavouriteRepository.selectBypartnerId(fofoId);
         List<Integer> catalogFavouriteIds = new ArrayList<>();
         if (!catalogFavourites.isEmpty()) {
             catalogFavouriteIds = catalogFavourites.stream().map(x -> x.getCatalogId()).collect(Collectors.toList());
+        }
         if (!catalogFavourites.isEmpty()) {
             catalogFavourites.stream().collect(Collectors.toMap(x -> x.getCatalogId(), x -> x));
-        }
+        }*/
         for (int i = 0; i < docs.length(); i++) {
             Map<Integer, FofoAvailabilityInfo> fofoAvailabilityInfoMap = new HashMap<>();
             JSONObject doc = docs.getJSONObject(i);
             FofoCatalogResponse fofoCatalogResponse = new FofoCatalogResponse();
             fofoCatalogResponse.setCatalogId(doc.getInt("catalogId_i"));
             fofoCatalogResponse.setImageUrl(doc.getString("imageUrl_s"));
             fofoCatalogResponse.setTitle(doc.getString("title_s"));
-            if (catalogFavouriteIds.contains(fofoCatalogResponse.getCatalogId())) {
+            /*if (catalogFavouriteIds.contains(fofoCatalogResponse.getCatalogId())) {
                 fofoCatalogResponse.setFavourite(true);
-            }
+            }*/
             List<WebOffer> webOffers = webOfferRepository.selectAllActiveOffers().get(fofoCatalogResponse.getCatalogId());
             //logger.info("webOffers {}", webOffers);
             if (webOffers != null && webOffers.size() > 0) {
+        }
         return dealResponse;
+    }
+    private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray
-    private List<FofoCatalogResponse> getCatalogSingleSkuResponse(JSONArray docs, Map<Integer, Integer> itemFilter, boolean hotDeal) throws ProfitMandiBusinessException {
+                                                                          docs, Map<Integer, Integer> itemFilter, 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)).stream().collect(Collectors.toMap(x -> x.getItemId(), x -> x));
         List<ComboModel> comboModels = comboModelRepository.selectByCatalogIdAndWarehouseId(catalogId, warehouseId);
         return responseSender.ok(comboModels);
+    }
     @RequestMapping(value = "/checkCombo", method = RequestMethod.GET, produces = MediaType.APPLICATION_JSON_VALUE)
-    public ResponseEntity<?> checkCombo(HttpServletRequest request, @RequestParam int catalogId, @RequestParam int warehouseId, @RequestParam int qty) throws Exception {
+    public ResponseEntity<?> checkCombo(HttpServletRequest request, @RequestParam int catalogId,
+                                        @RequestParam int warehouseId, @RequestParam int qty) throws Exception {
         boolean isCombo = false;
         ComboModel comboModel = comboModelRepository.selectByCatalogIdWarehouseIdAndQty(catalogId, warehouseId, qty);
         if (comboModel != null) {
             isCombo = true;
+        }

Subversion Repositories SmartDukaan

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