A lot of route common params clean up

app/routers/person.py

@@ -10,7 +10,7 @@ from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select,
 from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 # from app.methods.membership_person_methods import load_membership_person_obj
-from app.methods.person_methods import create_update_person_obj_v4b, email_person_create_url, get_person_rec_list, get_person_rec_w_external_id, load_person_obj, update_person_obj
+from app.methods.person_methods import create_person_kiss, create_update_person_obj_v4b, email_person_create_url, get_person_rec_list, get_person_rec_w_external_id, load_person_obj, update_person_obj, update_person_kiss
 
 from app.models.person_models import Person_Base
 from app.models.response_models import Resp_Body_Base, mk_resp
@@ -19,50 +19,84 @@ from app.models.response_models import Resp_Body_Base, mk_resp
 router = APIRouter()
 
 
+# ### BEGIN ### API Person Routers ### post_person_obj() ###
+# Updated 2022-01-05
 @router.post('/person', response_model=Resp_Body_Base)
 async def post_person_obj(
-        obj: Person_Base,
-        return_obj: Optional[bool] = True,
+        person_obj: Person_Base,
+        contact_id: str = Query(None, min_length=11, max_length=22),
+        organization_id: str = Query(None, min_length=11, max_length=22),
+        user_id: str = Query(None, min_length=11, max_length=22),
+        return_obj: bool = True,
         commons: Common_Route_Params = Depends(common_route_params),
         ):
-    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    obj_type = 'person'
-    obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
-    result = post_obj_template(
-        obj_type=obj_type,
-        data=obj_data_dict,
-        return_obj=True,
-        by_alias=True,
-        exclude_unset=True,
-        )
-    return result
+    if person_id := create_person_kiss(
+            account_id = commons.x_account_id,
+            person_dict_obj = person_obj,
+            contact_id = contact_id,
+            organization_id = organization_id,
+            user_id = user_id,
+            ): pass
+    else:
+        log.warning('Likely bad request')
+        return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
+
+    if return_obj:
+        person_obj = load_person_obj(
+            person_id = person_id,
+            inc_address = False,
+            inc_contact = False,
+            inc_organization = False,
+            inc_user = False
+            ).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset)
+        data = person_obj
+    else:
+        data = person_id
+    return mk_resp(data=data, response=commons.response)
+# ### END ### API Person Routers ### post_person_obj() ###
 
 
-@router.patch('/person/{obj_id}', response_model=Resp_Body_Base)
+# ### BEGIN ### API Person Routers ### patch_person_obj() ###
+# Updated 2022-01-05
+@router.patch('/person/{person_id}', response_model=Resp_Body_Base)
 async def patch_person_obj(
-        obj: Person_Base,
-        obj_id: str = Query(..., min_length=11, max_length=22),
+        person_obj: Person_Base,
+        person_id: str = Query(..., min_length=11, max_length=22),
+        contact_id: str = Query(None, min_length=11, max_length=22),
+        organization_id: str = Query(None, min_length=11, max_length=22),
+        user_id: str = Query(None, min_length=11, max_length=22),
         return_obj: Optional[bool] = True,
         commons: Common_Route_Params = Depends(common_route_params),
         ):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    obj_type = 'person'
-    obj_data_dict = obj.dict(by_alias=False, exclude_unset=True)
-    obj_data_dict['id'] = redis_lookup_id_random(record_id_random=obj_id, table_name=obj_type)
-    obj_data_dict['id_random'] = obj_id
-    result = patch_obj_template(
-        obj_type=obj_type,
-        data=obj_data_dict,
-        obj_id=obj_id,
-        return_obj=True,
-        by_alias=True,
-        exclude_unset=True,
-        )
-    return result
+    if person_update_result := update_person_kiss(
+            person_dict_obj = person_obj,
+            contact_id = contact_id,
+            organization_id = organization_id,
+            user_id = user_id,
+            ): pass
+    else:
+        log.warning('Likely bad request')
+        return mk_resp(data=False, status_code=400, response=commons.response) # Bad Request
+
+    if return_obj:
+        person_obj = load_person_obj(
+            person_id = person_id,
+            inc_address = False,
+            inc_contact = False,
+            inc_organization = False,
+            inc_user = False
+            ).dict(by_alias=commons.by_alias, exclude_unset=commons.exclude_unset)
+        data = person_obj
+    else:
+        data = person_id
+    return mk_resp(data=data, response=commons.response)
+# ### END ### API Person Routers ### patch_person_obj() ###
 
 
 # ### BEGIN ### API Person ### v3_post_person_obj_new() ###

app/routers/user.py

@@ -713,7 +713,7 @@ async def lookup_username(
         inc_user_role_list: bool = False,
         commons: Common_Route_Params = Depends(common_route_params),
         ):
-    log.setLevel(logging.INFO) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
     account_id = commons.x_account_id