Merge pull request #7802 from mingshewhe/bug_7767_1.9

bug: github pr事件有milestone时不触发 #7767
TencentBlueKing · Oct 17, 2022 · 1cad783 · 1cad783
2 parents 3e8d780 + e8bb2dc
commit 1cad783
Show file tree

Hide file tree

Showing 7 changed files with 13 additions and 13 deletions.
diff --git a/...n-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubMilestone.kt b/...n-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubMilestone.kt
@@ -4,7 +4,7 @@ import com.fasterxml.jackson.annotation.JsonProperty
 
 data class GithubMilestone(
     @JsonProperty("closed_at")
-    val closedAt: String,
+    val closedAt: String?,
     @JsonProperty("closed_issues")
     val closedIssues: Int,
     @JsonProperty("created_at")
@@ -26,6 +26,6 @@ data class GithubMilestone(
     val state: String,
     val title: String,
     @JsonProperty("updated_at")
-    val updatedAt: String,
+    val updatedAt: String?,
     val url: String
 )
diff --git a/...common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt b/...common-github-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/pojo/GithubRepo.kt
@@ -140,7 +140,7 @@ data class GithubRepo(
     @JsonProperty("pulls_url")
     val pullsUrl: String,
     @JsonProperty("pushed_at")
-    val pushedAt: String,
+    val pushedAt: String?,
     @JsonProperty("releases_url")
     val releasesUrl: String?,
     val size: Int,
@@ -168,7 +168,7 @@ data class GithubRepo(
     @JsonProperty("trees_url")
     val treesUrl: String,
     @JsonProperty("updated_at")
-    val updatedAt: String,
+    val updatedAt: String?,
     val url: String,
     val watchers: Int,
     @JsonProperty("watchers_count")

diff --git a/...hub-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CheckRunResponse.kt b/...hub-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/CheckRunResponse.kt
@@ -28,7 +28,7 @@ data class CheckRunResponse(
     @JsonProperty("pull_requests")
     val pullRequests: List<SamplePullRequestResponse>,
     @JsonProperty("started_at")
-    val startedAt: String,
+    val startedAt: String?,
     val status: String,
     val url: String
 )

diff --git a/...c/main/kotlin/com/tencent/devops/common/sdk/github/response/CreateIssueCommentResponse.kt b/...c/main/kotlin/com/tencent/devops/common/sdk/github/response/CreateIssueCommentResponse.kt
@@ -49,7 +49,7 @@ data class CreateIssueCommentResponse(
     @JsonProperty("node_id")
     val nodeId: String,
     @JsonProperty("updated_at")
-    val updatedAt: String,
+    val updatedAt: String?,
     @JsonProperty("url")
     val url: String,
     @JsonProperty("user")

diff --git a/...thub-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/GetUserResponse.kt b/...thub-sdk/src/main/kotlin/com/tencent/devops/common/sdk/github/response/GetUserResponse.kt
@@ -78,7 +78,7 @@ data class GetUserResponse(
     @JsonProperty("type")
     val type: String,
     @JsonProperty("updated_at")
-    val updatedAt: String,
+    val updatedAt: String?,
     @JsonProperty("url")
     val url: String
 )
diff --git a/...webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubEvent.kt b/...webhook/src/main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubEvent.kt
@@ -289,7 +289,7 @@ data class GithubRepository(
 //    @JsonProperty("trees_url")
 //    val treesUrl: String, // https://api.github.com/repos/yongyiduan/webhook-test/git/trees{/sha}
     @JsonProperty("updated_at")
-    val updatedAt: String, // 2022-06-21T07:54:56Z
+    val updatedAt: String?, // 2022-06-21T07:54:56Z
     @JsonProperty("url")
     val url: String, // https://github.com/yongyiduan/webhook-test
     @JsonProperty("visibility")

diff --git a/.../main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt b/.../main/kotlin/com/tencent/devops/common/webhook/pojo/code/github/GithubPullRequestEvent.kt
@@ -142,11 +142,11 @@ data class GithubPullRequest(
     @JsonProperty("state")
     val state: String, // open
     @JsonProperty("statuses_url")
-    val statusesUrl: String, // https://api.github.com/repos/yongyiduan/webhook-test/statuses/bed5f474e52f1fadae3f5b770e3d752129678cf8
+    val statusesUrl: String,
     @JsonProperty("title")
     val title: String, // Update 1 testesteste
     @JsonProperty("updated_at")
-    val updatedAt: String, // 2022-06-21T08:45:42Z
+    val updatedAt: String?, // 2022-06-21T08:45:42Z
     @JsonProperty("url")
     val url: String, // https://api.github.com/repos/yongyiduan/webhook-test/pulls/1
     @JsonProperty("user")
@@ -155,7 +155,7 @@ data class GithubPullRequest(
 
 data class GithubMilestone(
     @JsonProperty("closed_at")
-    val closedAt: String, // 2013-02-12T13:22:01Z
+    val closedAt: String?, // 2013-02-12T13:22:01Z
     @JsonProperty("closed_issues")
     val closedIssues: Int, // 8
     @JsonProperty("created_at")
@@ -165,7 +165,7 @@ data class GithubMilestone(
     @JsonProperty("description")
     val description: String, // Tracking milestone for version 1.0
     @JsonProperty("due_on")
-    val dueOn: String, // 2012-10-09T23:39:01Z
+    val dueOn: String?, // 2012-10-09T23:39:01Z
     @JsonProperty("html_url")
     val htmlUrl: String, // https://github.com/octocat/Hello-World/milestones/v1.0
     @JsonProperty("id")
@@ -183,7 +183,7 @@ data class GithubMilestone(
     @JsonProperty("title")
     val title: String, // v1.0
     @JsonProperty("updated_at")
-    val updatedAt: String // 2014-03-03T18:58:10Z
+    val updatedAt: String? // 2014-03-03T18:58:10Z
 //    @JsonProperty("url")
 //    val url: String // https://api.github.com/repos/octocat/Hello-World/milestones/1
 )