Remove unused group_pass_api/group_refuse_api
Brightcells
共有 2 个文件被更改，包括 0 次插入 和 84 次删除
+ 0
- 2
api/urls.py
@@ -66,8 +66,6 @@ urlpatterns += [ |
||
| 66 | 66 |
url(r'^g/join$', groupuser_views.group_join_api, name='group_join_api'), # 成员申请加群 |
| 67 | 67 |
url(r'^g/remove$', groupuser_views.group_remove_api, name='group_remove_api'), # 成员移除, 管理员主动, 群成员被动 |
| 68 | 68 |
url(r'^g/quit$', groupuser_views.group_quit_api, name='group_quit_api'), # 成员退出，群成员主动 |
| 69 |
- # url(r'^g/pass$', groupuser_views.group_pass_api, name='group_pass_api'), # 申请通过 |
|
| 70 |
- # url(r'^g/refuse$', groupuser_views.group_refuse_api, name='group_refuse_api'), # 申请拒绝 |
|
| 71 | 69 |
] |
| 72 | 70 |
|
| 73 | 71 |
# 旅行团相关 |
+ 0
- 82
group/groupuser_views.py
@@ -156,85 +156,3 @@ def group_quit_api(request): |
||
| 156 | 156 |
'group_id': group_id, |
| 157 | 157 |
'users': group_users, |
| 158 | 158 |
}) |
| 159 |
- |
|
| 160 |
- |
|
| 161 |
-@logit |
|
| 162 |
-def group_pass_api(request): |
|
| 163 |
- """ 申请通过 """ |
|
| 164 |
- group_id = request.POST.get('group_id', '')
|
|
| 165 |
- admin_id = request.POST.get('admin_id', '')
|
|
| 166 |
- user_id = request.POST.get('user_id', '')
|
|
| 167 |
- |
|
| 168 |
- # 群组校验 |
|
| 169 |
- try: |
|
| 170 |
- group = GroupInfo.objects.get(group_id=group_id) |
|
| 171 |
- except GroupInfo.DoesNotExist: |
|
| 172 |
- return response(GroupStatusCode.GROUP_NOT_FOUND) |
|
| 173 |
- |
|
| 174 |
- # 权限校验 |
|
| 175 |
- if group.admin_id != admin_id: |
|
| 176 |
- return response(GroupStatusCode.NO_PASS_PERMISSION) |
|
| 177 |
- |
|
| 178 |
- # 群组用户校验 |
|
| 179 |
- try: |
|
| 180 |
- group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.APPLYING) |
|
| 181 |
- except GroupUserInfo.DoesNotExist: |
|
| 182 |
- return response(GroupStatusCode.JOIN_REQUEST_NOT_FOUND) |
|
| 183 |
- |
|
| 184 |
- # 群组用户通过 |
|
| 185 |
- group_user.user_status = GroupUserInfo.PASSED |
|
| 186 |
- group_user.passed_at = tc.utc_datetime() |
|
| 187 |
- group_user.save() |
|
| 188 |
- |
|
| 189 |
- # Redis 群组数据缓存更新 |
|
| 190 |
- group_users = set_group_users_info(group) |
|
| 191 |
- |
|
| 192 |
- # Redis 群组通过集合缓存 |
|
| 193 |
- r.srem(GROUP_USERS_APPLYING_SET % group_id, user_id) |
|
| 194 |
- r.sadd(GROUP_USERS_PASSED_SET % group_id, user_id) |
|
| 195 |
- |
|
| 196 |
- return response(200, 'Pass Success', u'申请通过成功', {
|
|
| 197 |
- 'group_id': group_id, |
|
| 198 |
- 'users': group_users, |
|
| 199 |
- }) |
|
| 200 |
- |
|
| 201 |
- |
|
| 202 |
-@logit |
|
| 203 |
-def group_refuse_api(request): |
|
| 204 |
- """ 申请拒绝 """ |
|
| 205 |
- group_id = request.POST.get('group_id', '')
|
|
| 206 |
- admin_id = request.POST.get('admin_id', '')
|
|
| 207 |
- user_id = request.POST.get('user_id', '')
|
|
| 208 |
- |
|
| 209 |
- # 群组校验 |
|
| 210 |
- try: |
|
| 211 |
- group = GroupInfo.objects.get(group_id=group_id) |
|
| 212 |
- except GroupInfo.DoesNotExist: |
|
| 213 |
- return response(GroupStatusCode.GROUP_NOT_FOUND) |
|
| 214 |
- |
|
| 215 |
- # 权限校验 |
|
| 216 |
- if group.admin_id != admin_id: |
|
| 217 |
- return response(GroupStatusCode.NO_REFUSE_PERMISSION) |
|
| 218 |
- |
|
| 219 |
- # 群组用户校验 |
|
| 220 |
- try: |
|
| 221 |
- group_user = GroupUserInfo.objects.get(group_id=group_id, user_id=user_id, user_status=GroupUserInfo.APPLYING) |
|
| 222 |
- except GroupUserInfo.DoesNotExist: |
|
| 223 |
- return response(GroupStatusCode.JOIN_REQUEST_NOT_FOUND) |
|
| 224 |
- |
|
| 225 |
- # 群组用户拒绝 |
|
| 226 |
- group_user.user_status = GroupUserInfo.REFUSED |
|
| 227 |
- group_user.refused_at = tc.utc_datetime() |
|
| 228 |
- group_user.save() |
|
| 229 |
- |
|
| 230 |
- # Redis 群组数据缓存更新 |
|
| 231 |
- group_users = set_group_users_info(group) |
|
| 232 |
- |
|
| 233 |
- # Redis 群组拒绝集合缓存 |
|
| 234 |
- r.srem(GROUP_USERS_APPLYING_SET % group_id, user_id) |
|
| 235 |
- r.sadd(GROUP_USERS_REFUSED_SET % group_id, user_id) |
|
| 236 |
- |
|
| 237 |
- return response(200, 'Refuse Success', u'申请拒绝成功', {
|
|
| 238 |
- 'group_id': group_id, |
|
| 239 |
- 'users': group_users, |
|
| 240 |
- }) |