Separate flyimg_list_api from flyimg_upload_api
Brightcells
共有 2 个文件被更改，包括 23 次插入 和 7 次删除
+ 1
- 1
api/urls.py
@@ -103,7 +103,7 @@ urlpatterns += [ |
||
| 103 | 103 |
# 飞图相关 |
| 104 | 104 |
urlpatterns += [ |
| 105 | 105 |
url(r'^f/upload$', group_views.flyimg_upload_api, name='flyimg_upload_api'), # 飞图上传 |
| 106 |
- url(r'^f/list$', group_views.flyimg_upload_api, name='flyimg_list_api'), # 飞图列表 |
|
| 106 |
+ url(r'^f/list$', group_views.flyimg_list_api, name='flyimg_list_api'), # 飞图列表 |
|
| 107 | 107 |
url(r'^f/detail$', group_views.flyimg_detail_api, name='flyimg_detail_api'), # 飞图详情 |
| 108 | 108 |
url(r'^f/comment/submit$', group_views.comment_submit_api, name='comment_submit_api'), # 飞图评论提交 |
| 109 | 109 |
url(r'^f/comment/list$', group_views.comment_submit_api, name='comment_list_api'), # 飞图评论列表 |
+ 22
- 6
group/views.py
@@ -2,8 +2,6 @@ |
||
| 2 | 2 |
|
| 3 | 3 |
from __future__ import division |
| 4 | 4 |
|
| 5 |
-import random |
|
| 6 |
- |
|
| 7 | 5 |
from curtail_uuid import CurtailUUID |
| 8 | 6 |
from django.conf import settings |
| 9 | 7 |
from django.db import connection, transaction |
@@ -257,9 +255,9 @@ def group_data_api(request): |
||
| 257 | 255 |
}) |
| 258 | 256 |
|
| 259 | 257 |
|
| 260 |
-@logit |
|
| 258 |
+@logit(body=settings.LOGIT_BODY_FLAG, res=settings.LOGIT_RES_FLAG) |
|
| 261 | 259 |
def flyimg_upload_api(request): |
| 262 |
- """ 飞图上传／飞图列表 """ |
|
| 260 |
+ """ 飞图上传 """ |
|
| 263 | 261 |
group_id = request.POST.get('group_id', '')
|
| 264 | 262 |
user_id = request.POST.get('user_id', '')
|
| 265 | 263 |
nickname = request.POST.get('nickname', '')
|
@@ -310,12 +308,30 @@ def flyimg_upload_api(request): |
||
| 310 | 308 |
# Redis 群组数据缓存 |
| 311 | 309 |
set_group_info_by_id(group_id) |
| 312 | 310 |
|
| 313 |
- curinfo = get_current_photos(group_id, user_id, group_user.current_id, request=request) |
|
| 311 |
+ curinfo = get_current_photos(group_id, user_id, max(current_id, group_user.current_id), request=request) |
|
| 314 | 312 |
|
| 315 | 313 |
return response(200, 'Flyimg Upload Success', u'飞图上传成功', curinfo) |
| 316 | 314 |
|
| 317 | 315 |
|
| 318 | 316 |
@logit |
| 317 |
+def flyimg_list_api(request): |
|
| 318 |
+ """ 飞图列表 """ |
|
| 319 |
+ group_id = request.POST.get('group_id', '')
|
|
| 320 |
+ user_id = request.POST.get('user_id', '')
|
|
| 321 |
+ current_id = int(request.POST.get('current_id', -1))
|
|
| 322 |
+ |
|
| 323 |
+ # 群组用户校验 |
|
| 324 |
+ try: |
|
| 325 |
+ group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.PASSED) |
|
| 326 |
+ except GroupUserInfo.DoesNotExist: |
|
| 327 |
+ return response(GroupUserStatusCode.GROUP_USER_NOT_FOUND) |
|
| 328 |
+ |
|
| 329 |
+ curinfo = get_current_photos(group_id, user_id, max(current_id, group_user.current_id), request=request) |
|
| 330 |
+ |
|
| 331 |
+ return response(200, 'Get Flyimg List Success', u'获取飞图上传成功', curinfo) |
|
| 332 |
+ |
|
| 333 |
+ |
|
| 334 |
+@logit |
|
| 319 | 335 |
def flyimg_detail_api(request): |
| 320 | 336 |
user_id = request.POST.get('user_id', '')
|
| 321 | 337 |
photo_id = request.POST.get('photo_id', '')
|
@@ -326,7 +342,7 @@ def flyimg_detail_api(request): |
||
| 326 | 342 |
except GroupPhotoInfo.DoesNotExist: |
| 327 | 343 |
return response(GroupPhotoStatusCode.GROUP_PHOTO_NOT_FOUND) |
| 328 | 344 |
|
| 329 |
- return response(200, 'Flyimg Detail Success', u'飞图详情成功', {
|
|
| 345 |
+ return response(200, 'Get Flyimg Detail Success', u'获取飞图详情成功', {
|
|
| 330 | 346 |
'photo_info': group_photo.photo_info(user_id), |
| 331 | 347 |
'comments': get_group_photo_comment_list(photo_id), |
| 332 | 348 |
'thumbup': get_group_photo_thumbup_flag(photo_id, user_id), # user_id 是否点赞 photo_id |