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

     PrivateDeals, AmazonOutOfSync, PrivateDealsPriceComparison, \
     SourceReturnPercentage, CompetitorPricing, CompetitorPricingRequest, \
     AmazonPromotion, ExclusiveAffiliateItemInfo, OutboundAffiliateMaster
 from shop2020.thriftpy.model.v1.catalog.ttypes import status, ItemShippingInfo, \
     ItemType, PremiumType, FreebieItem as t_FreebieItem, \
-    StorePricing as tStorePricing, CatalogServiceException, BannerType, InsurerType, \
+    StorePricing as tStorePricing, CatalogServiceException, \
-    Banner as t_banner, CompetitorPricing as TCompetitorPricing
+    BannerType, InsurerType, Banner as t_banner, CompetitorPricing as TCompetitorPricing, \
+    AmazonPromotionType
 from shop2020.thriftpy.model.v1.inventory.ttypes import VatType, \
-    InventoryServiceException, IgnoredInventoryUpdateItems, SnapdealInventoryItem
+    InventoryServiceException, IgnoredInventoryUpdateItems,SnapdealInventoryItem
 from shop2020.thriftpy.model.v1.order.ttypes import OrderSource
 from shop2020.utils import EmailAttachmentSender
 from shop2020.utils.EmailAttachmentSender import mail
 from shop2020.utils.Utils import to_py_date, log_risky_flag
 from sqlalchemy import desc, asc
 from sqlalchemy.sql.expression import or_, distinct, func, and_
 from sqlalchemy.sql.functions import now
 from string import Template
 import datetime
 import math
 import sys
 def get_amazon_item_details(amazonItemId):
     amazonlisted = Amazonlisted.get_by(itemId=amazonItemId)
     fbaPromo, fbbPromo = __get_amazon_promotion_attributes_for_item(amazonItemId)
     return amazonlisted, fbaPromo, fbbPromo
 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.isNonFba=amazonlisted.isNonFba
     amazon_listed.autoDecrement = amazonlisted.autoDecrement
     amazon_listed.autoIncrement = amazonlisted.autoIncrement
     amazon_listed.autoFavourite = amazonlisted.autoFavourite
     amazon_listed.manualFavourite = amazonlisted.manualFavourite
     amazon_listed.otherCost = amazonlisted.otherCost
+    if amazon_listed.fbaPromoPrice != amazonlisted.fbaPromoPrice and amazonlisted.fbaPromoPrice > 0:
+        amazon_listed.fbaPromoPrice = amazonlisted.fbaPromoPrice
+        amazon_listed.fbaPriceLastUpdatedOn = datetime.datetime.now()
+    if amazon_listed.fbbPromoPrice != amazonlisted.fbbPromoPrice and amazonlisted.fbbPromoPrice > 0:
+        amazon_listed.fbbPromoPrice = amazonlisted.fbbPromoPrice
+        amazon_listed.fbbPriceLastUpdatedOn = datetime.datetime.now()
     session.commit()
 def add_amazon_item(amazonlisted):
     if (not amazonlisted) or (not amazonlisted.itemid) or (not amazonlisted.asin):
         return
 def get_all_fbb_listed_items():
     return Amazonlisted.query.filter(Amazonlisted.isFbb==True).filter(Amazonlisted.fbbListedOn==None).all()
 def get_all_fbb_pricing_items():
-    return Amazonlisted.query.filter(Amazonlisted.isFbb==True).filter(Amazonlisted.suppressFbbPriceUpdate==False).filter(Amazonlisted.fbbPriceLastUpdatedOn > Amazonlisted.fbbPriceLastUpdatedOnSc).filter(Amazonlisted.fbbListedOn != None).all()
+    return Amazonlisted.query.filter(Amazonlisted.isFbb==True).filter(Amazonlisted.suppressFbbPriceUpdate==False).filter(Amazonlisted.fbbListedOn != None).all()
 def get_count_for_marketplaceHistory(source,itemId):
     return len(session.query(MarketPlaceHistory).filter(MarketPlaceHistory.item_id==itemId).filter(MarketPlaceHistory.source==source).filter(or_(MarketPlaceHistory.toGroup==True,MarketPlaceHistory.toGroup==None)).all())
 def get_marketplace_history_by_date(source,startDate,endDate,offset,limit,itemId):
     return session.query(CompetitorPricing,Item).join((Item,CompetitorPricing.item_id==Item.id)).filter(CompetitorPricing.competitorPricing_requestId==uploadId).all()
 def add_amazon_promotion(amazonPromotions):
     for sku, amazonPromotion in amazonPromotions.iteritems():
         d_amazonPromotion = AmazonPromotion()
-        d_amazonPromotion.sku = sku
+        d_amazonPromotion.sku = sku.strip().upper()
         d_amazonPromotion.standardPrice = amazonPromotion.standardPrice
         d_amazonPromotion.salePrice = amazonPromotion.salePrice
         d_amazonPromotion.subsidy = amazonPromotion.subsidyAmount
         d_amazonPromotion.startDate = to_py_date(amazonPromotion.startDate)
         d_amazonPromotion.endDate = to_py_date(amazonPromotion.endDate)
-        d_amazonPromotion.addedOn = datetime.datetime.now()
+        d_amazonPromotion.addedOn = to_py_date(amazonPromotion.addedOn)
-        d_amazonPromotion.promotionActive = amazonPromotion.promotionActive
+        d_amazonPromotion.promotionActive = False
-        if sku.upper().startswith('FBA'):
+        if d_amazonPromotion.sku.startswith('FBA'):
             d_amazonPromotion.stateId = 1
-        elif sku.upper().startswith('FBB'):
+        elif d_amazonPromotion.sku.startswith('FBB'):
             d_amazonPromotion.stateId = 2
         else:
-            raise CatalogServiceException(101, "Amazon Promotion Illegal sku id")
+            raise CatalogServiceException(101, "Amazon Promotion Illegal sku id "+sku)
         d_amazonPromotion.promotionType = amazonPromotion.promotionType
+        if d_amazonPromotion.promotionType == AmazonPromotionType._NAMES_TO_VALUES.get('LONGTERM'):
+            amazonItem = get_amazon_item_details(int(d_amazonPromotion.sku[3:]))
+            if amazonItem[0] is None:
+                raise CatalogServiceException(102, "Item doesnot exist in amazonlisted sku id "+sku)
+            if d_amazonPromotion.stateId == 1:
+                amazonItem[0].fbaPromoPrice =  amazonPromotion.salePrice
+                amazonItem[0].fbaPromoStartDate = to_py_date(amazonPromotion.startDate)
+                amazonItem[0].fbaPromoEndDate =  to_py_date(amazonPromotion.endDate)
+                amazonItem[0].fbaPromoActive = False
+            else:
+                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:
+            d_amazonPromotion.promotionActive = True
     session.commit()
     return True
 def get_vat_rates(itemId, categoryId):
     return AmazonPromotion.query.filter(AmazonPromotion.startDate>=(to_py_date(startDate))).filter(AmazonPromotion.endDate<=(to_py_date(endDate))).all()
 def update_amazon_promotion(amazonPromotions):
     for amazonPromotion in amazonPromotions:
         amp = AmazonPromotion.get_by(sku=amazonPromotion.sku,addedOn=amazonPromotion.addedOn, promotionType = amazonPromotion.promotionType )
+        amp.promotionActive = True
-        amp.updatedOnMarketplace = amazonPromotion.updatedOnMarketplace
+        amp.updatedOnMarketplace = datetime.datetime.now()
+        if amp.promotionType==1:
+            amazonItem = get_amazon_item_details(int(amp.sku[3:]))
+            if amp.stateId == 1:
+                amazonItem[0].fbaPromoActive = True
+            else:
+                amazonItem[0].fbbPromoActive = True
     session.commit()
 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()
-    return fbaPromo, fbbPromo
-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 = {}
-        for q in query:
-            map[q[0].itemId]=to_t_exclusive_affiliate_item_info(q)
-        return map
     fbaPromo = AmazonPromotion.query.filter(AmazonPromotion.sku=='FBA'+str(item_id)).filter(AmazonPromotion.promotionType==AmazonPromotionType.LONGTERM).filter(AmazonPromotion.startDate<=timestamp).filter(AmazonPromotion.endDate>=timestamp).order_by(desc(AmazonPromotion.addedOn)).limit(1).all()
+    fbbPromo = AmazonPromotion.query.filter(AmazonPromotion.sku=='FBB'+str(item_id)).filter(AmazonPromotion.promotionType==AmazonPromotionType.LONGTERM).filter(AmazonPromotion.startDate<=timestamp).filter(AmazonPromotion.endDate>=timestamp).order_by(desc(AmazonPromotion.addedOn)).limit(1).all()
+    return fbaPromo, fbbPromo

Subversion Repositories SmartDukaan

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