Add pagination to requests and discussions, improve message (#1)

- Added pagination. Now we able to fetch all possible requests and discussions for single request
- Improved message. Added authors of unresolved threads for request and who has approved

Author: JustSnow

api/gitlab.js api/GitLab.js

@@ -25,17 +25,38 @@ class GitLab {
     }
 
     const uri = this.__getUrl("projects", project, "merge_requests")
-    return this.__get(uri, query)
+    return this.__getPaginated(uri, query)
   }
 
   discussions = (project, request) => {
+    const query = { page: 1, per_page: 100 }
     const uri = this.__getUrl("projects", project, "merge_requests", request, "discussions")
-    return this.__get(uri)
+
+    return this.__getPaginated(uri, query)
   }
 
   __getUrl = (...parts) => url.build(this.baseUrl, ...parts)
 
   __get = (url, query = {}) => network.get(url, query, { "Private-Token": this.token })
+
+  __getPaginated = (uri, query = {}) => {
+    return this.__get(uri, query).then(async results => {
+      const { headers } = results
+      const totalPages = parseInt(headers["x-total-pages"]) || 1
+
+      let page = 1
+      let allResults = results
+
+      while (totalPages > page) {
+        page += 1
+
+        const nextPageResults = await this.__get(uri, { ...query, page })
+        allResults = allResults.concat(nextPageResults)
+      }
+
+      return Promise.resolve(allResults)
+    })
+  }
 }
 
 module.exports = GitLab

tasks/unapproved.js tasks/Unapproved.js

@@ -41,8 +41,19 @@ class Unapproved extends BaseCommand {
     const link = `[${request.title}](${request.web_url})`
     const author = `@${request.author.username}`
     const project = `[${request.project.name}](${request.project.web_url})`
+    const unresolvedAuthors = this.__unresolvedAuthorsString(request)
+    const approvedBy = this.__approvedByString(request)
 
-    return `${reaction} **${link}** (${project}) by **${author}**`
+    let message = [`${reaction} **${link}** (${project}) by **${author}**`]
+
+    if (unresolvedAuthors.length > 0) {
+      message.push(`unresolved threads by: ${unresolvedAuthors}`)
+    }
+    if (approvedBy.length > 0) {
+      message.push(`already approved by: ${approvedBy}`)
+    }
+
+    return message.join("\n")
   }
 
   __getEmoji = lastUpdate => {
@@ -89,6 +100,44 @@ class Unapproved extends BaseCommand {
   __appendDiscussions = (project, request) => this.gitlab
     .discussions(project.id, request.iid)
     .then(discussions => ({ ...request, discussions }))
+
+  __unresolvedAuthorsString = request => {
+    return this.__unresolvedAuthorsFor(request).map(author => {
+      return `@${author.username}`
+    }).join(", ")
+  }
+
+  __approvedByString = request => {
+    return request.approved_by.map(approve => {
+      const { user } = approve
+
+      return `@${user.username}`
+    }).join(", ")
+  }
+
+  __unresolvedAuthorsFor = request => {
+    const { discussions } = request
+
+    const userNames = _.flow(
+      _.partialRight(
+        _.filter,
+        discussion => discussion.notes.some(
+          note => note.resolvable && !note.resolved
+        )
+      ),
+      _.partialRight(
+        _.map,
+        discussion => discussion.notes.map(note => note.author)
+      ),
+      _.partialRight(_.flatten),
+      _.partialRight(
+        _.uniqBy,
+        author => author.username
+      ),
+    )
+
+    return userNames(discussions)
+  }
 }
 
 module.exports = Unapproved

utils/network.js

@@ -14,7 +14,8 @@ const get = (uri, params = {}, headers = {}) => new Promise((resolve, reject) =>
 
     resp.on("data", chunk => (data += chunk))
     resp.on("end", () => {
-      const json = JSON.parse(data)
+      let json = JSON.parse(data)
+      json.headers = resp.headers
       resolve(json)
     })
   }).on("error", reject)