@@ -49,16 +49,16 @@ def read_teams(
49
49
return TeamsPublic (data = teams , count = count )
50
50
51
51
52
- @router .get ("/{org_id }" , response_model = TeamWithUserPublic )
53
- def read_team (session : SessionDep , current_user : CurrentUser , org_id : int ) -> Any :
52
+ @router .get ("/{team_id }" , response_model = TeamWithUserPublic )
53
+ def read_team (session : SessionDep , current_user : CurrentUser , team_id : int ) -> Any :
54
54
"""
55
55
Retrieve an team by its ID and returns it along with its associated users.
56
56
"""
57
57
query = select (Team ).options (
58
58
selectinload (Team .user_links ).selectinload (UserTeamLink .user ) # type: ignore
59
59
)
60
60
query = query .where (
61
- Team .id == org_id ,
61
+ Team .id == team_id ,
62
62
col (Team .user_links ).any (col (UserTeamLink .user ) == current_user ),
63
63
)
64
64
team = session .exec (query ).first ()
@@ -85,11 +85,11 @@ def create_team(
85
85
return team
86
86
87
87
88
- @router .put ("/{org_id }" , response_model = TeamPublic )
88
+ @router .put ("/{team_id }" , response_model = TeamPublic )
89
89
def update_team (
90
90
session : SessionDep ,
91
91
current_user : CurrentUser ,
92
- org_id : int ,
92
+ team_id : int ,
93
93
team_in : TeamUpdate ,
94
94
) -> Any :
95
95
"""
@@ -99,7 +99,7 @@ def update_team(
99
99
select (UserTeamLink )
100
100
.options (selectinload (UserTeamLink .team )) # type: ignore
101
101
.where (
102
- UserTeamLink .team_id == org_id ,
102
+ UserTeamLink .team_id == team_id ,
103
103
UserTeamLink .user == current_user ,
104
104
)
105
105
)
@@ -122,16 +122,18 @@ def update_team(
122
122
return org
123
123
124
124
125
- @router .delete ("/{org_id}" , response_model = Message )
126
- def delete_team (session : SessionDep , current_user : CurrentUser , org_id : int ) -> Message :
125
+ @router .delete ("/{team_id}" , response_model = Message )
126
+ def delete_team (
127
+ session : SessionDep , current_user : CurrentUser , team_id : int
128
+ ) -> Message :
127
129
"""
128
130
Delete an team from the database.
129
131
"""
130
132
query = (
131
133
select (UserTeamLink )
132
134
.options (selectinload (UserTeamLink .team )) # type: ignore
133
135
.where (
134
- UserTeamLink .team_id == org_id ,
136
+ UserTeamLink .team_id == team_id ,
135
137
UserTeamLink .user == current_user ,
136
138
)
137
139
)
@@ -154,11 +156,11 @@ def delete_team(session: SessionDep, current_user: CurrentUser, org_id: int) ->
154
156
return Message (message = "Team deleted" )
155
157
156
158
157
- @router .post ("/{org_id }/users/" , response_model = UserTeamLinkPublic )
159
+ @router .post ("/{team_id }/users/" , response_model = UserTeamLinkPublic )
158
160
def add_member_to_team (
159
161
session : SessionDep ,
160
162
current_user : CurrentUser ,
161
- org_id : int ,
163
+ team_id : int ,
162
164
member_in : TeamCreateMember ,
163
165
) -> Any :
164
166
"""
@@ -172,7 +174,7 @@ def add_member_to_team(
172
174
)
173
175
)
174
176
.where (
175
- UserTeamLink .team_id == org_id ,
177
+ UserTeamLink .team_id == team_id ,
176
178
UserTeamLink .user == current_user ,
177
179
)
178
180
)
@@ -201,11 +203,11 @@ def add_member_to_team(
201
203
return user_team
202
204
203
205
204
- @router .put ("/{org_id }/users/{user_id}" , response_model = UserTeamLinkPublic )
206
+ @router .put ("/{team_id }/users/{user_id}" , response_model = UserTeamLinkPublic )
205
207
def update_member_in_team (
206
208
session : SessionDep ,
207
209
current_user : CurrentUser ,
208
- org_id : int ,
210
+ team_id : int ,
209
211
user_id : int ,
210
212
member_in : TeamUpdateMember ,
211
213
) -> Any :
@@ -220,7 +222,7 @@ def update_member_in_team(
220
222
)
221
223
)
222
224
.where (
223
- UserTeamLink .team_id == org_id ,
225
+ UserTeamLink .team_id == team_id ,
224
226
UserTeamLink .user == current_user ,
225
227
)
226
228
)
@@ -251,11 +253,11 @@ def update_member_in_team(
251
253
return member_link
252
254
253
255
254
- @router .delete ("/{org_id }/users/{user_id}" , response_model = Message )
256
+ @router .delete ("/{team_id }/users/{user_id}" , response_model = Message )
255
257
def remove_member_from_team (
256
258
session : SessionDep ,
257
259
current_user : CurrentUser ,
258
- org_id : int ,
260
+ team_id : int ,
259
261
user_id : int ,
260
262
) -> Message :
261
263
"""
@@ -274,7 +276,7 @@ def remove_member_from_team(
274
276
)
275
277
)
276
278
.where (
277
- UserTeamLink .team_id == org_id ,
279
+ UserTeamLink .team_id == team_id ,
278
280
UserTeamLink .user == current_user ,
279
281
)
280
282
)
0 commit comments