Skip to content

Commit 37eae08

Browse files
committed
Save more info for teams and use different classes for endpoints
1 parent dc21aa8 commit 37eae08

File tree

3 files changed

+24
-6
lines changed

3 files changed

+24
-6
lines changed

src/main/scala/com/codacy/client/bitbucket/v2/Team.scala

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,13 +3,14 @@ package com.codacy.client.bitbucket.v2
33
import play.api.libs.functional.syntax._
44
import play.api.libs.json._
55

6-
case class Team(username: String, display_name: String)
6+
case class Team(uuid: String, username: String, display_name: String)
77

88
object Team {
99
// format: off
1010
implicit val reader: Reads[Team] = (
11-
(__ \ "team" \ "username").read[String] and
12-
(__ \ "team" \ "display_name").read[String]
11+
(__ \ "uuid").read[String] and
12+
(__ \ "username").read[String] and
13+
(__ \ "display_name").read[String]
1314
)(Team.apply _)
1415
// format: on
1516
}
Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
package com.codacy.client.bitbucket.v2
2+
3+
import play.api.libs.functional.syntax._
4+
import play.api.libs.json._
5+
6+
case class TeamWithPermission(team: Team, permission: String)
7+
8+
object TeamWithPermission {
9+
// format: off
10+
implicit val reader: Reads[TeamWithPermission] = (
11+
(__ \ "team").read[Team] and
12+
(__ \ "permission").read[String]
13+
)(TeamWithPermission.apply _)
14+
// format: on
15+
}

src/main/scala/com/codacy/client/bitbucket/v2/service/UserServices.scala

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
package com.codacy.client.bitbucket.v2.service
22

3-
import com.codacy.client.bitbucket.v2.{Email, SshKey, Team, User}
3+
import com.codacy.client.bitbucket.v2._
44
import com.codacy.client.bitbucket.client.{BitbucketClient, Request, RequestResponse}
55
import play.api.libs.json.Json
66

@@ -30,8 +30,10 @@ class UserServices(client: BitbucketClient) {
3030
/*
3131
* Gets all the teams a user is a member of
3232
*/
33-
def getTeams: RequestResponse[Seq[Team]] = {
34-
client.executePaginated(Request(s"https://bitbucket.org/api/2.0/user/permissions/teams", classOf[Seq[Team]]))
33+
def getTeams: RequestResponse[Seq[TeamWithPermission]] = {
34+
client.executePaginated(
35+
Request(s"https://bitbucket.org/api/2.0/user/permissions/teams", classOf[Seq[TeamWithPermission]])
36+
)
3537
}
3638

3739
/*

0 commit comments

Comments
 (0)