otf-api 0.8.2__py3-none-any.whl → 0.9.1__py3-none-any.whl

otf_api/models/member_detail.py

@@ -1,135 +1,115 @@
 from datetime import date, datetime
-from typing import Any
 
 from pydantic import Field, field_validator
 
 from otf_api.models.base import OtfItemBase
+from otf_api.models.mixins import AddressMixin
+from otf_api.models.studio_detail import StudioDetail
 
 
-class Address(OtfItemBase):
-    member_address_uuid: str | None = Field(None, alias="memberAddressUUId")
-    type: str
-    address1: str
-    address2: str | None = None
-    suburb: str | None = None
-    territory: str
-    postal_code: str = Field(..., alias="postalCode")
-    country: str
-
-
-class MemberCreditCard(OtfItemBase):
-    name_on_card: str = Field(..., alias="nameOnCard")
-    cc_type: str = Field(..., alias="ccType")
-    cc_last4: str = Field(..., alias="ccLast4")
-
-
-class PhysicalCountryDetails(OtfItemBase):
-    country_code: str = Field(..., alias="countryCode")
-    description: str
-
-
-class StudioLocation(OtfItemBase):
-    physical_country_id: int = Field(..., alias="physicalCountryId")
-    physical_country_details: PhysicalCountryDetails = Field(..., alias="physicalCountryDetails")
-
-
-class StudioPartner(OtfItemBase):
-    studio_acs_id: str = Field(..., alias="studioAcsId")
-
-
-class HomeStudio(OtfItemBase):
-    studio_id: int = Field(..., alias="studioId")
-    studio_uuid: str = Field(..., alias="studioUUId")
-    studio_name: str = Field(..., alias="studioName")
-    studio_number: str = Field(..., alias="studioNumber")
-    mbo_studio_id: int = Field(..., alias="mboStudioId")
-    time_zone: str = Field(..., alias="timeZone")
-    is_integrated: bool = Field(..., alias="isIntegrated")
-    studio_status: str = Field(..., alias="studioStatus")
-    studio_location: StudioLocation = Field(..., alias="studioLocation")
-    studio_partner: StudioPartner = Field(..., alias="studioPartner")
+class Address(AddressMixin):
+    member_address_uuid: str | None = Field(None, alias="memberAddressUUId", exclude=True, repr=False)
+    type: str | None = None
 
 
 class MemberProfile(OtfItemBase):
-    member_profile_uuid: str = Field(..., alias="memberProfileUUId")
-    unit_of_measure: str = Field(..., alias="unitOfMeasure")
-    max_hr_type: str = Field(..., alias="maxHrType")
-    manual_max_hr: int = Field(..., alias="manualMaxHr")
-    formula_max_hr: int = Field(..., alias="formulaMaxHr")
-    automated_hr: int = Field(..., alias="automatedHr")
-    member_optin_flow_type_id: int = Field(..., alias="memberOptinFlowTypeId")
+    unit_of_measure: str | None = Field(None, alias="unitOfMeasure")
+    max_hr_type: str | None = Field(None, alias="maxHrType")
+    manual_max_hr: int | None = Field(None, alias="manualMaxHr")
+    formula_max_hr: int | None = Field(None, alias="formulaMaxHr")
+    automated_hr: int | None = Field(None, alias="automatedHr")
 
+    member_profile_uuid: str | None = Field(None, alias="memberProfileUUId", exclude=True, repr=False)
+    member_optin_flow_type_id: int | None = Field(None, alias="memberOptinFlowTypeId", exclude=True, repr=False)
 
-class MemberClassSummary(OtfItemBase):
-    total_classes_booked: int = Field(..., alias="totalClassesBooked")
-    total_classes_attended: int = Field(..., alias="totalClassesAttended")
-    total_intro: int = Field(..., alias="totalIntro")
-    total_ot_live_classes_booked: int = Field(..., alias="totalOTLiveClassesBooked")
-    total_ot_live_classes_attended: int = Field(..., alias="totalOTLiveClassesAttended")
-    total_classes_used_hrm: int = Field(..., alias="totalClassesUsedHRM")
-    total_studios_visited: int = Field(..., alias="totalStudiosVisited")
-    first_visit_date: datetime = Field(..., alias="firstVisitDate")
-    last_class_visited_date: datetime = Field(..., alias="lastClassVisitedDate")
-    last_class_booked_date: datetime = Field(..., alias="lastClassBookedDate")
-    last_class_studio_visited: int = Field(..., alias="lastClassStudioVisited")
 
+class MemberClassSummary(OtfItemBase):
+    total_classes_booked: int | None = Field(None, alias="totalClassesBooked")
+    total_classes_attended: int | None = Field(None, alias="totalClassesAttended")
+    total_intro_classes: int | None = Field(None, alias="totalIntro")
+    total_ot_live_classes_booked: int | None = Field(None, alias="totalOTLiveClassesBooked")
+    total_ot_live_classes_attended: int | None = Field(None, alias="totalOTLiveClassesAttended")
+    total_classes_used_hrm: int | None = Field(None, alias="totalClassesUsedHRM")
+    total_studios_visited: int | None = Field(None, alias="totalStudiosVisited")
+    first_visit_date: date | None = Field(None, alias="firstVisitDate")
+    last_class_visited_date: date | None = Field(None, alias="lastClassVisitedDate")
+    last_class_booked_date: date | None = Field(None, alias="lastClassBookedDate")
 
-class MemberReferrer(OtfItemBase):
-    member_referrer_uuid: str = Field(..., alias="memberReferrerUUId")
+    last_class_studio_visited: int | None = Field(None, alias="lastClassStudioVisited", exclude=True, repr=False)
 
 
 class MemberDetail(OtfItemBase):
-    member_id: int = Field(..., alias="memberId")
     member_uuid: str = Field(..., alias="memberUUId")
-    cognito_id: str = Field(..., alias="cognitoId")
-    home_studio_id: int = Field(..., alias="homeStudioId")
-    mbo_studio_id: int = Field(..., alias="mboStudioId")
-    mbo_id: str = Field(..., alias="mboId")
-    mbo_unique_id: int = Field(..., alias="mboUniqueId")
-    mbo_status: str = Field(..., alias="mboStatus")
-    user_name: str = Field(..., alias="userName")
-    first_name: str = Field(..., alias="firstName")
-    last_name: str = Field(..., alias="lastName")
-    email: str
-    profile_picture_url: str | None = Field(None, alias="profilePictureUrl")
-    alternate_emails: None = Field(..., alias="alternateEmails")
-    address_line1: str | None = Field(None, alias="addressLine1")
-    address_line2: str | None = Field(None, alias="addressLine2")
-    city: str | None
-    state: str | None
-    postal_code: str | None = Field(None, alias="postalCode")
-    phone_number: str = Field(..., alias="phoneNumber")
-    home_phone: str | None = Field(None, alias="homePhone")
-    work_phone: str | None = Field(None, alias="workPhone")
-    phone_type: None = Field(..., alias="phoneType")
-    birth_day: date = Field(..., alias="birthDay")
-    cc_last4: str = Field(..., alias="ccLast4")
-    cc_type: str = Field(..., alias="ccType")
-    gender: str
-    liability: Any
-    locale: str
-    weight: int
-    weight_measure: str = Field(..., alias="weightMeasure")
-    height: int
-    height_measure: str = Field(..., alias="heightMeasure")
-    max_hr: int = Field(..., alias="maxHr")
-    intro_neccessary: bool = Field(..., alias="introNeccessary")
-    online_signup: None = Field(..., alias="onlineSignup")
-    year_imported: int = Field(..., alias="yearImported")
-    is_member_verified: bool = Field(..., alias="isMemberVerified")
-    lead_prospect: bool = Field(..., alias="leadProspect")
-    created_by: str | None = Field(None, alias="createdBy")
-    created_date: datetime = Field(..., alias="createdDate")
-    updated_by: str = Field(..., alias="updatedBy")
-    updated_date: datetime = Field(..., alias="updatedDate")
-    is_deleted: bool = Field(..., alias="isDeleted")
-    addresses: list[Address] | None = None
-    member_credit_card: MemberCreditCard | None = Field(None, alias="memberCreditCard")
-    home_studio: HomeStudio = Field(..., alias="homeStudio")
-    member_profile: MemberProfile = Field(..., alias="memberProfile")
-    member_referrer: None | MemberReferrer = Field(None, alias="memberReferrer")
-    otf_acs_id: str = Field(..., alias="otfAcsId")
-    member_class_summary: MemberClassSummary | None = Field(None, alias="memberClassSummary")
+    cognito_id: str = Field(
+        ...,
+        alias="cognitoId",
+        exclude=True,
+        repr=False,
+        description="Cognito user ID, not necessary for end users. Also on OtfUser object.",
+    )
+
+    home_studio: StudioDetail
+    profile: MemberProfile = Field(..., alias="memberProfile")
+    class_summary: MemberClassSummary | None = Field(None, alias="memberClassSummary")
+    addresses: list[Address] | None = Field(default_factory=list)
+
+    studio_display_name: str | None = Field(
+        None, alias="userName", description="The value that is displayed on tread/rower tablets and OTBeat screens"
+    )
+    first_name: str | None = Field(None, alias="firstName")
+    last_name: str | None = Field(None, alias="lastName")
+    email: str | None = Field(None, alias="email")
+    phone_number: str | None = Field(None, alias="phoneNumber")
+    birth_day: date | None = Field(None, alias="birthDay")
+    gender: str | None = Field(None, alias="gender")
+    locale: str | None = Field(None, alias="locale")
+    weight: int | None = Field(None, alias="weight")
+    weight_units: str | None = Field(None, alias="weightMeasure")
+    height: int | None = Field(None, alias="height")
+    height_units: str | None = Field(None, alias="heightMeasure")
+
+    # unused fields - leaving these in for now in case someone finds a purpose for them
+    # but they will potentially (likely?) be removed in the future
+
+    # mbo fields
+    mbo_id: str | None = Field(None, alias="mboId", exclude=True, repr=False, description="MindBody attr")
+    mbo_status: str | None = Field(None, alias="mboStatus", exclude=True, repr=False, description="MindBody attr")
+    mbo_studio_id: int | None = Field(None, alias="mboStudioId", exclude=True, repr=False, description="MindBody attr")
+    mbo_unique_id: int | None = Field(None, alias="mboUniqueId", exclude=True, repr=False, description="MindBody attr")
+
+    # ids
+    created_by: str | None = Field(None, alias="createdBy", exclude=True, repr=False)
+    home_studio_id: int | None = Field(
+        None, alias="homeStudioId", exclude=True, repr=False, description="Not used by API"
+    )
+    member_id: int | None = Field(None, alias="memberId", exclude=True, repr=False, description="Not used by API")
+    otf_acs_id: str | None = Field(None, alias="otfAcsId", exclude=True, repr=False)
+    updated_by: str | None = Field(None, alias="updatedBy", exclude=True, repr=False)
+
+    # unused address/member detail fields
+    created_date: datetime | None = Field(None, alias="createdDate", exclude=True, repr=False)
+    updated_date: datetime | None = Field(None, alias="updatedDate", exclude=True, repr=False)
+
+    address_line1: str | None = Field(None, alias="addressLine1", exclude=True, repr=False)
+    address_line2: str | None = Field(None, alias="addressLine2", exclude=True, repr=False)
+    alternate_emails: None = Field(None, alias="alternateEmails", exclude=True, repr=False)
+    cc_last4: str | None = Field(None, alias="ccLast4", exclude=True, repr=False)
+    cc_type: str | None = Field(None, alias="ccType", exclude=True, repr=False)
+    city: str | None = Field(None, exclude=True, repr=False)
+    home_phone: str | None = Field(None, alias="homePhone", exclude=True, repr=False)
+    intro_neccessary: bool | None = Field(None, alias="introNeccessary", exclude=True, repr=False)
+    is_deleted: bool | None = Field(None, alias="isDeleted", exclude=True, repr=False)
+    is_member_verified: bool | None = Field(None, alias="isMemberVerified", exclude=True, repr=False)
+    lead_prospect: bool | None = Field(None, alias="leadProspect", exclude=True, repr=False)
+    max_hr: int | None = Field(
+        None, alias="maxHr", exclude=True, repr=False, description="Also found in member_profile"
+    )
+    online_signup: None = Field(None, alias="onlineSignup", exclude=True, repr=False)
+    phone_type: None = Field(None, alias="phoneType", exclude=True, repr=False)
+    postal_code: str | None = Field(None, alias="postalCode", exclude=True, repr=False)
+    state: str | None = Field(None, exclude=True, repr=False)
+    work_phone: str | None = Field(None, alias="workPhone", exclude=True, repr=False)
+    year_imported: int | None = Field(None, alias="yearImported", exclude=True, repr=False)
 
     @field_validator("birth_day")
     @classmethod
@@ -137,5 +117,5 @@ class MemberDetail(OtfItemBase):
         if value is None:
             return value
         if not isinstance(value, date):
-            return datetime.strptime(value, "%Y-%m-%d").date()  # noqa
+            return datetime.strptime(value, "%Y-%m-%d").date()
         return value

otf_api/models/member_membership.py

@@ -6,20 +6,21 @@ from otf_api.models.base import OtfItemBase
 
 
 class MemberMembership(OtfItemBase):
-    member_membership_id: int = Field(..., alias="memberMembershipId")
-    member_membership_uuid: str = Field(..., alias="memberMembershipUUId")
-    membership_id: int = Field(..., alias="membershipId")
-    member_id: int = Field(..., alias="memberId")
-    payment_date: datetime = Field(..., alias="paymentDate")
-    active_date: datetime = Field(..., alias="activeDate")
-    expiration_date: datetime = Field(..., alias="expirationDate")
-    mbo_description_id: str = Field(..., alias="mboDescriptionId")
-    current: bool
-    count: int
-    remaining: int
-    name: str
-    created_by: str = Field(..., alias="createdBy")
-    created_date: datetime = Field(..., alias="createdDate")
-    updated_by: str = Field(..., alias="updatedBy")
-    updated_date: datetime = Field(..., alias="updatedDate")
-    is_deleted: bool = Field(..., alias="isDeleted")
+    payment_date: datetime | None = Field(None, alias="paymentDate")
+    active_date: datetime | None = Field(None, alias="activeDate")
+    expiration_date: datetime | None = Field(None, alias="expirationDate")
+    current: bool | None = None
+    count: int | None = None
+    remaining: int | None = None
+    name: str | None = None
+    updated_date: datetime | None = Field(None, alias="updatedDate")
+    created_date: datetime | None = Field(None, alias="createdDate")
+    is_deleted: bool | None = Field(None, alias="isDeleted")
+
+    member_membership_id: int | None = Field(None, alias="memberMembershipId", exclude=True, repr=False)
+    member_membership_uuid: str | None = Field(None, alias="memberMembershipUUId", exclude=True, repr=False)
+    membership_id: int | None = Field(None, alias="membershipId", exclude=True, repr=False)
+    member_id: int | None = Field(None, alias="memberId", exclude=True, repr=False)
+    mbo_description_id: str | None = Field(None, alias="mboDescriptionId", exclude=True, repr=False)
+    created_by: str | None = Field(None, alias="createdBy", exclude=True, repr=False)
+    updated_by: str | None = Field(None, alias="updatedBy", exclude=True, repr=False)

otf_api/models/member_purchases.py

@@ -3,133 +3,27 @@ from datetime import datetime
 from pydantic import Field
 
 from otf_api.models.base import OtfItemBase
-
-
-class Location(OtfItemBase):
-    phone: str
-    latitude: str
-    longitude: str
-    address1: str
-    address2: str | None = None
-    city: str
-    state: str
-    postal_code: str = Field(..., alias="postalCode")
-
-
-class Currency(OtfItemBase):
-    currency_alphabetic_code: str = Field(..., alias="currencyAlphabeticCode")
-
-
-class DefaultCurrency(OtfItemBase):
-    currency_id: int = Field(..., alias="currencyId")
-    currency: Currency
-
-
-class Country(OtfItemBase):
-    country_id: int = Field(..., alias="countryId")
-    country_code: str = Field(..., alias="countryCode")
-    description: str
-    country_currency_code: str = Field(..., alias="countryCurrencyCode")
-    default_currency: DefaultCurrency = Field(..., alias="defaultCurrency")
-
-
-class StudioLocation(OtfItemBase):
-    studio_location_id: int = Field(..., alias="studioLocationId")
-    bill_to_address: str = Field(..., alias="billToAddress")
-    bill_to_address2: str = Field(..., alias="billToAddress2")
-    bill_to_city: str = Field(..., alias="billToCity")
-    bill_to_state: str = Field(..., alias="billToState")
-    bill_to_postal_code: str = Field(..., alias="billToPostalCode")
-    bill_to_region: str = Field(..., alias="billToRegion")
-    bill_to_country_id: int = Field(..., alias="billToCountryId")
-    bill_to_country: str = Field(..., alias="billToCountry")
-    ship_to_address: str = Field(..., alias="shipToAddress")
-    ship_to_address2: str | None = Field(None, alias="shipToAddress2")
-    ship_to_city: str = Field(..., alias="shipToCity")
-    ship_to_state: str = Field(..., alias="shipToState")
-    ship_to_postal_code: str = Field(..., alias="shipToPostalCode")
-    ship_to_region: str = Field(..., alias="shipToRegion")
-    ship_to_country_id: int = Field(..., alias="shipToCountryId")
-    ship_to_country: str = Field(..., alias="shipToCountry")
-    physical_address: str = Field(..., alias="physicalAddress")
-    physical_address2: str | None = Field(None, alias="physicalAddress2")
-    physical_city: str = Field(..., alias="physicalCity")
-    physical_state: str = Field(..., alias="physicalState")
-    physical_postal_code: str = Field(..., alias="physicalPostalCode")
-    physical_region: str = Field(..., alias="physicalRegion")
-    physical_country_id: int = Field(..., alias="physicalCountryId")
-    physical_country: str = Field(..., alias="physicalCountry")
-    phone_number: str = Field(..., alias="phoneNumber")
-    latitude: str
-    longitude: str
-    country: Country
-
-
-class Studio(OtfItemBase):
-    studio_id: int = Field(..., alias="studioId")
-    studio_uuid: str = Field(..., alias="studioUUId")
-    mbo_studio_id: int = Field(..., alias="mboStudioId")
-    studio_name: str = Field(..., alias="studioName")
-    area_id: int = Field(..., alias="areaId")
-    market_id: int = Field(..., alias="marketId")
-    state_id: int = Field(..., alias="stateId")
-    studio_physical_location_id: int = Field(..., alias="studioPhysicalLocationId")
-    studio_number: str = Field(..., alias="studioNumber")
-    description: str
-    studio_version: str = Field(..., alias="studioVersion")
-    studio_token: str = Field(..., alias="studioToken")
-    studio_status: str = Field(..., alias="studioStatus")
-    open_date: datetime = Field(..., alias="openDate")
-    studio_type_id: int = Field(..., alias="studioTypeId")
-    pos_type_id: int = Field(..., alias="posTypeId")
-    tax_inclusive_pricing: bool = Field(..., alias="taxInclusivePricing")
-    tax_rate: str = Field(..., alias="taxRate")
-    logo_url: str = Field(..., alias="logoUrl")
-    page_color1: str = Field(..., alias="pageColor1")
-    page_color2: str = Field(..., alias="pageColor2")
-    page_color3: str = Field(..., alias="pageColor3")
-    page_color4: str = Field(..., alias="pageColor4")
-    accepts_visa_master_card: bool = Field(..., alias="acceptsVisaMasterCard")
-    accepts_american_express: bool = Field(..., alias="acceptsAmericanExpress")
-    accepts_discover: bool = Field(..., alias="acceptsDiscover")
-    accepts_ach: bool = Field(..., alias="acceptsACH")
-    sms_package_enabled: bool = Field(..., alias="smsPackageEnabled")
-    allows_dashboard_access: bool = Field(..., alias="allowsDashboardAccess")
-    pricing_level: str = Field(..., alias="pricingLevel")
-    contact_email: str = Field(..., alias="contactEmail")
-    royalty_rate: str = Field(..., alias="royaltyRate")
-    commission_percent: str = Field(..., alias="commissionPercent")
-    marketing_fund_rate: str = Field(..., alias="marketingFundRate")
-    time_zone: str = Field(..., alias="timeZone")
-    environment: str
-    allows_cr_waitlist: bool = Field(..., alias="allowsCRWaitlist")
-    cr_waitlist_flag_last_updated: datetime = Field(..., alias="crWaitlistFlagLastUpdated")
-    is_integrated: bool = Field(..., alias="isIntegrated")
-    locations: list[Location]
-    studio_location: StudioLocation = Field(..., alias="studioLocation")
+from otf_api.models.studio_detail import StudioDetail
 
 
 class MemberPurchase(OtfItemBase):
-    member_purchase_id: int = Field(..., alias="memberPurchaseId")
-    member_purchase_uuid: str = Field(..., alias="memberPurchaseUUId")
-    studio_id: int = Field(..., alias="studioId")
-    name: str
-    price: str
-    member_purchase_date_time: datetime = Field(..., alias="memberPurchaseDateTime")
-    member_purchase_type: str = Field(..., alias="memberPurchaseType")
-    status: str
-    member_service_id: int | None = Field(None, alias="memberServiceId")
-    member_membership_id: int | None = Field(None, alias="memberMembershipId")
-    member_fee_id: int | None = Field(None, alias="memberFeeId")
-    pos_contract_id: int | None = Field(None, alias="posContractId")
-    pos_product_id: int = Field(..., alias="posProductId")
-    pos_description_id: int | None = Field(None, alias="posDescriptionId")
-    pos_pmt_ref_no: int | None = Field(None, alias="posPmtRefNo")
-    pos_sale_id: int = Field(..., alias="posSaleId")
-    quantity: int
-    member_id: int = Field(..., alias="memberId")
-    studio: Studio
-
-
-class MemberPurchaseList(OtfItemBase):
-    data: list[MemberPurchase]
+    purchase_uuid: str = Field(..., alias="memberPurchaseUUId")
+    name: str | None = None
+    price: str | None = None
+    purchase_date_time: datetime | None = Field(None, alias="memberPurchaseDateTime")
+    purchase_type: str | None = Field(None, alias="memberPurchaseType")
+    status: str | None = None
+    quantity: int | None = None
+    studio: StudioDetail = Field(..., exclude=True, repr=False)
+
+    member_fee_id: int | None = Field(None, alias="memberFeeId", exclude=True, repr=False)
+    member_id: int | None = Field(..., alias="memberId", exclude=True, repr=False)
+    member_membership_id: int | None = Field(None, alias="memberMembershipId", exclude=True, repr=False)
+    member_purchase_id: int | None = Field(..., alias="memberPurchaseId", exclude=True, repr=False)
+    member_service_id: int | None = Field(None, alias="memberServiceId", exclude=True, repr=False)
+    pos_contract_id: int | None = Field(None, alias="posContractId", exclude=True, repr=False)
+    pos_description_id: int | None = Field(None, alias="posDescriptionId", exclude=True, repr=False)
+    pos_pmt_ref_no: int | None = Field(None, alias="posPmtRefNo", exclude=True, repr=False)
+    pos_product_id: int | None = Field(..., alias="posProductId", exclude=True, repr=False)
+    pos_sale_id: int | None = Field(..., alias="posSaleId", exclude=True, repr=False)
+    studio_id: int | None = Field(..., alias="studioId", exclude=True, repr=False)

otf_api/models/mixins.py

@@ -1,44 +1,48 @@
-from datetime import datetime
+from pydantic import AliasChoices, Field, field_validator, model_validator
 
-from humanize import precisedelta
+from otf_api.models.base import OtfItemBase
 
-from otf_api.models.enums import ClassType
 
+class PhoneLongitudeLatitudeMixin(OtfItemBase):
+    phone_number: str | None = Field(None, alias=AliasChoices("phone", "phoneNumber"))
+    latitude: float | None = Field(None, alias=AliasChoices("latitude"))
+    longitude: float | None = Field(None, alias=AliasChoices("longitude"))
 
-class OtfClassTimeMixin:
-    starts_at_local: datetime
-    ends_at_local: datetime
-    name: str
 
-    @property
-    def day_of_week(self) -> str:
-        return self.starts_at_local.strftime("%A")
+class AddressMixin(OtfItemBase):
+    address_line1: str | None = Field(None, alias=AliasChoices("line1", "address1", "address", "physicalAddress"))
+    address_line2: str | None = Field(None, alias=AliasChoices("line2", "address2", "physicalAddress2"))
+    city: str | None = Field(None, alias=AliasChoices("city", "physicalCity", "suburb"))
+    postal_code: str | None = Field(None, alias=AliasChoices("postal_code", "postalCode", "physicalPostalCode"))
+    state: str | None = Field(None, alias=AliasChoices("state", "physicalState", "territory"))
+    country: str | None = Field(None, alias=AliasChoices("country", "physicalCountry"))
+    region: str | None = Field(None, exclude=True, repr=False, alias=AliasChoices("physicalRegion", "region"))
+    country_id: int | None = Field(None, exclude=True, repr=False, alias=AliasChoices("physicalCountryId", "countryId"))
 
-    @property
-    def date(self) -> str:
-        return self.starts_at_local.strftime("%Y-%m-%d")
+    @model_validator(mode="before")
+    @classmethod
+    def check_country(cls, values):
+        if set(values.keys()) == set(
+            ["phone", "latitude", "longitude", "address1", "address2", "city", "state", "postalCode"]
+        ):
+            values = {k: v for k, v in values.items() if v and str(v) != "0.00000000"}
 
-    @property
-    def time(self) -> str:
-        """Returns time in 12 hour clock format, with no leading 0"""
-        val = self.starts_at_local.strftime("%I:%M %p")
-        if val[0] == "0":
-            val = " " + val[1:]
+        if "country" in values and isinstance(values["country"], dict):
+            values["country_currency"] = values.pop("country")
 
-        return val
+        if "physicalCountry" in values and isinstance(values["physicalCountry"], dict):
+            values["country_currency"] = values.pop("physicalCountry")
 
-    @property
-    def duration(self) -> str:
-        duration = self.ends_at_local - self.starts_at_local
-        human_val: str = precisedelta(duration, minimum_unit="minutes")
-        if human_val == "1 hour and 30 minutes":
-            return "90 minutes"
-        return human_val
+        return values
 
-    @property
-    def class_type(self) -> ClassType:
-        for class_type in ClassType:
-            if class_type.value in self.name:
-                return class_type
+    @field_validator("address_line1", "address_line2", "city", "postal_code", "state", "country")
+    @classmethod
+    def clean_strings(cls, value: str | None, **_kwargs) -> str | None:
+        if value is None:
+            return value
+        value = value.strip()
 
-        return ClassType.OTHER
+        if not value:
+            return None
+
+        return value

otf_api/models/notifications.py

@@ -0,0 +1,17 @@
+from pydantic import Field
+
+from otf_api.models.base import OtfItemBase
+
+
+class SmsNotificationSettings(OtfItemBase):
+    is_promotional_sms_opt_in: bool | None = Field(None, alias="isPromotionalSmsOptIn")
+    is_transactional_sms_opt_in: bool | None = Field(None, alias="isTransactionalSmsOptIn")
+    is_promotional_phone_opt_in: bool | None = Field(None, alias="isPromotionalPhoneOptIn")
+    is_transactional_phone_opt_in: bool | None = Field(None, alias="isTransactionalPhoneOptIn")
+
+
+class EmailNotificationSettings(OtfItemBase):
+    is_system_email_opt_in: bool | None = Field(None, alias="isSystemEmailOptIn")
+    is_promotional_email_opt_in: bool | None = Field(None, alias="isPromotionalEmailOptIn")
+    is_transactional_email_opt_in: bool | None = Field(None, alias="isTransactionalEmailOptIn")
+    email: str | None = None

otf_api/models/out_of_studio_workout_history.py

@@ -1,41 +1,32 @@
 from datetime import datetime
 
-from pydantic import Field
+from pydantic import AliasPath, Field
 
 from otf_api.models.base import OtfItemBase
 
 
-class WorkoutType(OtfItemBase):
-    id: int
-    display_name: str = Field(..., alias="displayName")
-    icon: str
-
-
 class OutOfStudioWorkoutHistory(OtfItemBase):
-    workout_date: datetime = Field(..., alias="workoutDate")
-    start_time: datetime = Field(..., alias="startTime")
-    end_time: datetime = Field(..., alias="endTime")
-    duration_unit: str = Field(..., alias="durationUnit")
-    duration: float
-    total_calories: int = Field(..., alias="totalCalories")
-    hr_percent_max: int = Field(..., alias="hrPercentMax")
-    distance_unit: str = Field(..., alias="distanceUnit")
-    total_distance: float = Field(..., alias="totalDistance")
-    splat_points: int = Field(..., alias="splatPoints")
-    target_heart_rate: int = Field(..., alias="targetHeartRate")
-    red_zone_seconds: int = Field(..., alias="redZoneSeconds")
-    orange_zone_seconds: int = Field(..., alias="orangeZoneSeconds")
-    green_zone_seconds: int = Field(..., alias="greenZoneSeconds")
-    blue_zone_seconds: int = Field(..., alias="blueZoneSeconds")
-    grey_zone_seconds: int = Field(..., alias="greyZoneSeconds")
-    total_steps: int = Field(..., alias="totalSteps")
-    has_detailed_data: bool = Field(..., alias="hasDetailedData")
-    workout_type: WorkoutType = Field(..., alias="workoutType")
     member_uuid: str = Field(..., alias="memberUUId")
     workout_uuid: str = Field(..., alias="workoutUUId")
-    avg_heartrate: int = Field(..., alias="avgHeartrate")
-    max_heartrate: int = Field(..., alias="maxHeartrate")
-
 
-class OutOfStudioWorkoutHistoryList(OtfItemBase):
-    workouts: list[OutOfStudioWorkoutHistory]
+    workout_date: datetime | None = Field(None, alias="workoutDate")
+    start_time: datetime | None = Field(None, alias="startTime")
+    end_time: datetime | None = Field(None, alias="endTime")
+    duration: float | None = None
+    duration_unit: str | None = Field(None, alias="durationUnit")
+    total_calories: int | None = Field(None, alias="totalCalories")
+    hr_percent_max: int | None = Field(None, alias="hrPercentMax")
+    distance_unit: str | None = Field(None, alias="distanceUnit")
+    total_distance: float | None = Field(None, alias="totalDistance")
+    splat_points: int | None = Field(None, alias="splatPoints")
+    target_heart_rate: int | None = Field(None, alias="targetHeartRate")
+    total_steps: int | None = Field(None, alias="totalSteps")
+    has_detailed_data: bool | None = Field(None, alias="hasDetailedData")
+    avg_heartrate: int | None = Field(None, alias="avgHeartrate")
+    max_heartrate: int | None = Field(None, alias="maxHeartrate")
+    workout_type: str | None = Field(None, alias=AliasPath("workoutType", "displayName"))
+    red_zone_seconds: int | None = Field(None, alias="redZoneSeconds")
+    orange_zone_seconds: int | None = Field(None, alias="orangeZoneSeconds")
+    green_zone_seconds: int | None = Field(None, alias="greenZoneSeconds")
+    blue_zone_seconds: int | None = Field(None, alias="blueZoneSeconds")
+    grey_zone_seconds: int | None = Field(None, alias="greyZoneSeconds")