@@ -199,7 +199,7 @@ async def change_activity_status(
199
199
@router .get ("" )
200
200
async def read_activities (
201
201
type : str | None ,
202
- mode : str ,
202
+ mode : str | None ,
203
203
page : int = - 1 ,
204
204
perpage : int = 10 ,
205
205
query : str = "" ,
@@ -215,13 +215,6 @@ async def read_activities(
215
215
if (
216
216
"admin" not in user ["per" ]
217
217
and "department" not in user ["per" ]
218
- and mode == "campus"
219
- ):
220
- raise HTTPException (status_code = 403 , detail = "Permission denied" )
221
- elif (
222
- "secretary" not in user ["per" ]
223
- and "admin" not in user ["per" ]
224
- and mode == "class"
225
218
):
226
219
raise HTTPException (status_code = 403 , detail = "Permission denied" )
227
220
if type is None or type == 'all' or type == '' :
@@ -230,7 +223,7 @@ async def read_activities(
230
223
target_types = type .split ("," )
231
224
if len (target_types ) == 0 :
232
225
target_types = ["specified" , "social" , "scale" , "special" ]
233
- if mode == "campus" :
226
+ if True :
234
227
# Read activities
235
228
result = []
236
229
@@ -298,7 +291,7 @@ async def read_activities(
298
291
]
299
292
300
293
count = await db .zvms .activities .count_documents (
301
- {"name" : {"$regex" : query , "$options" : "i" }}
294
+ {"name" : {"$regex" : query , "$options" : "i" }, "type" : { "$in" : target_types } }
302
295
)
303
296
activities = await db .zvms .activities .aggregate (pipeline ).to_list (None )
304
297
for activity in activities :
@@ -309,16 +302,6 @@ async def read_activities(
309
302
"data" : activities ,
310
303
"metadata" : {"size" : count },
311
304
}
312
- elif mode == "class" :
313
- result , count = await get_activities_related_to_user (
314
- user ["id" ], page , perpage , query
315
- )
316
- return {
317
- "status" : "ok" ,
318
- "code" : 200 ,
319
- "data" : result ,
320
- "metadata" : {"size" : count },
321
- }
322
305
323
306
324
307
@router .get ("/{activity_oid}" )
0 commit comments