From 5f66780522aed9d50c20ae5dc6582fe352369b1b Mon Sep 17 00:00:00 2001 From: Scott Idem Date: Tue, 27 Jul 2021 18:37:52 -0400 Subject: [PATCH] Working on membership and related modules --- app/models/membership_person_models.py | 16 ++++++++++++---- app/models/membership_type_person_models.py | 2 +- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/app/models/membership_person_models.py b/app/models/membership_person_models.py index 1a6dd8e..a486c08 100644 --- a/app/models/membership_person_models.py +++ b/app/models/membership_person_models.py @@ -35,10 +35,10 @@ class Membership_Person_Base(BaseModel): account_id_random: Optional[str] account_id: Optional[int] - lu_membership_person_status_id: Optional[int] = Field( + lu_membership_person_status_id: Optional[int] = Field( # lu_membership_person_status_id alias = 'status_id' ) - lu_membership_person_status_name: Optional[str] = Field( + membership_person_status_name: Optional[str] = Field( alias = 'status_name' ) @@ -58,10 +58,14 @@ class Membership_Person_Base(BaseModel): membership_group_person_id: Optional[int] = Field( alias = 'group_person_id', ) # NOTE: This is not optional + membership_group_person_name: Optional[str] = Field( - alias = 'group_person_name', + alias = 'membership_group_name', # group_person_name ) + membership_group_status_id: Optional[int] + membership_group_status_name: Optional[str] + # membership_type_id_random: Optional[str] = Field( # alias = 'type_id_random', # ) # NOTE: This is not optional @@ -78,10 +82,14 @@ class Membership_Person_Base(BaseModel): membership_type_person_id: Optional[int] = Field( alias = 'type_person_id', ) # NOTE: This is not optional + membership_type_person_name: Optional[str] = Field( - alias = 'type_person_name', + alias = 'membership_type_name', # type_person_name ) + membership_type_status_id: Optional[int] + membership_type_status_name: Optional[str] + person_id_random: Optional[str] person_id: Optional[int] diff --git a/app/models/membership_type_person_models.py b/app/models/membership_type_person_models.py index f2cc0d9..277e612 100644 --- a/app/models/membership_type_person_models.py +++ b/app/models/membership_type_person_models.py @@ -45,7 +45,7 @@ class Membership_Type_Person_Base(BaseModel): product_id_random: Optional[str] product_id: Optional[int] # The product they purchased to get this membership - membership_type_status_id: Optional[int] = Field( + lu_membership_type_status_id: Optional[int] = Field( alias = 'status_id' ) membership_type_status_name: Optional[str] = Field(