-
Notifications
You must be signed in to change notification settings - Fork 2
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
BDOG-2939: adds team summary collection and removes filters
- Loading branch information
Showing
18 changed files
with
657 additions
and
483 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
50 changes: 0 additions & 50 deletions
50
app/uk/gov/hmrc/teamsandrepositories/models/TeamName.scala
This file was deleted.
Oops, something went wrong.
59 changes: 59 additions & 0 deletions
59
app/uk/gov/hmrc/teamsandrepositories/models/TeamSummary.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| /* | ||
| * Copyright 2023 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package uk.gov.hmrc.teamsandrepositories.models | ||
|
|
||
| import play.api.libs.json.{OFormat, __} | ||
| import play.api.libs.functional.syntax._ | ||
| import uk.gov.hmrc.mongo.play.json.formats.MongoJavatimeFormats | ||
|
|
||
| import java.time.Instant | ||
|
|
||
| case class TeamSummary( | ||
| name : String, | ||
| lastActiveDate: Option[Instant], | ||
| repos : Seq[String] | ||
| ) | ||
|
|
||
| object TeamSummary { | ||
| def createTeamSummaries(gitRepositories: List[GitRepository]): Seq[TeamSummary] = | ||
| gitRepositories | ||
| .flatMap(repo => repo.teams.map(team => (team, repo))) | ||
| .groupBy { case (team, _) => team } | ||
| .view.mapValues(_.map{ case (_, repo) => repo }) | ||
| .map { | ||
| case (team, gitRepos) => | ||
| TeamSummary( | ||
| name = team, | ||
| lastActiveDate = Some(gitRepos.map(_.lastActiveDate).max), | ||
| repos = gitRepos.collect { | ||
| case gitRepo if gitRepo.owningTeams.contains(team) && !gitRepo.isArchived => gitRepo.name | ||
| } | ||
| ) | ||
| }.toSeq | ||
|
|
||
| val apiFormat: OFormat[TeamSummary] = | ||
| ( (__ \ "name" ).format[String] | ||
| ~ (__ \ "lastActiveDate").formatNullable[Instant] | ||
| ~ (__ \ "repos" ).format[Seq[String]] | ||
| )(TeamSummary.apply, unlift(TeamSummary.unapply)) | ||
|
|
||
| val mongoFormat: OFormat[TeamSummary] = | ||
| ( (__ \ "name" ).format[String] | ||
| ~ (__ \ "lastActiveDate" ).formatNullable[Instant](MongoJavatimeFormats.instantFormat) | ||
| ~ (__ \ "repos" ).format[Seq[String]] | ||
| )(TeamSummary.apply, unlift(TeamSummary.unapply)) | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
68 changes: 68 additions & 0 deletions
68
app/uk/gov/hmrc/teamsandrepositories/persistence/TeamSummaryPersistence.scala
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,68 @@ | ||
| /* | ||
| * Copyright 2024 HM Revenue & Customs | ||
| * | ||
| * Licensed under the Apache License, Version 2.0 (the "License"); | ||
| * you may not use this file except in compliance with the License. | ||
| * You may obtain a copy of the License at | ||
| * | ||
| * http://www.apache.org/licenses/LICENSE-2.0 | ||
| * | ||
| * Unless required by applicable law or agreed to in writing, software | ||
| * distributed under the License is distributed on an "AS IS" BASIS, | ||
| * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. | ||
| * See the License for the specific language governing permissions and | ||
| * limitations under the License. | ||
| */ | ||
|
|
||
| package uk.gov.hmrc.teamsandrepositories.persistence | ||
|
|
||
| import org.mongodb.scala.model.Indexes.ascending | ||
| import org.mongodb.scala.model.{DeleteOneModel, Filters, IndexModel, IndexOptions, Indexes, ReplaceOneModel, ReplaceOptions} | ||
| import play.api.Logger | ||
| import uk.gov.hmrc.mongo.MongoComponent | ||
| import uk.gov.hmrc.mongo.play.json.PlayMongoRepository | ||
| import uk.gov.hmrc.teamsandrepositories.models.TeamSummary | ||
| import uk.gov.hmrc.teamsandrepositories.persistence.Collations.caseInsensitive | ||
|
|
||
| import javax.inject.{Inject, Singleton} | ||
| import scala.concurrent.{ExecutionContext, Future} | ||
|
|
||
| @Singleton | ||
| class TeamSummaryPersistence @Inject()( | ||
| mongoComponent: MongoComponent | ||
| )(implicit | ||
| ec: ExecutionContext | ||
| ) extends PlayMongoRepository( | ||
| mongoComponent = mongoComponent, | ||
| collectionName = "teamSummaries", | ||
| domainFormat = TeamSummary.mongoFormat, | ||
| indexes = Seq( | ||
| IndexModel(Indexes.ascending("name"), IndexOptions().name("nameIdx").collation(caseInsensitive).unique(true)), | ||
| ) | ||
| ){ | ||
|
|
||
| private val logger = Logger(this.getClass) | ||
|
|
||
| override lazy val requiresTtlIndex = false | ||
|
|
||
| def updateTeamSummaries(teams: Seq[TeamSummary]): Future[Int] = | ||
| for { | ||
| oldTeams <- collection.find().map(_.name).toFuture().map(_.toSet) | ||
| update <- collection | ||
| .bulkWrite(teams.map(teamSummary => ReplaceOneModel(Filters.eq("name", teamSummary.name), teamSummary, ReplaceOptions().collation(caseInsensitive).upsert(true)))) | ||
| .toFuture() | ||
| .map(_.getModifiedCount) | ||
| toDelete = (oldTeams -- teams.map(_.name)).toSeq | ||
| _ <- if (toDelete.nonEmpty) { | ||
| logger.info(s"about to remove ${toDelete.length} deleted teams: ${toDelete.mkString(", ")}") | ||
| collection.bulkWrite(toDelete.map(team => DeleteOneModel(Filters.eq("name", team)))).toFuture() | ||
| .map(res => logger.info(s"removed ${res.getModifiedCount} deleted teams")) | ||
| } else Future.unit | ||
| } yield update | ||
|
|
||
| def findTeamSummaries(): Future[Seq[TeamSummary]] = | ||
| collection | ||
| .find() | ||
| .sort(ascending("name")) | ||
| .toFuture() | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.