11596147310

Committed 30 Oct 2024 03:12PM UTC coverage: 99.713% (-0.1%) from 99.811%

Build # 11596147310

Build Type

Pull #1

github

Committed by

web-flow

Commit Message

Merge 447d49fb5 into b711f7b2e

Pull Request Pull Request #1: fix: 修复关于时区的格式化处理

Run Details

245 of 246 branches covered (99.59%)

Branch coverage included in aggregate %.

14 of 15 new or added lines in 3 files covered. (93.33%)

797 of 799 relevant lines covered (99.75%)

1.0 hits per line

Source File
Press 'n' to go to next uncovered line, 'b' for previous

93.94

/django_tree_perm/models/utils.py

#!/usr/bin/env python
# coding=utf-8
import datetime

from django_tree_perm import settings
from django.db import models
from django.utils import timezone
from django.contrib.auth.models import AbstractUser
from django.forms.models import model_to_dict

from django.contrib.auth import get_user_model


User = get_user_model()


def format_datetime_field(time_field: models.DateTimeField) -> str:
    if settings.USE_TZ:
        aware_datetime = time_field
    else:
        aware_datetime = timezone.make_aware(time_field)
    local_datetime = timezone.localtime(aware_datetime)
    return local_datetime.strftime(settings.TREE_DATETIME_FORMAT)


def format_dict_to_json(data: dict) -> None:
    for k, v in data.items():
        if isinstance(v, (int, float, bool, str)):
            continue
        if isinstance(v, datetime.datetime):
            data[k] = format_datetime_field(v)
        else:
            data[k] = str(v)


def user_to_json(user: AbstractUser) -> dict:
    """user对象转换成json数据"""
    data = model_to_dict(
        user,
        exclude=["groups", "user_permissions", "password", "last_login", "date_joined"],
    )
    format_dict_to_json(data)
    return data

1	#!/usr/bin/env python
2	# coding=utf-8
3	import datetime	1✔
4
5	from django_tree_perm import settings	1✔
6	from django.db import models	1✔
7	from django.utils import timezone	1✔
8	from django.contrib.auth.models import AbstractUser	1✔
9	from django.forms.models import model_to_dict	1✔
10
11	from django.contrib.auth import get_user_model	1✔
12
13
14	User = get_user_model()	1✔
15
16
17	def format_datetime_field(time_field: models.DateTimeField) -> str:	1✔
18	if settings.USE_TZ:	1!
19	aware_datetime = time_field	1✔
20	else:
NEW 21	aware_datetime = timezone.make_aware(time_field)	×
22	local_datetime = timezone.localtime(aware_datetime)	1✔
23	return local_datetime.strftime(settings.TREE_DATETIME_FORMAT)	1✔
24
25
26	def format_dict_to_json(data: dict) -> None:	1✔
27	for k, v in data.items():	1✔
28	if isinstance(v, (int, float, bool, str)):	1✔
29	continue	1✔
30	if isinstance(v, datetime.datetime):	1✔
31	data[k] = format_datetime_field(v)	1✔
32	else:
33	data[k] = str(v)	1✔
34
35
36	def user_to_json(user: AbstractUser) -> dict:	1✔
37	"""user对象转换成json数据"""
38	data = model_to_dict(	1✔
39	user,
40	exclude=["groups", "user_permissions", "password", "last_login", "date_joined"],
41	)
42	format_dict_to_json(data)	1✔
43	return data	1✔

SkylerHu / django-tree-perm / 11596147310

Source File Press 'n' to go to next uncovered line, 'b' for previous

Source File
Press 'n' to go to next uncovered line, 'b' for previous