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

 '''
 from elixir import *
 from shop2020.model.v1.catalog.impl import DataService
 from shop2020.model.v1.catalog.impl.DataService import Item, \
     Warehouse, ItemInventoryHistory, CurrentInventorySnapshot, ItemInfo,\
-    ItemChangeLog, Price, BestDeals, BestSellers
+    ItemChangeLog, BestSellers
 from shop2020.thriftpy.model.v1.catalog.ttypes import \
     InventoryServiceException, status
 from shop2020.model.v1.catalog.impl.Convertors import to_t_item
 import datetime
 from shop2020.utils.Utils import log_entry, to_py_date
 def update_item(item):
     if not item:
         raise InventoryServiceException(108, "Bad item in request")
     if not item.id:
-        raise InventoryServiceException(101, "non existent item")
+        raise InventoryServiceException(101, "Missing id for update")
     ds_item = get_Item(item.id)
     if not ds_item:
-        raise InventoryServiceException(101, "Item already exists")
+        raise InventoryServiceException(101, "Item missing in our database")
     if item.manufacturerName:
         ds_item.manufacturer_name = item.manufacturerName
     if item.modelName:
         ds_item.model_name = item.modelName
     if item.modelNumber:
         ds_item.model_number = item.modelNumber
+    if item.color:
+        ds_item.color = item.color
     if item.category:
         ds_item.category = item.category
     if item.comments:
         ds_item.comments = item.comments
     if item.catalogItemId:
         ds_item.catalog_item_id = item.catalogItemId
     if item.vendorItemId:
         ds_item.vendor_item_id = item.vendorItemId
     else:
-        raise InventoryServiceException(101, "vendor item id cannot be missing")
+        raise InventoryServiceException(101, "Vendor item id cannot be missing")
     if item.mrp:
         ds_item.mrp = item.mrp
     if item.mop:
         ds_item.mop = item.mop
     if item.sellingPrice:
         ds_item.sellingPrice = item.sellingPrice
+    if item.dealerPrice:
+        ds_item.dealerPrice = item.dealerPrice
     if item.weight:
         ds_item.weight = item.weight
     if item.itemStatus:
         ds_item.status = item.itemStatus
     if item.featureId:
         ds_item.feature_id = item.featureId
     if item.featureDescription:
         ds_item.feature_description = item.featureDescription
+    if item.bestDealText:
+        ds_item.bestDealText = item.bestDealText
+    if item.bestDealValue:
+        ds_item.bestDealValue = item.bestDealValue
+    ds_item.updated_on = datetime.datetime.now()
     session.commit();
     return ds_item.id
 def add_item(item):
     if not item:
         ds_item.manufacturer_name = item.manufacturerName
     if item.modelName:
         ds_item.model_name = item.modelName
     if item.modelNumber:
         ds_item.model_number = item.modelNumber
+    if item.color:
+        ds_item.color = item.color
     if item.category:
         ds_item.category = item.category
     if item.comments:
         ds_item.comments = item.comments
     if item.itemStatus:
         ds_item.status = item.itemStatus
     else: #this is for update calls
         ds_item.status = status.IN_PROCESS
     ds_item.addedOn = datetime.datetime.now()
+    ds_item.updatedOn = datetime.datetime.now()
     if item.mrp:
         ds_item.mrp = item.mrp
     if item.mop:
         ds_item.mop = item.mop
     if item.sellingPrice:
         ds_item.sellingPrice = item.sellingPrice
+    if item.dealerPrice:
+        ds_item.dealerPrice = item.dealerPrice
     if item.weight:
         ds_item.weight = item.weight
     if item.featureId:
         ds_item.feature_id = item.featureId
             info.key = k
             info.value = v
             ds_item.iteminfo.append(info)
     #check if categories present. If yes, add them to system
-    session.commit();
+    if item.bestDealValue:
+        ds_item.bestDealValue = item.bestDealValue
-    return ds_item.id
+    if item.bestDealText:
+        ds_item.bestDealText = item.bestDealText
-#this is no more used
-def update_price(item, ds_item):
-    log_entry("update_price", "updating price for item")
-    for k,v in item.price.iteritems():
-        price = Price()
-        price.warehouse_id = k
-        price.price = v
-        price.item = ds_item
-        session.commit()
+    session.commit();
-#this is no more used
-def update_price_for_warehouse(item_id, warehouse_id, price):
-    log_entry("update_price", "updating price for item and warehouse")
-    price = Price.query.filter_by(warehouse_id=warehouse_id, item_id=item_id).one()
-    if not price:
-        price = Price()
-        item = get_Item(item_id)
-        price.warehouse_id = warehouse_id
-        price.item = item
+    return ds_item.id
-    price.price = price
-    session.commit()
 def update_inventory(warehouse_id, timestamp, availability):
     warehouse = get_Warehouse(warehouse_id)
     if not warehouse:
         raise InventoryServiceException(107, "Warehouse? Where?")
     t_sellers = []
     for seller in sellers:
         t_sellers.append(seller.item_id)
     return t_sellers
 def get_best_deals():
+    items = Item.query.filter(Item.bestDealValue != None).all()
-    deals = BestDeals.query.all()
+    return get_thrift_item_list(items)
-    #query = BestDeals.query.all()
+def get_best_deals_count():
-    #deals = query.order_by(asc(BestDeals.priority)).all()
+    return Item.query.filter(Item.bestDealValue != None).count()
+def get_best_deals_catalog_ids(start_index, total_items):
+    stop_index = start_index + total_items
+    best_deal_items = Item.query.filter(Item.bestDealValue != None).order_by(desc(Item.bestDealValue)).all()[start_index:stop_index]
     t_deals = []
-    for deal in deals:
+    for deal in best_deal_items:
-        t_deals.append(deal.item_id)
+        t_deals.append(deal.catalog_item_id)
     return t_deals
 def get_latest_arrivals(limit):
     items = Item.query.order_by(desc(Item.startDate)).all()[0:limit]
-    ret_items = []
-    for item in items:
-        if item:
-            ret_items.append(to_t_item(item))
-    return ret_items
+    return get_thrift_item_list(items)
 def get_latest_arrivals_count(limit):
-    #FIXME: This method has not been tested. Have to talk to Rajveer to check where is it used.
+    #FIXME: This method has not been functionally tested. Have to talk to Rajveer to check where is it used.
     return min(Item.query.count(), limit)
-def get_latest_arrivals_catalog_ids(limit):
+def get_latest_arrivals_catalog_ids(start_index, total_items):
+    stop_index = start_index + total_items
-    arrivals = Item.query.order_by(desc(Item.startDate)).all()[0:limit]
+    arrivals = Item.query.order_by(desc(Item.startDate)).all()[start_index:stop_index]
     t_arrivals = []
     for arrival in arrivals:
         t_arrivals.append(arrival.catalog_item_id)
     return t_arrivals
+def get_thrift_item_list(items):
+    ret_items = []
+    for item in items:
+        if item:
+            ret_items.append(to_t_item(item))
+    return ret_items

Subversion Repositories SmartDukaan

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