From c1b04946bbb007d64ae6d1d0321805ff0d0f0d87 Mon Sep 17 00:00:00 2001 From: Zambom Date: Sat, 22 Jul 2017 16:12:49 -0300 Subject: [PATCH] Some adjusts in chat api --- chat/models.py | 14 ++++++++++++++ chat/serializers.py | 3 +-- 2 files changed, 15 insertions(+), 2 deletions(-) diff --git a/chat/models.py b/chat/models.py index 3ac8da0..8c5a05d 100644 --- a/chat/models.py +++ b/chat/models.py @@ -1,10 +1,13 @@ import os import time +from os import path from django.db import models from django.core import validators from django.core.exceptions import ValidationError from django.utils.translation import ugettext_lazy as _ +from datetime import timezone + from subjects.models import Subject from users.models import User @@ -33,6 +36,17 @@ class TalkMessages(models.Model): subject = models.ForeignKey(Subject, verbose_name = _('Subject'), related_name = 'message_subject', null = True) create_date = models.DateTimeField(_('Create Date'), auto_now_add = True) + def get_timestamp(self): + return str(self.create_date.replace(tzinfo = timezone.utc).timestamp()) + + @property + def image_url(self): + if self.image and hasattr(self.image, 'url'): + if path.exists(self.image.path): + return self.image.url + + return "" + class ChatVisualizations(models.Model): viewed = models.BooleanField(_('Viewed'), default = False) message = models.ForeignKey(TalkMessages, verbose_name = _('Message'), related_name = 'chat_visualization_message', null = True) diff --git a/chat/serializers.py b/chat/serializers.py index 9f2cec1..934ccc2 100644 --- a/chat/serializers.py +++ b/chat/serializers.py @@ -8,8 +8,7 @@ from users.serializers import UserSerializer class ChatSerializer(serializers.ModelSerializer): user = UserSerializer() subject = SubjectSerializer() - image = serializers.CharField(required = False, allow_blank = True, max_length = 255) class Meta: model = TalkMessages - exclude = ["talk"] \ No newline at end of file + fields = ('text', 'user', 'subject', 'image_url', 'create_date', ) -- libgit2 0.21.2