WebSVN – SmartDukaan – Diff – //trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py

 def get_all_amazon_listed_items():
     return session.query(Amazonlisted).all()
 def get_amazon_item_details(amazonItemId):
     amazonlisted = Amazonlisted.get_by(itemId=amazonItemId)
-    fbaPromo, fbbPromo, fbgPromo = __get_amazon_promotion_attributes_for_item(amazonItemId)
+    fbaPromo, fbbPromo, fbgPromo, fbdPromo = __get_amazon_promotion_attributes_for_item(amazonItemId)
-    return amazonlisted, fbaPromo, fbbPromo, fbgPromo
+    return amazonlisted, fbaPromo, fbbPromo, fbgPromo, fbdPromo
 def update_amazon_item_details(amazonlisted):
     amazon_listed = Amazonlisted.get_by(itemId = amazonlisted.itemid)
     amazon_listed.isFba=amazonlisted.isFba
     amazon_listed.isFbb=amazonlisted.isFbb
     amazon_listed.isFbg=amazonlisted.isFbg
+    amazon_listed.isFbd=amazonlisted.isFbd
     amazon_listed.isNonFba=amazonlisted.isNonFba
     amazon_listed.isInventoryOverride=amazonlisted.isInventoryOverride
     amazon_listed.handlingTime=amazonlisted.handlingTime
     amazon_listed.isCustomTime=amazonlisted.isCustomTime
     amazon_listed.taxCode=amazonlisted.taxCode
     amazon_listed.fbbtaxCode=amazonlisted.fbbtaxCode
     amazon_listed.fbgtaxCode=amazonlisted.fbgtaxCode
+    amazon_listed.fbdtaxCode=amazonlisted.fbdtaxCode
     if (amazon_listed.sellingPrice != amazonlisted.sellingPrice) and amazonlisted.sellingPrice > 0:
         amazon_listed.mfnPriceLastUpdatedOn = datetime.datetime.now()
         amazon_listed.sellingPrice=amazonlisted.sellingPrice
     if (amazon_listed.fbaPrice != amazonlisted.fbaPrice) and amazonlisted.fbaPrice > 0:
         amazon_listed.fbaPriceLastUpdatedOn = datetime.datetime.now()
         amazon_listed.fbbPriceLastUpdatedOn = datetime.datetime.now()
         amazon_listed.fbbPrice=amazonlisted.fbbPrice
     if (amazon_listed.fbgPrice != amazonlisted.fbgPrice) and amazonlisted.fbgPrice > 0:
         amazon_listed.fbgPriceLastUpdatedOn = datetime.datetime.now()
         amazon_listed.fbgPrice=amazonlisted.fbgPrice
+    if (amazon_listed.fbdPrice != amazonlisted.fbdPrice) and amazonlisted.fbdPrice > 0:
+        amazon_listed.fbdPriceLastUpdatedOn = datetime.datetime.now()
+        amazon_listed.fbdPrice=amazonlisted.fbdPrice
     amazon_listed.suppressMfnPriceUpdate=amazonlisted.suppressMfnPriceUpdate
     amazon_listed.suppressFbaPriceUpdate=amazonlisted.suppressFbaPriceUpdate
     amazon_listed.suppressFbbPriceUpdate=amazonlisted.suppressFbbPriceUpdate
     amazon_listed.suppressFbgPriceUpdate=amazonlisted.suppressFbgPriceUpdate
+    amazon_listed.suppressFbdPriceUpdate=amazonlisted.suppressFbdPriceUpdate
     amazon_listed.overrrideWanlc = amazonlisted.overrrideWanlc
     amazon_listed.exceptionalWanlc = amazonlisted.exceptionalWanlc
     amazon_listed.autoDecrement = amazonlisted.autoDecrement
     amazon_listed.autoIncrement = amazonlisted.autoIncrement
     amazon_listed.autoFavourite = amazonlisted.autoFavourite
         amazon_listed.fbbPromoPrice = amazonlisted.fbbPromoPrice
         amazon_listed.fbbPriceLastUpdatedOn = datetime.datetime.now()
     if amazon_listed.fbgPromoPrice != amazonlisted.fbgPromoPrice and amazonlisted.fbgPromoPrice > 0:
         amazon_listed.fbgPromoPrice = amazonlisted.fbgPromoPrice
         amazon_listed.fbgPriceLastUpdatedOn = datetime.datetime.now()
+    if amazon_listed.fbdPromoPrice != amazonlisted.fbdPromoPrice and amazonlisted.fbdPromoPrice > 0:
+        amazon_listed.fbdPromoPrice = amazonlisted.fbdPromoPrice
+        amazon_listed.fbdPriceLastUpdatedOn = datetime.datetime.now()
     session.commit()
 def add_amazon_item(amazonlisted):
     if (not amazonlisted) or (not amazonlisted.itemid) or (not amazonlisted.asin):
         return
             amazon_item.fbbPriceLastUpdatedOnSc = datetime.datetime.now()
             amazon_item.fbbPriceLastUpdatedOn = datetime.datetime.now()
         amazon_item.isFbb = False
         amazon_item.suppressFbbPriceUpdate = False
         if amazonlisted.fbgPrice:
-            amazon_item.fbgPrice = amazonlisted.fbbPrice
+            amazon_item.fbgPrice = amazonlisted.fbgPrice
             amazon_item.fbgPriceLastUpdatedOnSc = datetime.datetime.now()
             amazon_item.fbgPriceLastUpdatedOn = datetime.datetime.now()
         amazon_item.isFbg = False
         amazon_item.suppressFbgPriceUpdate = False
+        if amazonlisted.fbdPrice:
+            amazon_item.fbdPrice = amazonlisted.fbdPrice
+            amazon_item.fbdPriceLastUpdatedOnSc = datetime.datetime.now()
+            amazon_item.fbdPriceLastUpdatedOn = datetime.datetime.now()
+        amazon_item.isFbd = False
+        amazon_item.suppressFbdPriceUpdate = False
         amazon_item.autoDecrement = True
         amazon_item.autoIncrement = True
     elif (amazonItem.asin!=amazonlisted.asin):
         if amazonlisted.asin:
         session.commit()
         return True
     elif (feedType=='FbbListingFeed'):
         for sku in skuList:
             amazonItem = Amazonlisted.get_by(itemId=sku)
             amazonItem.fbbListedOn = to_py_date(timestamp)
+            amazonItem.isFbb = True
+        session.commit()
+        return True
+    elif (feedType=='FbdListingFeed'):
+        for sku in skuList:
+            amazonItem = Amazonlisted.get_by(itemId=sku)
+            amazonItem.isFbd = True
         session.commit()
         return True
     else:
         return False
 def get_marketplace_history(source,offset,itemId):
     return session.query(MarketPlaceHistory).filter(MarketPlaceHistory.item_id==itemId).filter(MarketPlaceHistory.source==source).filter(or_(MarketPlaceHistory.toGroup==True,MarketPlaceHistory.toGroup==None)).order_by(desc(MarketPlaceHistory.timestamp)).limit(11).offset(offset).all()
 def get_all_fbb_listed_items():
-    return Amazonlisted.query.filter(Amazonlisted.isFbb==False).filter(Amazonlisted.fbbListedOn==None).filter(Amazonlisted.fbbtaxCode!=None).all()
+    return Amazonlisted.query.filter(Amazonlisted.isFbb==False).filter(or_(Amazonlisted.fbdtaxCode!=None,Amazonlisted.fbdtaxCode!="")).all()
 def get_all_fbb_pricing_items():
     #Removing fbbListedOn from query.Will have to fix this.(2014-10-17)
     #return Amazonlisted.query.filter(Amazonlisted.isFbb==True).filter(Amazonlisted.suppressFbbPriceUpdate==False).filter(Amazonlisted.fbbListedOn != None).all()
     return Amazonlisted.query.filter(Amazonlisted.isFbb==True).filter(Amazonlisted.suppressFbbPriceUpdate==False).all()
             stateId = 1
         elif amazonSku.startswith('FBB'):
             stateId = 2
         elif amazonSku.startswith('FBG'):
             stateId = 3
+        elif amazonSku.startswith('FBD'):
+            stateId = 0
         else:
             notAdded.append(amazonSku)
             continue
         amazonItem = get_amazon_item_details(int(amazonSku[3:]))
         if amazonItem[0] is None:
             elif d_amazonPromotion.stateId == 2:
                 amazonItem[0].fbbPromoPrice =  amazonPromotion.salePrice
                 amazonItem[0].fbbPromoStartDate = to_py_date(amazonPromotion.startDate)
                 amazonItem[0].fbbPromoEndDate =  to_py_date(amazonPromotion.endDate)
                 amazonItem[0].fbbPromoActive = False
-            else:
+            elif d_amazonPromotion.stateId == 3:
                 amazonItem[0].fbgPromoPrice =  amazonPromotion.salePrice
                 amazonItem[0].fbgPromoStartDate = to_py_date(amazonPromotion.startDate)
                 amazonItem[0].fbgPromoEndDate =  to_py_date(amazonPromotion.endDate)
                 amazonItem[0].fbgPromoActive = False
+            else:
+                amazonItem[0].fbdPromoPrice =  amazonPromotion.salePrice
+                amazonItem[0].fbdPromoStartDate = to_py_date(amazonPromotion.startDate)
+                amazonItem[0].fbdPromoEndDate =  to_py_date(amazonPromotion.endDate)
+                amazonItem[0].fbdPromoActive = False
         else:
             d_amazonPromotion.promotionActive = True
     session.commit()
     return notAdded
             amazonItem = get_amazon_item_details(int(amp.sku[3:]))
             if amp.stateId == 1:
                 amazonItem[0].fbaPromotionActive = True
             elif amp.stateId == 2:
                 amazonItem[0].fbbPromotionActive = True
-            else:
+            elif amp.stateId == 3:
                 amazonItem[0].fbgPromotionActive = True
+            else:
+                amazonItem[0].fbdPromotionActive = True
     session.commit()
     return True
 def check_services(map_lines):
     for key in map_lines.keys():
 def __get_amazon_promotion_attributes_for_item(item_id):
     timestamp = datetime.datetime.now()
     fbaPromo = AmazonPromotion.query.filter(AmazonPromotion.sku=='FBA'+str(item_id)).filter(AmazonPromotion.startDate<=timestamp).filter(AmazonPromotion.endDate>=timestamp).filter(AmazonPromotion.updatedOnMarketplace>to_py_date(0)).order_by(desc(AmazonPromotion.updatedOnMarketplace)).limit(1).all()
     fbbPromo = AmazonPromotion.query.filter(AmazonPromotion.sku=='FBB'+str(item_id)).filter(AmazonPromotion.startDate<=timestamp).filter(AmazonPromotion.endDate>=timestamp).filter(AmazonPromotion.updatedOnMarketplace>to_py_date(0)).order_by(desc(AmazonPromotion.updatedOnMarketplace)).limit(1).all()
     fbgPromo = AmazonPromotion.query.filter(AmazonPromotion.sku=='FBG'+str(item_id)).filter(AmazonPromotion.startDate<=timestamp).filter(AmazonPromotion.endDate>=timestamp).filter(AmazonPromotion.updatedOnMarketplace>to_py_date(0)).order_by(desc(AmazonPromotion.updatedOnMarketplace)).limit(1).all()
-    return fbaPromo, fbbPromo, fbgPromo
+    fbdPromo = AmazonPromotion.query.filter(AmazonPromotion.sku=='FBD'+str(item_id)).filter(AmazonPromotion.startDate<=timestamp).filter(AmazonPromotion.endDate>=timestamp).filter(AmazonPromotion.updatedOnMarketplace>to_py_date(0)).order_by(desc(AmazonPromotion.updatedOnMarketplace)).limit(1).all()
+    return fbaPromo, fbbPromo, fbgPromo, fbdPromo
 def get_ex_affiliate_item_info():
         query = session.query(ExclusiveAffiliateItemInfo, OutboundAffiliateMaster.name).join((OutboundAffiliateMaster, ExclusiveAffiliateItemInfo.affiliateId==OutboundAffiliateMaster.id)).filter(ExclusiveAffiliateItemInfo.isActive == True).all()
         close_session()
         map = {}
                 d_item = item
                 break
             else:
                 d_item = item
     return d_item
+def get_all_items_to_list_on_fbd():
+    return Amazonlisted.query.filter(Amazonlisted.isFbd==False).filter(or_(Amazonlisted.fbdtaxCode!=None,Amazonlisted.fbdtaxCode!="")).all()
+def get_all_fbd_listed_items():
+    return Amazonlisted.query.filter(Amazonlisted.isFbd==True).all()
+if __name__=='__main__':
+    DataService.initialize()
+    get_all_items_to_list_on_fbd()

Subversion Repositories SmartDukaan

(root)//trunk/PyProj/src/shop2020/model/v1/catalog/impl/DataAcessors.py – Rev 14862 → 15702