Skip to content

Commit 23a23bb

Browse files
authored
feat: add logging configuration (#97)
* feat: makes characters searchable in admin view * misc: adds quotes to character name in admin view for improved readability * feat: adds logging configuration * fix: fixes unit test file name so it is discovered by test suit * chore: delete unused file
1 parent bb66a17 commit 23a23bb

File tree

5 files changed

+65
-1
lines changed

5 files changed

+65
-1
lines changed

src/central_command/settings.py

Lines changed: 52 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
"""
1212

1313
import os
14+
import sys
1415

1516
from datetime import timedelta
1617
from pathlib import Path
@@ -86,6 +87,57 @@
8687
},
8788
]
8889

90+
LOGGING = {
91+
"version": 1,
92+
"disable_existing_loggers": False,
93+
"formatters": {
94+
"standard": {
95+
"format": "[%(asctime)s] %(levelname)s %(name)s: %(message)s",
96+
},
97+
},
98+
"handlers": {
99+
"console": {
100+
"level": "DEBUG",
101+
"class": "logging.StreamHandler",
102+
"formatter": "standard",
103+
"stream": sys.stdout,
104+
}
105+
},
106+
"loggers": {
107+
# root logger
108+
"": {
109+
"handlers": ["console"],
110+
"level": "INFO",
111+
"propagate": True,
112+
},
113+
"django": {
114+
"handlers": ["console"],
115+
"level": "DEBUG",
116+
"propagate": False,
117+
},
118+
"django.db.backends": {
119+
"handlers": ["console"],
120+
"level": "ERROR",
121+
"propagate": False,
122+
},
123+
"django.utils.autoreload": {
124+
"handlers": ["console"],
125+
"level": "WARNING",
126+
"propagate": False,
127+
},
128+
"accounts": {
129+
"handlers": ["console"],
130+
"level": "DEBUG",
131+
"propagate": False,
132+
},
133+
"persistence": {
134+
"handlers": ["console"],
135+
"level": "DEBUG",
136+
"propagate": False,
137+
},
138+
},
139+
}
140+
89141
WSGI_APPLICATION = "central_command.wsgi.application"
90142

91143
# Database

src/persistence/admin.py

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,20 @@
1+
from typing import Tuple
2+
13
from django.contrib import admin
4+
from django.db.models import Q, QuerySet
5+
from django.http import HttpRequest
26

37
from .models import Character
48

59

610
@admin.register(Character)
711
class CharacterAdminView(admin.ModelAdmin):
812
readonly_fields = ("character_name", "last_updated")
13+
list_filter = ("character_sheet_version", "account__unique_identifier")
14+
search_fields = ("data__Name__icontains", "account__unique_identifier__icontains", "account__email__icontains")
15+
16+
def get_search_results(self, request: HttpRequest, queryset: QuerySet, search_term: str) -> Tuple[QuerySet, bool]:
17+
queryset, use_distinct = super().get_search_results(request, queryset, search_term)
18+
19+
queryset |= self.model.objects.filter(Q(data__Name__icontains=search_term))
20+
return queryset, use_distinct

src/persistence/management/commands/create_test_duplicated_characters.py

Whitespace-only changes.

src/persistence/models.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@ class Character(models.Model):
3434
)
3535

3636
def __str__(self):
37-
return f"{self.character_name} by {self.account.unique_identifier}"
37+
return f'"{self.character_name}" by {self.account.unique_identifier}'
3838

3939
@property
4040
def character_name(self) -> str:
File renamed without changes.

0 commit comments

Comments
 (0)