panleicim/appointment_tool
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

add ip_country to contact pojo

Browse Source
This commit is contained in:
Lei PAN
2024-01-22 22:57:36 +01:00
parent dee9c0a8ce
commit b773bebac4
2 changed files with 14 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/utils/excel_reader.py
+8 -5
View File
@@ -6,7 +6,6 @@ import pandas as pandas
import validators as validators
import xlsxwriter
from src.config import CONTACT_LIST_FILE
from src.db.mongo_manager import MONGO_STORE_MANAGER
from src.pojo.contact_pojo import ContactPojo
from src.pojo.mail.mail_pojo import MailAddress
@@ -29,7 +28,7 @@ def read_links_to_click(file_path):
print("error on link " + link)
def read_contacts(file_name=CONTACT_LIST_FILE) -> list:
def read_contacts(file_name) -> list:
print("read file " + file_name)
contact_list_in_json = pandas.read_excel(file_name).to_json(orient='records')
contact_dict_list = json.loads(contact_list_in_json)
@@ -43,12 +42,16 @@ def read_contacts(file_name=CONTACT_LIST_FILE) -> list:
first_name = name[-1]
else:
first_name = ''.join(name[1:len(name)])
ip_country = "FR"
if contact_dict.get('ip_country') is not None:
ip_country = contact_dict['ip_country']
contact = ContactPojo(phone_number=contact_dict['phone'],
last_name=last_name,
first_name=first_name,
passport_number=contact_dict['passport'],
mail=contact_dict['email'])
contact.ip_country = ip_country
contact_list.append(contact)
return contact_list
@@ -72,7 +75,7 @@ class ExcelHelper:
user_agent_list.append(user_agent_dict['user_agent'])
print(user_agent_list)
def check_contact_list(self, file_name=CONTACT_LIST_FILE):
def check_contact_list(self, file_name):
contact_list = read_contacts(file_name)
for contact in contact_list:
if contact.first_name is None or len(contact.first_name) == 0:
@@ -99,7 +102,7 @@ class ExcelHelper:
contact_list.append(contact)
return contact_list
def read_names(self, file_name=CONTACT_LIST_FILE) -> list:
def read_names(self, file_name) -> list:
contact_list_in_json = pandas.read_excel(file_name).to_json(orient='records')
contact_dict_list = json.loads(contact_list_in_json)
contact_list = []
@@ -134,7 +137,7 @@ class ExcelHelper:
return contact_list
def read_email_pojo(self, file_name=CONTACT_LIST_FILE) -> list:
def read_email_pojo(self, file_name) -> list:
email_info_in_json = pandas.read_excel(file_name).to_json(orient='records')
contact_dict_list = json.loads(email_info_in_json)
contact_list = []