phzhik/gault-millau
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

indexing working time

Browse Source
This commit is contained in:
Kuroshini 2019-12-20 22:28:57 +03:00
parent d97972a3ef
commit 1247b4c577
2 changed files with 11 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
apps/search_indexes/documents/establishment.py
View File

@ -143,8 +143,8 @@ class EstablishmentDocument(Document):
'weekday_display': fields.KeywordField(attr='get_weekday_display'), 'weekday_display': fields.KeywordField(attr='get_weekday_display'),
'closed_at': fields.KeywordField(attr='closed_at_str'), 'closed_at': fields.KeywordField(attr='closed_at_str'),
'opening_at': fields.KeywordField(attr='opening_at_str'), 'opening_at': fields.KeywordField(attr='opening_at_str'),
# 'closed_at_datetime': fields.DateField(attr='closed_at'), 'closed_at_indexing': fields.DateField(),
# 'opening_at_datetime': fields.DateField(attr='opening_at'), 'opening_at_indexing': fields.DateField(),
} }
)) ))
address = fields.ObjectField( address = fields.ObjectField(

10
apps/timetable/models.py
View File

@ -1,6 +1,6 @@
from django.db import models from django.db import models
from django.utils.translation import gettext_lazy as _ from django.utils.translation import gettext_lazy as _
from datetime import time from datetime import time, datetime
from utils.models import ProjectBaseMixin from utils.models import ProjectBaseMixin
@ -59,6 +59,14 @@ class Timetable(ProjectBaseMixin):
def opening_at_str(self): def opening_at_str(self):
return str(self.opening_at) if self.opening_at else None return str(self.opening_at) if self.opening_at else None
@property
def closed_at_indexing(self):
return datetime.combine(time=self.closed_at, date=datetime(1970, 1, 1 + self.weekday).date()) if self.closed_at else None
@property
def opening_at_indexing(self):
return datetime.combine(time=self.opening_at, date=datetime(1970, 1, 1 + self.weekday).date()) if self.opening_at else None
@property @property
def opening_time(self): def opening_time(self):
return self.opening_at or self.lunch_start or self.dinner_start return self.opening_at or self.lunch_start or self.dinner_start