+ group_photo = GroupPhotoInfo.objects.filter(group_id=group_id).last()
|
|
|
141
|
+ if not GroupUserInfo.objects.filter(
|
|
|
142
|
+ group_id=group_id,
|
|
|
143
|
+ user_id=user_id
|
|
|
144
|
+ ).exists():
|
|
|
145
|
+ GroupUserInfo.objects.create(
|
|
|
146
|
+ group_id=group_id,
|
|
|
147
|
+ user_id=user_id,
|
|
|
148
|
+ current_id=group_photo and group_photo.id or -1,
|
|
|
149
|
+ nickname=user.username,
|
|
|
150
|
+ admin=False,
|
|
|
151
|
+ user_status=GroupUserInfo.PASSED,
|
|
|
152
|
+ passed_at=tc.utc_datetime(),
|
|
|
153
|
+ )
|
|
|
154
|
+ except GroupInfo.DoesNotExist:
|
|
|
155
|
+ group_id = CurtailUUID.uuid(GroupInfo, 'group_id')
|
|
|
156
|
+ group = GroupInfo.objects.create(
|
|
|
157
|
+ group_id=group_id,
|
|
|
158
|
+ admin_id=user_id,
|
|
|
159
|
+ group_from=GroupInfo.SESSION_GROUP,
|
|
|
160
|
+ session_id=session,
|
|
|
161
|
+ )
|
|
|
162
|
+ GroupUserInfo.objects.create(
|
|
|
163
|
+ group_id=group_id,
|
|
|
164
|
+ user_id=user_id,
|
|
|
165
|
+ nickname=user.username,
|
|
|
166
|
+ admin=True,
|
|
|
167
|
+ user_status=GroupUserInfo.PASSED,
|
|
|
168
|
+ passed_at=tc.utc_datetime(),
|
|
|
169
|
+ )
|
|
|
170
|
+
|
|
120
|
171
|
photos = PhotosInfo.objects.filter(session_id=session)
|
|
121
|
172
|
return JsonResponse({
|
|
122
|
173
|
'status': 200,
|
|
|
|
@@ -124,6 +175,10 @@ def session_detail_api(request, session):
|
|
124
|
175
|
'data': {
|
|
125
|
176
|
'count': photos.count(),
|
|
126
|
177
|
'photos': [p.detail for p in photos],
|
|
|
178
|
+ 'group_id': group_id,
|
|
|
179
|
+ 'group': group.data,
|
|
|
180
|
+ 'user_id': user_id,
|
|
|
181
|
+ 'users': group.users(user_id),
|
|
127
|
182
|
}
|
|
128
|
183
|
})
|
|
129
|
184
|
|
|
|
|
@@ -1,4 +1,4 @@
|
|
1
|
|
-CodeConvert==2.0.3
|
|
|
1
|
+CodeConvert==2.0.4
|
|
2
|
2
|
Django==1.8.4
|
|
3
|
3
|
MySQL-python==1.2.5
|
|
4
|
4
|
TimeConvert==1.1.6
|