Commit c1b04946bbb007d64ae6d1d0321805ff0d0f0d87
1 parent
6ddcd431
Exists in
master
and in
2 other branches
Some adjusts in chat api
Showing
2 changed files
with
15 additions
and
2 deletions
Show diff stats
chat/models.py
1 | import os | 1 | import os |
2 | import time | 2 | import time |
3 | +from os import path | ||
3 | from django.db import models | 4 | from django.db import models |
4 | from django.core import validators | 5 | from django.core import validators |
5 | from django.core.exceptions import ValidationError | 6 | from django.core.exceptions import ValidationError |
6 | from django.utils.translation import ugettext_lazy as _ | 7 | from django.utils.translation import ugettext_lazy as _ |
7 | 8 | ||
9 | +from datetime import timezone | ||
10 | + | ||
8 | from subjects.models import Subject | 11 | from subjects.models import Subject |
9 | from users.models import User | 12 | from users.models import User |
10 | 13 | ||
@@ -33,6 +36,17 @@ class TalkMessages(models.Model): | @@ -33,6 +36,17 @@ class TalkMessages(models.Model): | ||
33 | subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name = 'message_subject', null = True) | 36 | subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name = 'message_subject', null = True) |
34 | create_date = models.DateTimeField(_('Create Date'), auto_now_add = True) | 37 | create_date = models.DateTimeField(_('Create Date'), auto_now_add = True) |
35 | 38 | ||
39 | + def get_timestamp(self): | ||
40 | + return str(self.create_date.replace(tzinfo = timezone.utc).timestamp()) | ||
41 | + | ||
42 | + @property | ||
43 | + def image_url(self): | ||
44 | + if self.image and hasattr(self.image, 'url'): | ||
45 | + if path.exists(self.image.path): | ||
46 | + return self.image.url | ||
47 | + | ||
48 | + return "" | ||
49 | + | ||
36 | class ChatVisualizations(models.Model): | 50 | class ChatVisualizations(models.Model): |
37 | viewed = models.BooleanField(_('Viewed'), default = False) | 51 | viewed = models.BooleanField(_('Viewed'), default = False) |
38 | message = models.ForeignKey(TalkMessages, verbose_name = _('Message'), related_name = 'chat_visualization_message', null = True) | 52 | message = models.ForeignKey(TalkMessages, verbose_name = _('Message'), related_name = 'chat_visualization_message', null = True) |
chat/serializers.py
@@ -8,8 +8,7 @@ from users.serializers import UserSerializer | @@ -8,8 +8,7 @@ from users.serializers import UserSerializer | ||
8 | class ChatSerializer(serializers.ModelSerializer): | 8 | class ChatSerializer(serializers.ModelSerializer): |
9 | user = UserSerializer() | 9 | user = UserSerializer() |
10 | subject = SubjectSerializer() | 10 | subject = SubjectSerializer() |
11 | - image = serializers.CharField(required = False, allow_blank = True, max_length = 255) | ||
12 | 11 | ||
13 | class Meta: | 12 | class Meta: |
14 | model = TalkMessages | 13 | model = TalkMessages |
15 | - exclude = ["talk"] | ||
16 | \ No newline at end of file | 14 | \ No newline at end of file |
15 | + fields = ('text', 'user', 'subject', 'image_url', 'create_date', ) |