Enhance Git Reference APIs (#2937)

Fork: 0

johnpearcey / gitbucket_jkp

Browse code Enhance Git Reference APIs (#2937) master
1 parent aba428b commit d6a191d95b1fd1adaa51140c6dda3022499d59e8 Naoki Takezoe authored on 6 Dec 2021 GitHub committed on 6 Dec 2021

Patch

Unified Split

Showing 10 changed files

                Ignore Space
               Show notes
              View
            
          
          8 ■■■■■
          src/main/scala/gitbucket/core/api/ApiRef.scala
     tagInfo: TagInfo
  ): ApiRef =
    ApiRef(
      ref = s"refs/tags/${tagInfo.name}",
      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/refs/tags/${tagInfo.name}"),
      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/refs/tags/${tagInfo.name}"),
      `object` = ApiRefCommit(
        sha = tagInfo.id,
        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/tags/${tagInfo.id}"), // TODO This URL is not yet available?
        `type` = "commit"
        sha = tagInfo.objectId,
        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/tags/${tagInfo.objectId}"), // TODO This URL is not yet available?
        `type` = "tag"
      )
    )
}
     tagInfo: TagInfo
   ): ApiRef =
     ApiRef(
       ref = s"refs/tags/${tagInfo.name}",
+      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/refs/tags/${tagInfo.name}"),
+      url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/refs/tags/${tagInfo.name}"),
       `object` = ApiRefCommit(
+        sha = tagInfo.id,
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/tags/${tagInfo.id}"), // TODO This URL is not yet available?
+        `type` = "commit"
+        sha = tagInfo.objectId,
+        url = ApiPath(s"/api/v3/repos/${repositoryName.fullName}/git/tags/${tagInfo.objectId}"), // TODO This URL is not yet available?
+        `type` = "tag"
       )
     )
 }

                Ignore Space
               Show notes
              View
            
          
          2 ■■■■■
          src/main/scala/gitbucket/core/controller/ReleasesController.scala
   })
 
  get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
    val Seq(previousTag, currentTag) = multiParams("splat")
    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.commitId }.getOrElse("")
 
    val commitLog = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
      val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
      commits
   })
   get("/:owner/:repository/changelog/*...*")(writableUsersOnly { repository =>
     val Seq(previousTag, currentTag) = multiParams("splat")
+    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.id }.getOrElse("")
+    val previousTagId = repository.tags.collectFirst { case x if x.name == previousTag => x.commitId }.getOrElse("")
     val commitLog = Using.resource(Git.open(getRepositoryDir(repository.owner, repository.name))) { git =>
       val commits = JGitUtil.getCommitLog(git, previousTagId, currentTag).reverse
       commits

Ignore Space Show notes View src/main/scala/gitbucket/core/controller/api/ApiGitReferenceControllerBase.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/service/PullRequestService.scala

Ignore Space Show notes View src/main/scala/gitbucket/core/util/JGitUtil.scala

Ignore Space Show notes View src/main/twirl/gitbucket/core/releases/list.scala.html

Ignore Space Show notes View src/main/twirl/gitbucket/core/releases/release.scala.html

Ignore Space Show notes View src/test/scala/gitbucket/core/TestingGitBucketServer.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/api/ApiIntegrationTest.scala

Ignore Space Show notes View src/test/scala/gitbucket/core/api/ApiSpecModels.scala

Show line notes below