Working on user module

app/models/response_model.py

@@ -48,7 +48,10 @@ def mk_resp(
     resp_body['meta'] = {}
     resp_body['meta']['details'] = details
     resp_body['meta']['status_code'] = status_code
-    resp_body['meta']['status_message'] = settings.HTTP_STATUS_LI[status_code]['message']
+    if status_message:
+        resp_body['meta']['status_message'] = status_message
+    else:
+        resp_body['meta']['status_message'] = settings.HTTP_STATUS_LI[status_code]['message']
     resp_body['meta']['status_name'] = settings.HTTP_STATUS_LI[status_code]['name']
     resp_body['meta']['success'] = success
 

app/models/user_methods.py

@@ -0,0 +1,49 @@
+from __future__ import annotations
+import datetime
+
+from typing import Dict, List, Optional, Set, Union
+from pydantic import BaseModel, EmailStr, Field, PrivateAttr, ValidationError, validator
+
+from ..lib_general import *
+from ..db_sql import sql_select
+
+from .user_model import User_Base, User_Out_Base, User_New_Base
+
+
+# ### BEGIN ### API User Methods ### load_user_obj() ###
+def load_user_obj(user_id:int|str, inc_contact:bool=False, inc_organization:bool=False, inc_person:bool=False) -> User_Base:
+    log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    if user_id := redis_lookup_id_random(record_id_random=user_id, table_name='user'): pass
+    else: return False
+
+    if user_rec := sql_select(table_name='v_user', record_id=user_id):
+        #log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+        log.debug(user_rec)
+
+        if inc_contact:
+            if contact_rec := sql_select(table_name='v_contact', field_name='contact_id', field_value=user_rec.get('contact_id', None)):
+                user_rec['contact'] = contact_rec
+
+        if inc_organization:
+            if organization_rec := sql_select(table_name='v_organization', field_name='organization_id', field_value=user_rec.get('organization_id', None)):
+                user_rec['organization'] = organization_rec
+
+        if inc_person:
+            if person_rec := sql_select(table_name='v_person', field_name='person_id', field_value=user_rec.get('person_id', None)):
+                user_rec['person'] = person_rec
+
+        log.debug(user_rec)
+    else:
+        return False
+
+    try:
+        user_obj = User_Out_Base(**user_rec)
+        log.debug(user_obj)
+    except ValidationError as e:
+        log.error(e.json())
+        return False
+
+    return user_obj
+# ### END ### API User Methods ### load_user_obj() ###

app/models/user_model.py

@@ -13,6 +13,142 @@ from .contact_model import Contact_Base
 #from .person_model import Person_Base
 
 
+class User_New_Base(BaseModel):
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    id_random: Optional[str] = Field(
+        **base_fields['user_id_random'],
+        alias='user_id_random',
+        default_factory=lambda:secrets.token_urlsafe(default_num_bytes),
+    )
+    id: Optional[int] = Field(
+        #alias='user_id'
+    )
+    account_id_random: str
+    account_id: Optional[int]
+
+    username: str
+    name: str
+    email: str
+    new_password: str
+    password: Optional[str]
+
+    enable: Optional[bool] = False
+    enable_from: Optional[datetime.datetime]
+    enable_to: Optional[datetime.datetime] = datetime.datetime.now(datetime.timezone.utc) + datetime.timedelta(days=365)
+
+    #super: Optional[bool] = False
+    #manager: Optional[bool] = False
+    administrator: Optional[bool] = False
+    public: Optional[bool] = False
+    verified: Optional[bool] = False
+
+    notes: Optional[str]
+
+    _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
+
+    #@validator('user_id_random', always=True)
+    def user_id_random_copy(cls, v, values, **kwargs):
+        log.setLevel(logging.WARNING)
+        log.debug(locals())
+
+        if values['id_random']:
+            return values['id_random']
+        return None
+
+    @validator('id', always=True)
+    def user_id_lookup(cls, v, values, **kwargs):
+        log.setLevel(logging.WARNING)
+        log.debug(locals())
+
+        if values['id_random']:
+            log.debug(values['id_random'])
+            return redis_lookup_id_random(record_id_random=values['id_random'], table_name='user')
+        return None
+
+    @validator('account_id', always=True)
+    def account_id_lookup(cls, v, values, **kwargs):
+        log.setLevel(logging.WARNING)
+        log.debug(locals())
+
+        if values['account_id_random']:
+            return redis_lookup_id_random(record_id_random=values['account_id_random'], table_name='account')
+        return None
+
+    @validator('password', always=True)
+    def hash_new_password(cls, v, values, **kwargs):
+        log.setLevel(logging.WARNING)
+        log.debug(locals())
+
+        if values['new_password']:
+            return secure_hash_string(string=values['new_password'])
+        return None
+
+    class Config:
+        underscore_attrs_are_private = True
+        fields = base_fields
+
+
+class User_Out_Base(BaseModel):
+    log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
+    log.debug(locals())
+
+    id_random: Optional[str] = Field(
+        **base_fields['user_id_random'],
+        alias='user_id_random',
+    )
+    account_id_random: Optional[str]
+    #account_id: Optional[int]
+    contact_id_random: Optional[str]
+    #contact_id: Optional[int]
+    organization_id_random: Optional[str]
+    #organization_id: Optional[int]
+    person_id_random: Optional[str]
+    #person_id: Optional[int]
+
+    username: Optional[str]
+    name: Optional[str]
+    email: Optional[str]
+    email_verified: Optional[bool]
+    password: Optional[str]
+    auth_key: Optional[str]
+
+    enable: Optional[bool]
+    enable_from: Optional[datetime.datetime]
+    enable_to: Optional[datetime.datetime]
+
+    super: Optional[bool]
+    manager: Optional[bool]
+    administrator: Optional[bool]
+    public: Optional[bool]
+    verified: Optional[bool]
+    status_id: Optional[int]
+    status_name: Optional[str]
+
+    password_set_on: Optional[datetime.datetime]
+    password_reset_token: Optional[str]
+    password_reset_expire_on: Optional[datetime.datetime]
+    logged_in_on: Optional[datetime.datetime]
+    last_activity_on: Optional[datetime.datetime]
+
+    #account: Optional[Account_Base]# = Account_Base()
+    #contact: Optional[Contact_Base]# = Contact_Base()
+    #organization: Optional[Organization_Base]# = Organization_Base()
+    #person: Optional[Person_Base]# = Person_Base()
+
+    notes: Optional[str]
+    created_on: Optional[datetime.datetime]
+    updated_on: Optional[datetime.datetime]
+
+    _processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
+
+    class Config:
+        underscore_attrs_are_private = True
+        fields = base_fields
+
+
+
 class User_Base(BaseModel):
     log.setLevel(logging.WARNING) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
     log.debug(locals())