Working on all the routes, methods, and models.

app/methods/organization_methods.py

@@ -18,6 +18,8 @@ from app.models.organization_models import Organization_Base
 def load_organization_obj(
         organization_id:int|str,
         limit: int = 1000,
+        by_alias: bool = True,
+        exclude_unset: bool = True,
         model_as_dict: bool = False,
         enabled: str = 'enabled', # enabled, disabled, all
         inc_contact:bool=False,
@@ -41,21 +43,24 @@ def load_organization_obj(
     except ValidationError as e:
         log.error(e.json())
 
+    # Updated 2021-06-18
     if inc_contact:
-        #log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
         contact_id = organization_rec.get('contact_id', None)
         log.debug(contact_id)
-        # from app.methods.contact_methods import load_contact_obj
-        if contact_dict := load_contact_obj(
+        if contact_result := load_contact_obj(
             contact_id = contact_id,
+            limit = limit,
+            by_alias = by_alias,
+            exclude_unset = exclude_unset,
             model_as_dict = model_as_dict,
+            enabled = enabled,
             inc_address = inc_address,
             ):
-            organization_obj.contact = contact_dict
+            organization_obj.contact = contact_result
         else: organization_obj.contact = None
 
     if model_as_dict:
-        return organization_obj.dict(by_alias=True, exclude_unset=True) # pylint: disable=no-member
+        return organization_obj.dict(by_alias=by_alias, exclude_unset=exclude_unset) # pylint: disable=no-member
     else:
         return organization_obj
 # ### END ### API Organization Methods ### load_organization_obj() ###