A: Remove address fields from contact_service — dict, create, update
This commit is contained in:
@@ -14,9 +14,6 @@ from app.models.company import Company
|
|||||||
from app.models.contact import CompanyContact, Contact
|
from app.models.contact import CompanyContact, Contact
|
||||||
|
|
||||||
|
|
||||||
ADDRESS_FIELDS = ("address_street", "address_city", "address_zip", "address_country", "address_state")
|
|
||||||
|
|
||||||
|
|
||||||
def _contact_to_dict(c: Contact, include_companies: bool = False) -> dict[str, Any]:
|
def _contact_to_dict(c: Contact, include_companies: bool = False) -> dict[str, Any]:
|
||||||
"""Serialize a Contact ORM object to dict."""
|
"""Serialize a Contact ORM object to dict."""
|
||||||
data: dict[str, Any] = {
|
data: dict[str, Any] = {
|
||||||
@@ -30,11 +27,6 @@ def _contact_to_dict(c: Contact, include_companies: bool = False) -> dict[str, A
|
|||||||
"department": c.department,
|
"department": c.department,
|
||||||
"linkedin_url": c.linkedin_url,
|
"linkedin_url": c.linkedin_url,
|
||||||
"notes": c.notes,
|
"notes": c.notes,
|
||||||
"address_street": c.address_street,
|
|
||||||
"address_city": c.address_city,
|
|
||||||
"address_zip": c.address_zip,
|
|
||||||
"address_country": c.address_country,
|
|
||||||
"address_state": c.address_state,
|
|
||||||
"created_at": c.created_at.isoformat() if c.created_at else None,
|
"created_at": c.created_at.isoformat() if c.created_at else None,
|
||||||
"updated_at": c.updated_at.isoformat() if c.updated_at else None,
|
"updated_at": c.updated_at.isoformat() if c.updated_at else None,
|
||||||
}
|
}
|
||||||
@@ -152,11 +144,6 @@ async def create_contact(
|
|||||||
department=data.get("department"),
|
department=data.get("department"),
|
||||||
linkedin_url=data.get("linkedin_url"),
|
linkedin_url=data.get("linkedin_url"),
|
||||||
notes=data.get("notes"),
|
notes=data.get("notes"),
|
||||||
address_street=data.get("address_street"),
|
|
||||||
address_city=data.get("address_city"),
|
|
||||||
address_zip=data.get("address_zip"),
|
|
||||||
address_country=data.get("address_country"),
|
|
||||||
address_state=data.get("address_state"),
|
|
||||||
created_by=user_id,
|
created_by=user_id,
|
||||||
updated_by=user_id,
|
updated_by=user_id,
|
||||||
)
|
)
|
||||||
@@ -227,7 +214,7 @@ async def update_contact(
|
|||||||
all_fields = (
|
all_fields = (
|
||||||
"first_name", "last_name", "email", "phone", "mobile",
|
"first_name", "last_name", "email", "phone", "mobile",
|
||||||
"position", "department", "linkedin_url", "notes",
|
"position", "department", "linkedin_url", "notes",
|
||||||
) + ADDRESS_FIELDS
|
)
|
||||||
for field in all_fields:
|
for field in all_fields:
|
||||||
if field in data and data[field] is not None:
|
if field in data and data[field] is not None:
|
||||||
old_val = getattr(contact, field)
|
old_val = getattr(contact, field)
|
||||||
|
|||||||
Reference in New Issue
Block a user