minor: org pydantic model cleanup

Contact models also updated since they are now fully incorporated into orgs.

Issue #9

src/contact/schemas.py

@@ -9,7 +9,6 @@ from typing import Optional
 
 from pydantic import EmailStr, ConfigDict
 
-from src.organisation.constants import ContactType
 from src.schemas import CustomBaseModel
 
 
@@ -25,50 +24,11 @@ class ContactAddress(CustomBaseModel):
 	postal_code: Optional[str] = None
 
 
-class ContactContactGetResponse(CustomBaseModel):
-	email: str
-	first_name: str
-	last_name: str
-	phonenumber: str
-	vat_number: Optional[str] = None
-
-class ContactAddressGetResponse(CustomBaseModel):
-	post_office_box_number: Optional[str] = None
-	street_address: Optional[str] = None        # If using a PO box, there would be no street address
-	street_address_line_2: Optional[str] = None
-	locality: str
-	address_region: Optional[str] = None
-	country_code: str
-	postal_code: str
-
-class ContactContactPostRequest(CustomBaseModel):
-	email: EmailStr
-	first_name: str
-	last_name: str
-	phonenumber: str
-	vat_number: Optional[str] = None
-	post_office_box_number: Optional[str] = None
-	street_address: Optional[str] = None
-	street_address_line_2: Optional[str] = None
-	locality: str
-	address_region: Optional[str] = None
-	country_code: str
-	postal_code: str
-
-class ContactUpdateRequest(CustomBaseModel):
+class ContactModel(CustomBaseModel):
 	email: Optional[EmailStr] = None
 	first_name: Optional[str] = None
 	last_name: Optional[str] = None
 	phonenumber: Optional[str] = None
 	vat_number: Optional[str] = None
-	post_office_box_number: Optional[str] = None
-	street_address: Optional[str] = None
-	street_address_line_2: Optional[str] = None
-	locality: Optional[str] = None
-	address_region: Optional[str] = None
-	country_code: Optional[str] = None
-	postal_code: Optional[str] = None
 
-class ContactOrgGetResponse(CustomBaseModel):
-	name: str
-	contact_types: list[ContactType]
+	address: ContactAddress