mirror of
https://github.com/skoelle/icloud-contacts-sync.git
synced 2026-09-17 23:40:24 +00:00
contact detail fix fullname builder
This commit is contained in:
+2
-2
@@ -133,7 +133,7 @@ def get_contact(contact_id: int, current_user: str = Depends(get_current_user)):
|
|||||||
id_clause = "AND id = %s" if where_clause else "WHERE id = %s"
|
id_clause = "AND id = %s" if where_clause else "WHERE id = %s"
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
cur.execute(
|
cur.execute(
|
||||||
f"""SELECT id, account, uid, full_name, given_name, family_name, organization,
|
f"""SELECT id, account, uid, full_name, prefix, given_name, middle_name, family_name, suffix, organization,
|
||||||
job_title, birthday, notes, photo_url, emails, phones, addresses, urls, social_profiles, categories, updated_at
|
job_title, birthday, notes, photo_url, emails, phones, addresses, urls, social_profiles, categories, updated_at
|
||||||
FROM contacts {where_clause} {id_clause}""",
|
FROM contacts {where_clause} {id_clause}""",
|
||||||
params + [contact_id],
|
params + [contact_id],
|
||||||
@@ -624,7 +624,7 @@ def web_contact(
|
|||||||
id_clause = "AND id = %s" if where_clause else "WHERE id = %s"
|
id_clause = "AND id = %s" if where_clause else "WHERE id = %s"
|
||||||
with conn.cursor() as cur:
|
with conn.cursor() as cur:
|
||||||
cur.execute(
|
cur.execute(
|
||||||
f"""SELECT id, account, uid, full_name, given_name, family_name, organization,
|
f"""SELECT id, account, uid, full_name, prefix, given_name, middle_name, family_name, suffix, organization,
|
||||||
job_title, birthday, notes, photo_url, emails, phones, addresses, urls, social_profiles, categories, updated_at
|
job_title, birthday, notes, photo_url, emails, phones, addresses, urls, social_profiles, categories, updated_at
|
||||||
FROM contacts {where_clause} {id_clause}""",
|
FROM contacts {where_clause} {id_clause}""",
|
||||||
params + [contact_id],
|
params + [contact_id],
|
||||||
|
|||||||
@@ -10,8 +10,11 @@ class ContactOut(BaseModel):
|
|||||||
account: str
|
account: str
|
||||||
uid: str
|
uid: str
|
||||||
full_name: str | None
|
full_name: str | None
|
||||||
|
prefix: str | None
|
||||||
given_name: str | None
|
given_name: str | None
|
||||||
|
middle_name: str | None
|
||||||
family_name: str | None
|
family_name: str | None
|
||||||
|
suffix: str | None
|
||||||
organization: str | None
|
organization: str | None
|
||||||
job_title: str | None
|
job_title: str | None
|
||||||
birthday: date | None
|
birthday: date | None
|
||||||
|
|||||||
Reference in New Issue
Block a user