group/models.py

@@ -288,6 +288,7 @@ class GroupPhotoInfo(CreateUpdateMixin):

                         except GroupInfo.DoesNotExist:
              

                             group = None
              

                         porder = get_lensman_order_record(self.photo_id, user_id) if self.photo_from == GroupPhotoInfo.SESSION_GROUP else {}
              

                +        created_at = self.created_at.replace(microsecond=0)
              

                         return {
              

                             'group_id': group and group.group_id,
              

                             'group_name': group and group.group_name,
              
@@ -316,8 +317,8 @@ class GroupPhotoInfo(CreateUpdateMixin):

                             'nomark': self.nomark,
              

                             'origin': self.origin,
              

                             'porder': porder,
              

                -            'created_at': self.created_at.replace(microsecond=0),
              

                -            'origin_expired_stamps': origin_expired_stamps(self.lensman_photo_id, self.user_id)
              

                +            'created_at': created_at,
              

                +            'origin_expired_stamps': origin_expired_stamps(created_at, self.user_id),
              

                         }
              

                 
              

                 
              

group/views.py

@@ -652,7 +652,7 @@ def pai2_home_api(request):

                         'nomark': row[22],
              

                         'origin': row[23],
              

                         'created_at': row[24],
              

                -        'origin_expired_stamps': origin_expired_stamps(row[25], row[15]),
              

                +        'origin_expired_stamps': origin_expired_stamps(row[24], row[15]),
              

                         'thumbup': get_group_photo_thumbup_flag(row[5], user_id),
              

                         'porder': get_lensman_order_record(row[5], user_id) if row[20] == GroupPhotoInfo.SESSION_GROUP else {},
              

                     } for row in rows]
              

utils/time_utils.py

@@ -1,10 +1,12 @@

                 # -*- coding: utf-8 -*-
              

                 
              

                 from django.conf import settings
              

                +from TimeConvert import TimeConvert as tc
              

                 
              

                 
              

                -def origin_expired_stamps(origin_stamps, user_id):
              

                +def origin_expired_stamps(created_at, user_id):
              

                     try:
              

                -        return int(origin_stamps) + settings.LENSMAN_PHOTO_ORIGIN_EXPIRED_MSEL
              

                +        expired_stamps = tc.datetime_to_timestamp(created_at) + settings.LENSMAN_PHOTO_ORIGIN_EXPIRED_MSEL
              

                     except:
              

                -        return 0
              

                +        expired_stamps = 0
              

                +    return expired_stamps