@@ -28,8 +28,10 @@ def get(self, request: Request):
28
28
try :
29
29
user_id = request .user_id
30
30
response : GetUserTeamsResponse = TeamService .get_user_teams (user_id )
31
-
32
- return Response (data = response .model_dump (mode = "json" ), status = status .HTTP_200_OK )
31
+ data = response .model_dump (mode = "json" )
32
+ for team in data .get ("teams" , []):
33
+ team .pop ("invite_code" , None )
34
+ return Response (data = data , status = status .HTTP_200_OK )
33
35
34
36
except ValueError as e :
35
37
if isinstance (e .args [0 ], ApiErrorResponse ):
@@ -70,8 +72,11 @@ def post(self, request: Request):
70
72
dto = CreateTeamDTO (** serializer .validated_data )
71
73
created_by_user_id = request .user_id
72
74
response : CreateTeamResponse = TeamService .create_team (dto , created_by_user_id )
73
-
74
- return Response (data = response .model_dump (mode = "json" ), status = status .HTTP_201_CREATED )
75
+ data = response .model_dump (mode = "json" )
76
+ # Remove invite_code from the created team
77
+ if "team" in data :
78
+ data ["team" ].pop ("invite_code" , None )
79
+ return Response (data = data , status = status .HTTP_201_CREATED )
75
80
76
81
except ValueError as e :
77
82
if isinstance (e .args [0 ], ApiErrorResponse ):
@@ -149,7 +154,9 @@ def get(self, request: Request, team_id: str):
149
154
users = UserService .get_users_by_team_id (team_id )
150
155
users_data = [user .dict () for user in users ]
151
156
team_dto .users = users_data
152
- return Response (data = team_dto .model_dump (mode = "json" ), status = status .HTTP_200_OK )
157
+ data = team_dto .model_dump (mode = "json" )
158
+ data .pop ("invite_code" , None )
159
+ return Response (data = data , status = status .HTTP_200_OK )
153
160
except ValueError as e :
154
161
fallback_response = ApiErrorResponse (
155
162
statusCode = 404 ,
@@ -199,8 +206,9 @@ def patch(self, request: Request, team_id: str):
199
206
dto = UpdateTeamDTO (** serializer .validated_data )
200
207
updated_by_user_id = request .user_id
201
208
response : TeamDTO = TeamService .update_team (team_id , dto , updated_by_user_id )
202
-
203
- return Response (data = response .model_dump (mode = "json" ), status = status .HTTP_200_OK )
209
+ data = response .model_dump (mode = "json" )
210
+ data .pop ("invite_code" , None )
211
+ return Response (data = data , status = status .HTTP_200_OK )
204
212
205
213
except ValueError as e :
206
214
if isinstance (e .args [0 ], ApiErrorResponse ):
@@ -244,7 +252,9 @@ def post(self, request: Request):
244
252
user_id = request .user_id
245
253
invite_code = serializer .validated_data ["invite_code" ]
246
254
team_dto = TeamService .join_team_by_invite_code (invite_code , user_id )
247
- return Response (data = team_dto .model_dump (mode = "json" ), status = status .HTTP_200_OK )
255
+ data = team_dto .model_dump (mode = "json" )
256
+ data .pop ("invite_code" , None )
257
+ return Response (data = data , status = status .HTTP_200_OK )
248
258
except ValueError as e :
249
259
return Response ({"detail" : str (e )}, status = status .HTTP_400_BAD_REQUEST )
250
260
except Exception as e :
@@ -286,8 +296,9 @@ def post(self, request: Request, team_id: str):
286
296
member_ids = serializer .validated_data ["member_ids" ]
287
297
added_by_user_id = request .user_id
288
298
response : TeamDTO = TeamService .add_team_members (team_id , member_ids , added_by_user_id )
289
-
290
- return Response (data = response .model_dump (mode = "json" ), status = status .HTTP_200_OK )
299
+ data = response .model_dump (mode = "json" )
300
+ data .pop ("invite_code" , None )
301
+ return Response (data = data , status = status .HTTP_200_OK )
291
302
292
303
except ValueError as e :
293
304
if isinstance (e .args [0 ], ApiErrorResponse ):
0 commit comments