diff --git a/conf/all_promotions.json b/conf/all_promotions.json index 2d76b80..63bbf0c 100644 --- a/conf/all_promotions.json +++ b/conf/all_promotions.json @@ -1,54 +1,54 @@ { "ignore": [ + "minpurchaseamnt", + "additionalistotal", + "weightunit", + "giftsitems", + "additionalstotals", "maxqty", - "discountedprice", - "dllverno", + "additionalsgiftcount", "additionalgiftcount", + "xmldocversion", + "discountedprice", + "discountedpricepermida", + "remarks", + "additionaliscoupon", "additionalisactive", "promotions", - "giftitemprice", - "weightunit", - "discountedpricepermida", - "isweightedpromo", - "giftsitems", - "additionalsminbasketamount", - "additionalminbasketamount", - "additionalsgiftcount", - "additionalrestrictions", + "minqty", + "dllverno", "discounttype", + "clubid", "discountrate", + "additionalsminbasketamount", + "isweightedpromo", + "additionalrestrictions", + "additionalscoupon", + "giftitemprice", + "additionalminbasketamount", "itemtype", - "xmldocversion", - "remarks" + "minpurchaseamount" ], "tags_dict": { "minnoofitemofered": "minnoofitemsoffered", - "additionaliscoupon": "additionalscoupon", - "additionalstotals": "additionalistotal", - "promotionupdatedate": "priceupdatedate", - "minpurchaseamount": "minqty", - "minpurchaseamnt": "minqty" + "promotionupdatedate": "priceupdatedate" }, "tags": [ - "promotionstarthour", + "promotionid", + "promotionstartdate", + "subchainid", + "chainid", "minnoofitemsoffered", - "itemcode", "rewardtype", - "additionalscoupon", + "promotionstarthour", + "itemcode", + "priceupdatedate", "storeid", - "minqty", - "chainid", "promotionendhour", - "additionalistotal", + "promotiondescription", "promotionenddate", - "isgiftitem", - "priceupdatedate", "bikoretno", - "clubid", - "subchainid", - "promotiondescription", - "allowmultiplediscounts", - "promotionstartdate", - "promotionid" + "isgiftitem", + "allowmultiplediscounts" ] } \ No newline at end of file diff --git a/mapper.py b/mapper.py index 3d1858c..a313951 100644 --- a/mapper.py +++ b/mapper.py @@ -325,21 +325,19 @@ def generate_promo_configuration(): , 'discountedpricepermida', 'discountedprice', 'discountrate', 'discounttype', 'giftsitems', 'giftitemprice','additionalminbasketamount' - ,'clubid', 'itemtype' + ,'clubid', 'itemtype','additionalscoupon','additionaliscoupon' + , 'additionalistotal', 'additionalstotals', + 'minqty', 'minpurchaseamount', 'minpurchaseamnt' } tags_dict = {'minnoofitemofered':'minnoofitemsoffered', - 'additionaliscoupon':'additionalscoupon', - 'additionalstotals':'additionalistotal', - 'promotionupdatedate':'priceupdatedate', - 'minpurchaseamount':'minqty', - 'minpurchaseamnt':'minqty'} + 'promotionupdatedate':'priceupdatedate'} tags = { 'chainid', 'storeid', 'bikoretno', 'subchainid' , 'promotiondescription', 'priceupdatedate', 'promotionendhour', 'allowmultiplediscounts', - 'additionalscoupon', 'promotionstartdate', 'promotionid', + 'promotionstartdate', 'promotionid', 'promotionstarthour', 'isgiftitem', 'itemcode', - 'minqty', 'rewardtype', 'minnoofitemsoffered', - 'promotionenddate', 'additionalistotal'} + 'rewardtype', 'minnoofitemsoffered', + 'promotionenddate'} all_prices = {'ignore': list(ignore), 'tags_dict': tags_dict, 'tags':list(tags)} diff --git a/parsers/price_parser.py b/parsers/price_parser.py index 9eb9d0d..16b9838 100644 --- a/parsers/price_parser.py +++ b/parsers/price_parser.py @@ -65,7 +65,7 @@ def download_all_promo_prices(progress_bar=None, force=False, output_folder = "p pattern = f'{FileTypesFilters.PROMO_FILE.value["should_contain"]}*.xml' files_types = FileTypesFilters.only_promo() download_type_data = DownloadTypeData(pattern, files_types) - download_all_prices(progress_bar, force, output_folder, + return download_all_prices(progress_bar, force, output_folder, data_prices_path, conf, download_type_data) def parse_item_xml_extension(root, chain_name, all_prices, item_info_dict, @@ -99,7 +99,7 @@ def download_all_prices(progress_bar=None, force=False, print('failed to get root of '+data_file) failed_files.append(data_file) continue - Logger.info(f"Parsing file : {data_file}") + #Logger.info(f"Parsing file : {data_file}") item_info_dict = {} parse_item_xml_extension(root, scrapper.chain, all_prices, item_info_dict, price_rows, 'itemcode')