fix(dashboard): resolver metricas reales, endpoints profile y descriptor classmethod v3.6.2
This commit is contained in:
@@ -1,12 +1,12 @@
|
||||
from app import db
|
||||
from datetime import datetime
|
||||
from datetime import datetime, timezone
|
||||
from app.services.crypto_service import CryptoService
|
||||
|
||||
class _hybrid_setting_method:
|
||||
"""Descriptor que resuelve si se invoca sobre la clase SystemSetting o sobre una instancia."""
|
||||
def __init__(self, inst_func, cls_func):
|
||||
self.inst_func = inst_func
|
||||
self.cls_func = cls_func
|
||||
self.inst_func = getattr(inst_func, '__func__', inst_func)
|
||||
self.cls_func = getattr(cls_func, '__func__', cls_func)
|
||||
|
||||
def __get__(self, instance, owner):
|
||||
if instance is None:
|
||||
@@ -28,7 +28,7 @@ class SystemSetting(db.Model):
|
||||
description = db.Column(db.String(255), nullable=True)
|
||||
category = db.Column(db.String(50), default='system', nullable=True)
|
||||
is_encrypted = db.Column(db.Boolean, default=False, nullable=True)
|
||||
updated_at = db.Column(db.DateTime, default=datetime.utcnow, onupdate=datetime.utcnow)
|
||||
updated_at = db.Column(db.DateTime, default=lambda: datetime.now(timezone.utc).replace(tzinfo=None), onupdate=lambda: datetime.now(timezone.utc).replace(tzinfo=None))
|
||||
|
||||
def __init__(self, **kwargs):
|
||||
super().__init__(**kwargs)
|
||||
@@ -54,7 +54,6 @@ class SystemSetting(db.Model):
|
||||
pass
|
||||
return default
|
||||
|
||||
@classmethod
|
||||
def _cls_get_decrypted_value(cls, key, default=None):
|
||||
try:
|
||||
record = cls.query.filter_by(key=key).first()
|
||||
@@ -79,7 +78,6 @@ class SystemSetting(db.Model):
|
||||
pass
|
||||
return default
|
||||
|
||||
@classmethod
|
||||
def _cls_get_masked_value(cls, key, default=''):
|
||||
try:
|
||||
record = cls.query.filter_by(key=key).first()
|
||||
@@ -122,7 +120,7 @@ class SystemSetting(db.Model):
|
||||
if category:
|
||||
record.category = category
|
||||
record.is_encrypted = is_encrypted
|
||||
record.updated_at = datetime.utcnow()
|
||||
record.updated_at = datetime.now(timezone.utc).replace(tzinfo=None)
|
||||
db.session.commit()
|
||||
return record
|
||||
|
||||
|
||||
Reference in New Issue
Block a user