Added logging for client viewing

This commit is contained in:
Scott Idem
2021-07-02 12:11:12 -04:00
parent a56804cee6
commit a494a9ca68
5 changed files with 217 additions and 2 deletions

View File

@@ -48,6 +48,7 @@ base_fields['fundraising_cfg_id_random'] = xxx_id_random_field_schema
base_fields['hosted_file_id_random'] = xxx_id_random_field_schema
base_fields['journal_id_random'] = xxx_id_random_field_schema
base_fields['journal_entry_id_random'] = xxx_id_random_field_schema
base_fields['log_client_viewing_id_random'] = xxx_id_random_field_schema
# base_fields['membership_id_random'] = xxx_id_random_field_schema # renamed to membership_type
base_fields['membership_cfg_id_random'] = xxx_id_random_field_schema
base_fields['membership_group_id_random'] = xxx_id_random_field_schema

View File

@@ -0,0 +1,140 @@
from __future__ import annotations
import datetime, hashlib, logging, os, pytz, redis, secrets
from typing import Dict, List, Optional, Set, Union
from pydantic import BaseModel, EmailStr, Field, Json, PrivateAttr, ValidationError, validator
from app.db_sql import redis_lookup_id_random
from app.lib_general import log, logging
from app.models.common_field_schema import base_fields, default_num_bytes
class Log_Client_Viewing_Base(BaseModel):
log.setLevel(logging.DEBUG) # DEBUG, INFO, WARNING, ERROR, EXCEPTION, CRITICAL
log.debug(locals())
id_random: Optional[str] = Field(
**base_fields['log_client_viewing_id_random'],
alias = 'log_client_viewing_id_random',
default_factory = lambda:secrets.token_urlsafe(default_num_bytes),
)
id: Optional[int] = Field(
alias = 'log_client_viewing_id'
)
account_id_random: Optional[str]
account_id: Optional[int]
person_id_random: Optional[str]
person_id: Optional[int]
user_id_random: Optional[str]
user_id: Optional[int]
external_client_id: Optional[str]
google_ga: Optional[str]
google_gid: Optional[str]
name: Optional[str]
given_name: Optional[str]
family_name: Optional[str]
middle_name: Optional[str]
prefix: Optional[str]
suffix: Optional[str]
full_name: Optional[str]
informal_name: Optional[str]
source: Optional[str]
url_root: Optional[str]
url_full_path: Optional[str]
url_params: Optional[str]
object_type: Optional[str]
object_id: Optional[str]
# For now just using string instead of Json Pydantic data type
client_app_json: Optional[str] # When getting the dict version for SQL this should be a string.
page_load_on: Optional[datetime.datetime]
authenticated_on: Optional[datetime.datetime]
play_start_on: Optional[datetime.datetime]
play_start_on_first: Optional[datetime.datetime]
play_start_on_last: Optional[datetime.datetime]
play_start_count: Optional[int]
play_pause_on: Optional[datetime.datetime]
play_pause_on_first: Optional[datetime.datetime]
play_pause_on_last: Optional[datetime.datetime]
play_pause_count: Optional[int]
play_volume_on: Optional[datetime.datetime]
play_muted_on: Optional[datetime.datetime]
play_seeked_on: Optional[datetime.datetime]
play_seeked_on_first: Optional[datetime.datetime]
play_seeked_on_last: Optional[datetime.datetime]
play_seeked_count: Optional[int]
play_ended_on: Optional[datetime.datetime]
play_unload_on: Optional[datetime.datetime]
last_ping: Optional[datetime.datetime]
# notes: Optional[str]
created_on: Optional[datetime.datetime] = None
updated_on: Optional[datetime.datetime] = None
_processed_at: datetime.datetime = PrivateAttr(default_factory=datetime.datetime.now)
#@validator('log_client_viewing_id_random', always=True)
def log_client_viewing_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 log_client_viewing_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values.get('id_random', None): # 'id_random' in values and values['id_random']:
log.debug(values['id_random'])
return redis_lookup_id_random(record_id_random=values['id_random'], table_name='log_client_viewing')
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('person_id', always=True)
def person_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values.get('person_id_random', None):
return redis_lookup_id_random(record_id_random=values['person_id_random'], table_name='person')
return None
@validator('user_id', always=True)
def user_id_lookup(cls, v, values, **kwargs):
log.setLevel(logging.WARNING)
log.debug(locals())
if values['user_id_random']:
return redis_lookup_id_random(record_id_random=values['user_id_random'], table_name='user')
return None
class Config:
underscore_attrs_are_private = True
allow_population_by_field_name = True
fields = base_fields