Work on event, event_session, event_presentation, event_presenter, user, and person routes, methods, and models

app/routers/user.py

@@ -5,12 +5,12 @@ from typing import Dict, List, Optional, Set, Union
 
 from app.lib_general import log, logging, secure_hash_string, verify_secure_hash_string
 from app.config import settings
-from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
+from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, lookup_id_random,redis_lookup_id_random
 
 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.order_methods import get_order_rec_list, load_order_obj
-from app.methods.user_methods import load_user_obj
+from app.methods.user_methods import create_user_obj, load_user_obj
 
 from app.models.common_field_schema import default_num_bytes
 from app.models.response_models import Resp_Body_Base, mk_resp
@@ -44,9 +44,13 @@ async def post_user_obj(
     return result
 
 
+# ### BEGIN ### API User ### post_user_obj_new() ###
+# Updated 2021-08-21 (complete re-write)
 @router.post('/new', response_model=Resp_Body_Base)
-async def post_user_new_obj(
+async def post_user_obj_new(
         user_obj: User_New_Base,
+        allow_update: bool = False,
+        avoid_dup_username: bool = False,
         x_account_id: str = Header(...),
         return_obj: bool = True,
         by_alias: bool = True,
@@ -56,28 +60,26 @@ async def post_user_new_obj(
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())
 
-    user_data = user_obj.dict(by_alias=False, exclude_unset=False, exclude={'new_password', 'account_id_random'})
+    if create_user_obj_result := create_user_obj(user_obj_new=user_obj, allow_update=allow_update, avoid_dup_username=avoid_dup_username): pass
+    else: return mk_resp(data=False, status_code=400, response=response, status_message='The user account was not created. This is likely because that username already exists for this account.')
 
-    log.info('Checking if the username is already in use for the account...')
-    sql_select_user = f"""
-        SELECT *
-        FROM `user` AS user
-        WHERE user.account_id = :account_id and user.username = :username
-        """
-
-    if sql_select_result := sql_select(sql=sql_select_user, data=user_data):
-        return mk_resp(data=False, status_message='The user account was not created. This is likely because of a duplicate username.')
-
-    log.info('Adding new user account...')
-    if sql_insert_result := sql_insert(table_name='user', data=user_data):
-        log.info('Selecting new user account to return as an object...')
-        sql_select_user_result = sql_select(table_name='v_user', record_id=sql_insert_result)
-
-        user_obj_new = User_Out_Base(**sql_select_user_result)
-
-        return mk_resp(data=user_obj_new.dict(by_alias=True, exclude_unset=True))
+    if isinstance(create_user_obj_result, int):
+        user_id = create_user_obj_result
+        if return_obj:
+            if load_user_obj_result := load_user_obj(user_id=user_id):
+                data = load_user_obj_result
+            else:
+                data = False
+        else:
+            user_id = create_user_obj_result
+            user_id_random = lookup_id_random(record_id=user_id, table_name='user')
+            data = {}
+            data['user_id'] = user_id
+            data['user_id_random'] = user_id_random
+        return mk_resp(data=data, response=response, status_message='The user account was created.')
     else:
-        return mk_resp(data=False, status_message='The user account was not created. Something seems to have gone wrong on insert.')
+        return mk_resp(data=False, status_code=400, response=response, status_message='The result from trying to create a user account was unexpected.')
+# ### END ### API User ### post_user_obj_new() ###
 
 
 @router.patch('/change_password/{user_id}', response_model=Resp_Body_Base)