Commit 7d969fac authored by harshavardhan.c's avatar harshavardhan.c

Fix: Json formatting issue fixes.

parent 4b016bf4
...@@ -26,7 +26,6 @@ INTERVAL=60 ...@@ -26,7 +26,6 @@ INTERVAL=60
EMAIL_SERVICE_PROXY=https://cloud.ilens.io/sms-util EMAIL_SERVICE_PROXY=https://cloud.ilens.io/sms-util
MQTT_URL=192.168.0.220 MQTT_URL=192.168.0.220
MQTT_PORT=1883 MQTT_PORT=1883
FILES_MAPPING={"Quality Report_AC2O.xlsx":{"Pure Tank":"A4:E7"}} FILES_MAPPING='{"file_name":"Quality Report_AC2O.xlsx","sheet_name":"Pure Tank","fill_range":"A4:E7","column_based": true}'
COLUMN_BASED_SHEETS={"Quality Report_AC2O.xlsx":["Sheet1"]}
TEMPLATE_PATH=data/templates TEMPLATE_PATH=data/templates
DATA_PATH=C:/Users/harshavardhan.c/Downloads DATA_PATH=C:/Users/harshavardhan.c/Downloads
\ No newline at end of file
import json
import os.path import os.path
import sys
from datetime import datetime from datetime import datetime
from dateutil import parser from dateutil import parser
...@@ -14,15 +12,6 @@ from scripts.utils.ilens_publish_data import DataPush ...@@ -14,15 +12,6 @@ from scripts.utils.ilens_publish_data import DataPush
enable_timestamp = os.environ.get("CURRENT_TIMESTAMP", default="true") enable_timestamp = os.environ.get("CURRENT_TIMESTAMP", default="true")
code_timezone = os.environ.get("TIMEZONE", default="Asia/Kolkata") code_timezone = os.environ.get("TIMEZONE", default="Asia/Kolkata")
project_id = os.environ.get("PROJECT_ID", default="project_099") project_id = os.environ.get("PROJECT_ID", default="project_099")
files_mapping = os.environ.get("FILES_MAPPING", default="")
columns_based_sheets = os.environ.get("COLUMN_BASED_SHEETS", default={})
if not files_mapping:
print("Files Mapping Found empty, existing!!")
sys.exit(0)
if not columns_based_sheets:
print("Files Mapping Found empty, existing!!")
sys.exit(0)
columns_based_sheets = json.loads(columns_based_sheets)
class ExcelUploadHandler: class ExcelUploadHandler:
...@@ -33,7 +22,7 @@ class ExcelUploadHandler: ...@@ -33,7 +22,7 @@ class ExcelUploadHandler:
self.project_id = project_id self.project_id = project_id
self.kafka_conn = DataPush() self.kafka_conn = DataPush()
def parse_excel_data(self, template_file_path, data_file_path, template_fill_range, file_name, def parse_excel_data(self, template_file_path, data_file_path, template_fill_range, file_name, column_enabled,
sheet_name="Sheet1"): sheet_name="Sheet1"):
try: try:
if not os.path.join(template_file_path): if not os.path.join(template_file_path):
...@@ -47,7 +36,7 @@ class ExcelUploadHandler: ...@@ -47,7 +36,7 @@ class ExcelUploadHandler:
data_parameters = self.get_file_object_data(file=data_file_path, fill_range=template_fill_range, data_parameters = self.get_file_object_data(file=data_file_path, fill_range=template_fill_range,
sheet_name=sheet_name) sheet_name=sheet_name)
self.execute_data_insertion(template_parameters=template_parameters, data_parameters=data_parameters, self.execute_data_insertion(template_parameters=template_parameters, data_parameters=data_parameters,
fill_range=template_fill_range, file_name=file_name, sheet_name=sheet_name) fill_range=template_fill_range, column_enabled=column_enabled)
except Exception as e: except Exception as e:
logger.exception(f"Exception occurred while parsing the excel data {e.args}") logger.exception(f"Exception occurred while parsing the excel data {e.args}")
...@@ -74,8 +63,8 @@ class ExcelUploadHandler: ...@@ -74,8 +63,8 @@ class ExcelUploadHandler:
logger.error(e.args) logger.error(e.args)
raise raise
def execute_data_insertion(self, template_parameters: dict, data_parameters: dict, fill_range, sheet_name: str, def execute_data_insertion(self, template_parameters: dict, data_parameters: dict, fill_range,
file_name: str): column_enabled: bool):
try: try:
__start_coords__, __end_coords__ = self.excel.get_row_column(fill_range) __start_coords__, __end_coords__ = self.excel.get_row_column(fill_range)
start_row, start_column = __start_coords__ start_row, start_column = __start_coords__
...@@ -88,7 +77,7 @@ class ExcelUploadHandler: ...@@ -88,7 +77,7 @@ class ExcelUploadHandler:
'retain_flag': True, 'msg_id': 1, "p_id": ""} 'retain_flag': True, 'msg_id': 1, "p_id": ""}
key_mapping_json = dict(zip(template_parameters.values(), template_parameters.keys())) key_mapping_json = dict(zip(template_parameters.values(), template_parameters.keys()))
date_keys = [item for item in list(key_mapping_json.keys()) if item and item.startswith("date")] date_keys = [item for item in list(key_mapping_json.keys()) if item and item.startswith("date")]
if sheet_name not in columns_based_sheets.get(file_name): if not column_enabled:
for _row in rows_range: for _row in rows_range:
res = [item for item in list(template_parameters.keys()) if item.endswith(_row)] res = [item for item in list(template_parameters.keys()) if item.endswith(_row)]
_dict = {template_parameters[_element]: data_parameters[_element] for _element in res if _dict = {template_parameters[_element]: data_parameters[_element] for _element in res if
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment