Added page routes and related methods and updated model. Also general clean up.

app/routers/page.py

@@ -4,15 +4,16 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Resp
 from pydantic import BaseModel, EmailStr, Field
 from typing import Dict, List, Optional, Set, Union
 
-from app.lib_general import *
-from ..log import *
+from app.lib_general import log, logging
 from app.config import settings
-from app.db_sql import *
+from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
 
-from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
+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.page_methods import get_page_rec_w_alias, load_page_obj
 
 from app.models.page_models import Page_Base
-from app.models.response_models import *
+from app.models.response_models import Resp_Body_Base, mk_resp
 
 
 router = APIRouter()
@@ -93,6 +94,48 @@ async def get_page_obj_li(
     return result
 
 
+# ### BEGIN ### API Page ### get_page_obj_alias() ###
+# Updated 2021-08-20
+@router.get('/alias/{alias}', response_model=Resp_Body_Base)
+async def get_page_obj_alias(
+        account_id: str = Query(..., min_length=1, max_length=22),
+        alias: str = Query(..., min_length=1, max_length=255),
+        enabled: str = 'enabled',
+        x_account_id: str = Header(...),
+        by_alias: Optional[bool] = True,
+        exclude_unset: Optional[bool] = True,
+        response: Response = Response,
+        ):
+    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, response=response)
+
+    data = {}
+    data['account_id'] = account_id
+    data['alias'] = alias
+
+    if page_data := get_page_rec_w_alias(account_id=account_id, alias=alias): pass
+    else: return mk_resp(data=None, status_code=404, response=response)
+    page_id = page_data.get('page_id', None)
+
+    if page_dict := load_page_obj(
+        page_id = page_id,
+        model_as_dict = True, # NOTE: returning model as a dict
+        enabled = enabled,
+        ):
+        if isinstance(page_dict, dict):
+            response_data = page_dict
+        else:
+            response_data = page_dict
+    else:
+        return mk_resp(data=False, status_code=400, response=response) # Bad Request
+
+    return mk_resp(data=response_data)
+# ### END ### API Page ### get_page_obj_alias() ###
+
+
 @router.get('/{obj_id}', response_model=Resp_Body_Base)
 async def get_page_obj(
         obj_id: str = Query(..., min_length=1, max_length=22),

app/routers/site.py

@@ -4,12 +4,11 @@ from fastapi import APIRouter, Body, Depends, Header, HTTPException, Query, Resp
 from pydantic import BaseModel, EmailStr, Field
 from typing import Dict, List, Optional, Set, Union
 
-from app.lib_general import *
-from ..log import *
+from app.lib_general import log, logging
 from app.config import settings
-from app.db_sql import *
+from app.db_sql import sql_insert, sql_update, sql_insert_or_update, sql_select, sql_delete, redis_lookup_id_random
 
-from .api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
+from app.routers.api_crud import delete_obj_template, get_obj_template, get_obj_li_template, patch_obj_template, post_obj_template
 
 from app.models.response_models import *
 from app.models.site_models import Site_Base