hi

oppia · Oct 31, 2024 · 81d0912 · 81d0912
1 parent d4c849e
commit 81d0912
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 15 deletions.
diff --git a/scripts/src/java/org/oppia/android/scripts/common/GitHubClient.kt b/scripts/src/java/org/oppia/android/scripts/common/GitHubClient.kt
@@ -72,10 +72,7 @@ class GitHubClient(
         "Failed to fetch issues at page $pageNumber: ${response.code()}\n${call.request()}" +
           "\n${response.errorBody()}."
       }
-      // subha
-      // Filter out any pull requests from the list  added
-      val issues = response.body()?.filter { it.pullRequest == null }
-      return@async checkNotNull(issues) {
+      return@async checkNotNull(response.body()) {
         "No issues response from GitHub for page: $pageNumber."
       }
     }

diff --git a/scripts/src/java/org/oppia/android/scripts/common/model/GitHubIssue.kt b/scripts/src/java/org/oppia/android/scripts/common/model/GitHubIssue.kt
@@ -10,13 +10,4 @@ import com.squareup.moshi.JsonClass
  *     'issues/' in an issue's GitHub URL)
  */
 @JsonClass(generateAdapter = true)
-data class GitHubIssue(
-  @Json(name = "number") val number: Int,
-  @Json(name = "pull_request") val pullRequest: PullRequest? = null
-)
-
-// Define PullRequest class as needed, or leave it empty if you don’t require specific details
-@JsonClass(generateAdapter = true)
-data class PullRequest(
-  // Add fields if needed, or leave empty for filtering purposes
-)
+data class GitHubIssue(@Json(name = "number") val number: Int)
diff --git a/scripts/src/java/org/oppia/android/scripts/common/remote/GitHubService.kt b/scripts/src/java/org/oppia/android/scripts/common/remote/GitHubService.kt
@@ -31,7 +31,12 @@ interface GitHubService {
   @Headers("Accept: application/vnd.github+json", "X-GitHub-Api-Version: 2022-11-28")
   // @GET("repos/{repo_owner}/{repo_name}/issues?direction=asc")
   // add by subha
-  @GET("repos/{repo_owner}/{repo_name}/issues?direction=asc")
+  @GET("repos/{repo_owner}/{repo_name}/issues?direction=asc&pulls=false")
+  suspend fun fetchIssues(
+    @Path("repo_owner") repoOwner: String,
+    @Path("repo_name") repoName: String
+  ): Response<List<GitHubIssue>>
+
   // @GET("repos/{repo_owner}/{repo_name}/issues?state=open&direction=asc")
   fun fetchOpenIssues(
     @Path("repo_owner") repoOwner: String,