Skip to content

Commit 750a134

Browse files
authored
♻️ Rename org path params to teams (#37)
1 parent ce429e7 commit 750a134

File tree

1 file changed

+20
-18
lines changed

1 file changed

+20
-18
lines changed

backend/app/api/routes/teams.py

Lines changed: 20 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -49,16 +49,16 @@ def read_teams(
4949
return TeamsPublic(data=teams, count=count)
5050

5151

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:
5454
"""
5555
Retrieve an team by its ID and returns it along with its associated users.
5656
"""
5757
query = select(Team).options(
5858
selectinload(Team.user_links).selectinload(UserTeamLink.user) # type: ignore
5959
)
6060
query = query.where(
61-
Team.id == org_id,
61+
Team.id == team_id,
6262
col(Team.user_links).any(col(UserTeamLink.user) == current_user),
6363
)
6464
team = session.exec(query).first()
@@ -85,11 +85,11 @@ def create_team(
8585
return team
8686

8787

88-
@router.put("/{org_id}", response_model=TeamPublic)
88+
@router.put("/{team_id}", response_model=TeamPublic)
8989
def update_team(
9090
session: SessionDep,
9191
current_user: CurrentUser,
92-
org_id: int,
92+
team_id: int,
9393
team_in: TeamUpdate,
9494
) -> Any:
9595
"""
@@ -99,7 +99,7 @@ def update_team(
9999
select(UserTeamLink)
100100
.options(selectinload(UserTeamLink.team)) # type: ignore
101101
.where(
102-
UserTeamLink.team_id == org_id,
102+
UserTeamLink.team_id == team_id,
103103
UserTeamLink.user == current_user,
104104
)
105105
)
@@ -122,16 +122,18 @@ def update_team(
122122
return org
123123

124124

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:
127129
"""
128130
Delete an team from the database.
129131
"""
130132
query = (
131133
select(UserTeamLink)
132134
.options(selectinload(UserTeamLink.team)) # type: ignore
133135
.where(
134-
UserTeamLink.team_id == org_id,
136+
UserTeamLink.team_id == team_id,
135137
UserTeamLink.user == current_user,
136138
)
137139
)
@@ -154,11 +156,11 @@ def delete_team(session: SessionDep, current_user: CurrentUser, org_id: int) ->
154156
return Message(message="Team deleted")
155157

156158

157-
@router.post("/{org_id}/users/", response_model=UserTeamLinkPublic)
159+
@router.post("/{team_id}/users/", response_model=UserTeamLinkPublic)
158160
def add_member_to_team(
159161
session: SessionDep,
160162
current_user: CurrentUser,
161-
org_id: int,
163+
team_id: int,
162164
member_in: TeamCreateMember,
163165
) -> Any:
164166
"""
@@ -172,7 +174,7 @@ def add_member_to_team(
172174
)
173175
)
174176
.where(
175-
UserTeamLink.team_id == org_id,
177+
UserTeamLink.team_id == team_id,
176178
UserTeamLink.user == current_user,
177179
)
178180
)
@@ -201,11 +203,11 @@ def add_member_to_team(
201203
return user_team
202204

203205

204-
@router.put("/{org_id}/users/{user_id}", response_model=UserTeamLinkPublic)
206+
@router.put("/{team_id}/users/{user_id}", response_model=UserTeamLinkPublic)
205207
def update_member_in_team(
206208
session: SessionDep,
207209
current_user: CurrentUser,
208-
org_id: int,
210+
team_id: int,
209211
user_id: int,
210212
member_in: TeamUpdateMember,
211213
) -> Any:
@@ -220,7 +222,7 @@ def update_member_in_team(
220222
)
221223
)
222224
.where(
223-
UserTeamLink.team_id == org_id,
225+
UserTeamLink.team_id == team_id,
224226
UserTeamLink.user == current_user,
225227
)
226228
)
@@ -251,11 +253,11 @@ def update_member_in_team(
251253
return member_link
252254

253255

254-
@router.delete("/{org_id}/users/{user_id}", response_model=Message)
256+
@router.delete("/{team_id}/users/{user_id}", response_model=Message)
255257
def remove_member_from_team(
256258
session: SessionDep,
257259
current_user: CurrentUser,
258-
org_id: int,
260+
team_id: int,
259261
user_id: int,
260262
) -> Message:
261263
"""
@@ -274,7 +276,7 @@ def remove_member_from_team(
274276
)
275277
)
276278
.where(
277-
UserTeamLink.team_id == org_id,
279+
UserTeamLink.team_id == team_id,
278280
UserTeamLink.user == current_user,
279281
)
280282
)

0 commit comments

Comments
 (0)