From 706de5a76e2ca06486cbbfde13566d38e804efd3 Mon Sep 17 00:00:00 2001 From: vaibhav sharma Date: Thu, 26 Jun 2025 17:20:58 +0530 Subject: [PATCH 1/5] feature:(added tags in seach payload) --- webserver/main/cron/search_by_city.py | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/webserver/main/cron/search_by_city.py b/webserver/main/cron/search_by_city.py index e4179b0..c836b91 100644 --- a/webserver/main/cron/search_by_city.py +++ b/webserver/main/cron/search_by_city.py @@ -21,6 +21,25 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, "@ondc/org/buyer_app_finder_fee_type": get_config_by_name("BAP_FINDER_FEE_TYPE"), "@ondc/org/buyer_app_finder_fee_amount": get_config_by_name("BAP_FINDER_FEE_AMOUNT") } + tags_array = [ + { + "code": "bap_terms", + "list": [ + { + "code": "static_terms", + "value": "" + }, + { + "code": "static_terms_new", + "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/1.0/tc.pdf" + }, + { + "code": "effective_date", + "value": datetime.now() + } + ] + } + ] if search_type == SearchType.FULL: city_list = get_config_by_name("CITY_LIST") if cities is None else cities message = { @@ -30,7 +49,8 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, "type": "Delivery" }, "payment": payment_object - } + }, + "tags":tags_array } else: city_list = ["*"] if cities is None else cities From 00735b982b055be55805c5ee9fa9c74219bcb219 Mon Sep 17 00:00:00 2001 From: vaibhav sharma Date: Thu, 26 Jun 2025 17:32:56 +0530 Subject: [PATCH 2/5] fix:(added static value for effective date in bap_terms) --- webserver/main/constant.py | 1 + webserver/main/cron/search_by_city.py | 4 +++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/webserver/main/constant.py b/webserver/main/constant.py index 323a6e6..acb32f8 100644 --- a/webserver/main/constant.py +++ b/webserver/main/constant.py @@ -28,3 +28,4 @@ CATEGORY_DETAILS = 'category_details' FULFILLMENT_DETAILS = 'fulfillment_details' +EFFECTIVE_DATE = "2025-06-26T10:48:23.849Z" \ No newline at end of file diff --git a/webserver/main/cron/search_by_city.py b/webserver/main/cron/search_by_city.py index c836b91..1c070ff 100644 --- a/webserver/main/cron/search_by_city.py +++ b/webserver/main/cron/search_by_city.py @@ -10,6 +10,7 @@ from main.repository import mongo from main.service.common import dump_request_payload, update_dumped_request_with_response from main.service.search import gateway_search +from main.constant import EFFECTIVE_DATE def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, cities=None, mode="start"): @@ -17,6 +18,7 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, domain_list = get_config_by_name("DOMAIN_LIST") if domains is None else domains end_time = datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z' start_time = (datetime.utcnow() - timedelta(days=1)).strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z' + effective_date = EFFECTIVE_DATE payment_object = { "@ondc/org/buyer_app_finder_fee_type": get_config_by_name("BAP_FINDER_FEE_TYPE"), "@ondc/org/buyer_app_finder_fee_amount": get_config_by_name("BAP_FINDER_FEE_AMOUNT") @@ -35,7 +37,7 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, }, { "code": "effective_date", - "value": datetime.now() + "value": effective_date } ] } From 2685711c6196ff3fd9eb83c07e4a6dbc7f3371b3 Mon Sep 17 00:00:00 2001 From: vaibhav sharma Date: Thu, 26 Jun 2025 17:46:54 +0530 Subject: [PATCH 3/5] fix:(added new versions for static terms and static terms new) --- webserver/main/cron/search_by_city.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/webserver/main/cron/search_by_city.py b/webserver/main/cron/search_by_city.py index 1c070ff..9938a46 100644 --- a/webserver/main/cron/search_by_city.py +++ b/webserver/main/cron/search_by_city.py @@ -18,7 +18,7 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, domain_list = get_config_by_name("DOMAIN_LIST") if domains is None else domains end_time = datetime.utcnow().strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z' start_time = (datetime.utcnow() - timedelta(days=1)).strftime('%Y-%m-%dT%H:%M:%S.%f')[:-3] + 'Z' - effective_date = EFFECTIVE_DATE + effective_date = datetime.utcnow() + timedelta(days=15) payment_object = { "@ondc/org/buyer_app_finder_fee_type": get_config_by_name("BAP_FINDER_FEE_TYPE"), "@ondc/org/buyer_app_finder_fee_amount": get_config_by_name("BAP_FINDER_FEE_AMOUNT") @@ -29,11 +29,11 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, "list": [ { "code": "static_terms", - "value": "" + "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/v1.0/tc.pdf" }, { "code": "static_terms_new", - "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/1.0/tc.pdf" + "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/v1.5/tc.pdf" }, { "code": "effective_date", From f4aca6b2e0d22c785c27e07bffda1ea5f21d27dd Mon Sep 17 00:00:00 2001 From: vaibhav sharma Date: Thu, 26 Jun 2025 17:52:04 +0530 Subject: [PATCH 4/5] fix:(added static terms and static terms new) --- webserver/main/cron/search_by_city.py | 36 +++++++++++++-------------- 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/webserver/main/cron/search_by_city.py b/webserver/main/cron/search_by_city.py index 9938a46..b031692 100644 --- a/webserver/main/cron/search_by_city.py +++ b/webserver/main/cron/search_by_city.py @@ -24,24 +24,24 @@ def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, "@ondc/org/buyer_app_finder_fee_amount": get_config_by_name("BAP_FINDER_FEE_AMOUNT") } tags_array = [ - { - "code": "bap_terms", - "list": [ - { - "code": "static_terms", - "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/v1.0/tc.pdf" - }, - { - "code": "static_terms_new", - "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/v1.5/tc.pdf" - }, - { - "code": "effective_date", - "value": effective_date - } - ] - } - ] + { + "code": "bap_terms", + "list": [ + { + "code": "static_terms", + "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/v1.0/tc.pdf" + }, + { + "code": "static_terms_new", + "value": "https://github.com/ONDC-Official/NP-Static-Terms/buyerNP_BNP/v1.5/tc.pdf" + }, + { + "code": "effective_date", + "value": effective_date + } + ] + } +] if search_type == SearchType.FULL: city_list = get_config_by_name("CITY_LIST") if cities is None else cities message = { From 1616a724fc8d9526551cbce9a1e00332d82bc936 Mon Sep 17 00:00:00 2001 From: vaibhav sharma Date: Thu, 26 Jun 2025 17:53:13 +0530 Subject: [PATCH 5/5] fix:(minor fix) --- webserver/main/constant.py | 2 +- webserver/main/cron/search_by_city.py | 1 - 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/webserver/main/constant.py b/webserver/main/constant.py index acb32f8..247b37c 100644 --- a/webserver/main/constant.py +++ b/webserver/main/constant.py @@ -28,4 +28,4 @@ CATEGORY_DETAILS = 'category_details' FULFILLMENT_DETAILS = 'fulfillment_details' -EFFECTIVE_DATE = "2025-06-26T10:48:23.849Z" \ No newline at end of file +EFFECTIVE_DATE = "2025-06-26T10:48:23.849Z" diff --git a/webserver/main/cron/search_by_city.py b/webserver/main/cron/search_by_city.py index b031692..f124a94 100644 --- a/webserver/main/cron/search_by_city.py +++ b/webserver/main/cron/search_by_city.py @@ -10,7 +10,6 @@ from main.repository import mongo from main.service.common import dump_request_payload, update_dumped_request_with_response from main.service.search import gateway_search -from main.constant import EFFECTIVE_DATE def make_http_requests_for_search_by_city(search_type: SearchType, domains=None, cities=None, mode="start"):