chore: fix all ruff lint errors + format — 0 errors, 306 tests pass
This commit is contained in:
@@ -16,7 +16,6 @@ from app.models.contact import Contact
|
||||
from app.services.company_service import _company_to_dict
|
||||
from app.services.contact_service import _contact_to_dict
|
||||
|
||||
|
||||
# Expected CSV columns for each entity type
|
||||
COMPANY_COLUMNS = ["name", "industry", "phone", "email", "website", "description"]
|
||||
CONTACT_COLUMNS = ["first_name", "last_name", "email", "phone", "mobile", "position", "department"]
|
||||
@@ -88,7 +87,12 @@ async def import_companies(
|
||||
db.add(company)
|
||||
await db.flush()
|
||||
await log_audit(
|
||||
db, tenant_id, user_id, "import", "company", company.id,
|
||||
db,
|
||||
tenant_id,
|
||||
user_id,
|
||||
"import",
|
||||
"company",
|
||||
company.id,
|
||||
changes={"name": company.name},
|
||||
)
|
||||
created.append(_company_to_dict(company))
|
||||
@@ -154,7 +158,12 @@ async def import_contacts(
|
||||
db.add(contact)
|
||||
await db.flush()
|
||||
await log_audit(
|
||||
db, tenant_id, user_id, "import", "contact", contact.id,
|
||||
db,
|
||||
tenant_id,
|
||||
user_id,
|
||||
"import",
|
||||
"contact",
|
||||
contact.id,
|
||||
changes={"first_name": contact.first_name, "last_name": contact.last_name},
|
||||
)
|
||||
created.append(_contact_to_dict(contact))
|
||||
@@ -198,19 +207,33 @@ async def export_contacts_csv(
|
||||
tenant_id: uuid.UUID,
|
||||
) -> str:
|
||||
"""Export contacts as CSV string."""
|
||||
q = select(Contact).where(
|
||||
Contact.tenant_id == tenant_id,
|
||||
Contact.deleted_at.is_(None),
|
||||
).order_by(Contact.last_name, Contact.first_name)
|
||||
q = (
|
||||
select(Contact)
|
||||
.where(
|
||||
Contact.tenant_id == tenant_id,
|
||||
Contact.deleted_at.is_(None),
|
||||
)
|
||||
.order_by(Contact.last_name, Contact.first_name)
|
||||
)
|
||||
result = await db.execute(q)
|
||||
contacts = result.scalars().all()
|
||||
|
||||
output = io.StringIO()
|
||||
writer = csv.writer(output)
|
||||
writer.writerow(["id", "first_name", "last_name", "email", "phone", "mobile", "position", "department"])
|
||||
writer.writerow(
|
||||
["id", "first_name", "last_name", "email", "phone", "mobile", "position", "department"]
|
||||
)
|
||||
for c in contacts:
|
||||
writer.writerow([
|
||||
str(c.id), c.first_name, c.last_name, c.email or "",
|
||||
c.phone or "", c.mobile or "", c.position or "", c.department or "",
|
||||
])
|
||||
writer.writerow(
|
||||
[
|
||||
str(c.id),
|
||||
c.first_name,
|
||||
c.last_name,
|
||||
c.email or "",
|
||||
c.phone or "",
|
||||
c.mobile or "",
|
||||
c.position or "",
|
||||
c.department or "",
|
||||
]
|
||||
)
|
||||
return output.getvalue()
|
||||
|
||||
Reference in New Issue
Block a user