WebSVN – SmartDukaan – Diff – /trunk/PyDTR/src/dtr/storage/Mongo.py

     mc.set("featured_deals_deal_object", {3:featuredDealObjectMobiles,5:featuredDealObjectTablets,6:featuredDealObjectAccessories}, 600)
     print mc.get('featured_deals_deal_object')
 #introducing online/deals with fofo flag
 def getNewDeals(userId, category_id, offset, limit, sort, direction, filterData=None, source=None, tag_ids=None):
+    defaultFilter = False
+    if filterData is not None:
+        defaultFilter = True
     if mc.get("category_cash_back") is None or not bool(mc.get("category_cash_back")):
         populateCashBack()
     if source is not None:
         if source=="online":
         category_specific_deals = filter(lambda x: x['source_id'] in ONLINE_DEAL_SOURCE_MAP.keys(), category_specific_deals)
     #For saholic specific deals
     elif source=="deals":
         category_specific_deals = filter(lambda x: x['source_id'] == 4, category_specific_deals)
-    if filterData is not None or source:
+    if filterData:
         try:
             filtered_deals = filterDeals(category_specific_deals, filterData)
             if len(filtered_deals)==0:
                 dataExist = False
         except:
                         filterMap[rank] = v
                         rank =rank+1
                 rankMap = filterMap
         rankCounter = offset
-        if filterData is None:
-            if mc.get("featured_deals_deal_object") is None or not bool(mc.get("featured_deals_deal_object")):
+        if mc.get("featured_deals_deal_object") is None or not bool(mc.get("featured_deals_deal_object")):
-                try:
+            try:
-                    __populateFeaturedDealsForDealObject()
+                __populateFeaturedDealsForDealObject()
-                    fd_dealObject = mc.get("featured_deals_deal_object")
-                except:
-                    fd_dealObject = {3:{},5:{},6:{}}
-            else:
                 fd_dealObject = mc.get("featured_deals_deal_object")
+            except:
+                fd_dealObject = {3:{},5:{},6:{}}
+        else:
+            fd_dealObject = mc.get("featured_deals_deal_object")
     else:
         rankMap = {}
     specialOffer = user_specific_deals.get('specialOffer')
     for dealList in [rankMap.get(k, []) for k in range(offset, offset+limit)]:
-        if filterData is None:
+        if not defaultFilter:
             while(True):
                 rankCounter = rankCounter+1
                 if (fd_dealObject.get(category_id).get(rankCounter)) is not None:
                     if (fd_dealObject.get(category_id).get(rankCounter).get('offer_id') !=0):
                         item[0]['ppq'] = round(ppq,2)
                 else:
                     item[0]['ppq'] = 0
             except:
                 item[0]['ppq'] = 0
-            if filterData is None:
+            if not defaultFilter:
                 if item[0]['category_id']!=6:
                     try:
                         item[0]['filterLinkBrand'] = '/category/'+str(int(item[0]['category_id']))+'?searchFor='+urllib.quote(item[0]['brand'])+'&filter=brand&brands='+str(int(item[0]['brand_id']))
                         item[0]['filterTextBrand'] = (item[0]['brand'])
                     except:
         dealsListMap.append(temp)
     return dealsListMap
 def getAccesoryDeals(userId, category_id, offset, limit, sort, direction, filterData=None, source=None, tag_ids=None):
+    defaultFilter = False
+    if filterData is not None:
+        defaultFilter = True
     if mc.get("category_cash_back") is None or not bool(mc.get("category_cash_back")):
         populateCashBack()
     if source is not None:
     filtered_deals = []
     dataExist = True
-    if filterData is not None or source:
+    if filterData is not None:
         try:
             filtered_deals = filterDeals(category_specific_deals, filterData)
             if len(filtered_deals)==0:
                 dataExist = False
         except:
                         filterMap[rank] = v
                         rank =rank+1
                 rankMap = filterMap
         rankCounter = offset
-        if filterData is None:
-            if mc.get("featured_deals_deal_object") is None or not bool(mc.get("featured_deals_deal_object")):
+        if mc.get("featured_deals_deal_object") is None or not bool(mc.get("featured_deals_deal_object")):
-                try:
+            try:
-                    __populateFeaturedDealsForDealObject()
+                __populateFeaturedDealsForDealObject()
-                    fd_dealObject = mc.get("featured_deals_deal_object")
-                except:
-                    fd_dealObject = {3:{},5:{},6:{}}
-            else:
                 fd_dealObject = mc.get("featured_deals_deal_object")
+            except:
+                fd_dealObject = {3:{},5:{},6:{}}
+        else:
+            fd_dealObject = mc.get("featured_deals_deal_object")
     else:
         rankMap = {}
     specialOffer = user_specific_deals.get('specialOffer')
     for dealList in [rankMap.get(k, []) for k in range(offset, offset+limit)]:
-        if filterData is None:
+        if not defaultFilter:
             while(True):
                 rankCounter = rankCounter+1
                 if (fd_dealObject.get(category_id).get(rankCounter)) is not None:
                     if (fd_dealObject.get(category_id).get(rankCounter).get('offer_id') !=0):
                         item[0]['ppq'] = round(ppq,2)
                 else:
                     item[0]['ppq'] = 0
             except:
                 item[0]['ppq'] = 0
-            if filterData is None:
+            if not defaultFilter:
                 if item[0]['category_id']!=6:
                     try:
                         item[0]['filterLinkBrand'] = '/category/'+str(int(item[0]['category_id']))+'?searchFor='+urllib.quote(item[0]['brand'])+'&filter=brand&brands='+str(int(item[0]['brand_id']))
                         item[0]['filterTextBrand'] = (item[0]['brand'])
                     except:

Subversion Repositories SmartDukaan

(root)/trunk/PyDTR/src/dtr/storage/Mongo.py – Rev 22271 → 22293