Improving client viewing log

app/routers/log_client_viewing.py

@@ -9,7 +9,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.log_client_viewing_methods import get_log_client_viewing_rec_list, load_log_client_viewing_obj
+from app.methods.log_client_viewing_methods import get_log_client_viewing_rec_list, load_log_client_viewing_obj
 
 from app.models.log_client_viewing_models import Log_Client_Viewing_Base
 from app.models.response_models import Resp_Body_Base, mk_resp
@@ -18,7 +18,7 @@ from app.models.response_models import Resp_Body_Base, mk_resp
 router = APIRouter()
 
 
-@router.post('', response_model=Resp_Body_Base)
+@router.post('/log/client_viewing', response_model=Resp_Body_Base)
 async def post_log_client_viewing_obj(
         obj: Log_Client_Viewing_Base,
         x_account_id: str = Header(...),
@@ -41,7 +41,7 @@ async def post_log_client_viewing_obj(
     return result
 
 
-@router.patch('/{obj_id}', response_model=Resp_Body_Base)
+@router.patch('/log/client_viewing/{obj_id}', response_model=Resp_Body_Base)
 async def patch_log_client_viewing_obj(
         obj: Log_Client_Viewing_Base,
         obj_id: str = Query(..., min_length=1, max_length=22),
@@ -66,3 +66,66 @@ async def patch_log_client_viewing_obj(
         exclude_unset=True,
         )
     return result
+
+
+# ### BEGIN ### API Log Client Viewing Methods ### get_account_log_client_viewing_obj_li() ###
+# Updated 2021-07-01
+@router.get('/account/{account_id}/log/client_viewing/list', response_model=Resp_Body_Base)
+async def get_account_log_client_viewing_obj_li(
+        account_id: str = Query(..., min_length=1, max_length=22),
+        enabled: str = 'enabled',
+        limit: int = 1000,
+        from_datetime: datetime.datetime = None,
+        to_datetime: datetime.datetime = None,
+        x_account_id: str = Header(...),
+        by_alias: Optional[bool] = True,
+        exclude_unset: Optional[bool] = True,
+        ):
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
+    else: return mk_resp(data=None, status_code=404)
+
+    # Updated 2021-07-02
+    if log_client_viewing_rec_list_result := get_log_client_viewing_rec_list(
+            account_id = account_id,
+            from_datetime = from_datetime,
+            to_datetime = to_datetime,
+            limit = limit,
+            enabled = enabled,
+            ):
+        log_client_viewing_result_list = []
+        for log_client_viewing_rec in log_client_viewing_rec_list_result:
+            if load_log_client_viewing_result := load_log_client_viewing_obj(
+                    log_client_viewing_id = log_client_viewing_rec.get('log_client_viewing_id', None),
+                    limit = limit,
+                    by_alias = by_alias,
+                    exclude_unset = exclude_unset,
+                    # model_as_dict = model_as_dict,
+                    ):
+                log_client_viewing_result_list.append(load_log_client_viewing_result)
+            else:
+                log_client_viewing_result_list.append(None)
+        response_data = log_client_viewing_result_list
+    else:
+        return mk_resp(data=False, status_code=400) # Bad Request
+
+    return mk_resp(data=response_data)
+# ### END ### API Log Client Viewing Methods ### get_account_log_client_viewing_obj_li() ###
+
+
+@router.delete('/log/client_viewing/{log_client_viewing_obj_id}', response_model=Resp_Body_Base)
+async def delete_log_client_viewing_obj(
+        log_client_viewing_obj_id: str = Query(..., min_length=1, max_length=22),
+        x_account_id: str = Header(...),
+        ):
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    obj_type = 'log_client_viewing'
+    result = delete_obj_template(
+        obj_type=obj_type,
+        obj_id=log_client_viewing_obj_id,
+        )
+    return result

app/routers/membership_group.py

@@ -117,7 +117,6 @@ async def get_account_membership_group_obj_li(
     if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
     else: return mk_resp(data=None, status_code=404)
 
-
     # Updated 2021-07-01
     if membership_group_rec_list_result := get_membership_group_rec_list(
             account_id = account_id,
@@ -152,7 +151,7 @@ async def get_account_membership_group_obj_li(
         return mk_resp(data=False, status_code=400) # Bad Request
 
     return mk_resp(data=response_data)
-# ### BEGIN ### API Membership Group Methods ### get_account_membership_group_obj_li() ###
+# ### END ### API Membership Group Methods ### get_account_membership_group_obj_li() ###
 
 
 # Look up is only for account, person, or user records

app/routers/membership_type.py

@@ -117,7 +117,6 @@ async def get_account_membership_type_obj_li(
     if account_id := redis_lookup_id_random(record_id_random=account_id, table_name='account'): pass
     else: return mk_resp(data=None, status_code=404)
 
-
     # Updated 2021-07-01
     if membership_type_rec_list_result := get_membership_type_rec_list(
             account_id = account_id,