Add paths to projects configuration (#12)

* Now it is possible to list project paths that needs to be changed

Author: basherru

README.md

@@ -50,12 +50,15 @@ messenger:
 gitlab:
   token: "<TOKEN>"                     # GitLab Private Access Token
   url: "<gitlab api url>"              # Gitlab API base url
-  projects:                            # List of your project ids (optional if groups are defined)
-  - 42
   groups:                              # List of your project’s groups (optional if projects are defined)
   - id: 4                              # Group id
     excluded: [1, 2, 3]                # List of projects to exclude from the current group projects (optional)
   - id: 5
+  projects:                            # List of your project (optional if groups are defined)
+  - id: 42                             # Project id
+    paths:                             # List of paths that should be changed in merge requests
+    - src/**/*
+  - id: 43
 
 # tasks config
 unapproved:                            # Config for `unapproved` command

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@umbrellio/gbot",
-  "version": "1.6.0",
+  "version": "1.7.0",
   "bin": "gbot",
   "repository": "git@github.com:umbrellio/gbot.git",
   "author": "Aleksei Bespalov <nulldefiner@gmail.com>",
@@ -13,6 +13,7 @@
   "dependencies": {
     "js-yaml": "^4.1.0",
     "lodash": "^4.17.21",
+    "minimatch": "^5.1.0",
     "winston": "^3.3.3",
     "yargs": "^17.3.0"
   },

tasks/BaseCommand.js

@@ -19,23 +19,27 @@ class BaseCommand {
 
   get projects () {
     const configProjects = _.get(this.config, "gitlab.projects", [])
-    const groups = _.get(this.config, "gitlab.groups")
+    const groups = _.get(this.config, "gitlab.groups", [])
 
     if (_.isEmpty(configProjects) && _.isEmpty(groups)) {
       throw new Error("You should provide projects or groups in your config")
     }
 
     if (_.isEmpty(groups)) return Promise.resolve(configProjects)
 
-    const promises = groups.map(group => {
-      return this.gitlab.groupProjects(group.id).then(groupProjects => {
-        const excludeProjects = group.excluded || []
-        return groupProjects.filter(p => !excludeProjects.includes(p))
-      })
-    })
+    const promises = groups.map(({ id, excluded = [] }) => (
+      this.gitlab.groupProjects(id).then(groupProjects => (
+        groupProjects.filter(p => !excluded.includes(p))
+      ))
+    ))
 
-    return Promise.all(promises)
-      .then(projects => _.uniq([...configProjects, ...projects.flat()]))
+    const mergeProjects = _.flow([
+      groupProjects => groupProjects.flat().map(id => ({ id })),
+      groupProjects => [...configProjects, ...groupProjects],
+      totalProjects => _.uniqBy(totalProjects, ({ id }) => id),
+    ])
+
+    return Promise.all(promises).then(mergeProjects)
   }
 }
 

tasks/Unapproved.js

@@ -1,4 +1,5 @@
 const _ = require("lodash")
+const minimatch = require("minimatch")
 
 const BaseCommand = require("./BaseCommand")
 const UnapprovedRequestDescription = require("./unapproved/UnapprovedRequestDescription")
@@ -42,16 +43,15 @@ class Unapproved extends BaseCommand {
       const header = markup.makeHeader(headText)
       const bodyParts = markup.flatten(list)
 
-      const message = markup.composeMsg(header, bodyParts)
-      return message
+      return markup.composeMsg(header, bodyParts)
     } else {
       const headText = "Hey, there is a couple of nothing"
       const bodyText = "There are no pending requests! Let's do a new one!"
 
       const header = markup.makeHeader(headText)
       const body = markup.makePrimaryInfo(markup.makeText(bodyText))
-      const message = markup.composeMsg(header, body)
-      return message
+
+      return markup.composeMsg(header, body)
     }
   }
 
@@ -61,16 +61,30 @@ class Unapproved extends BaseCommand {
     return descriptionBuilder.build()
   }
 
-  __getUnapprovedRequests = projectId => this.__getExtendedRequests(projectId)
+  __getUnapprovedRequests = project => this.__getExtendedRequests(project.id)
     .then(requests => requests.filter(req => {
       const isCompleted = !req.work_in_progress
       const isUnapproved = req.approvals_left > 0
       const hasUnresolvedDiscussions = req.discussions.some(dis => {
         return dis.notes.some(note => note.resolvable && !note.resolved)
       })
-      return isCompleted && (isUnapproved || hasUnresolvedDiscussions)
+      const hasPathsChanges = this.__hasPathsChanges(req.changes, project.paths)
+
+      return isCompleted && hasPathsChanges && (isUnapproved || hasUnresolvedDiscussions)
     }))
 
+  __hasPathsChanges = (changes, paths) => {
+    if (_.isEmpty(paths)) {
+      return true
+    }
+
+    return changes.some(change => (
+      paths.some(path => (
+        minimatch(change.old_path, path) || minimatch(change.new_path, path)
+      ))
+    ))
+  }
+
   __getExtendedRequests = projectId => this.gitlab
     .project(projectId)
     .then(project => this.gitlab.requests(project.id).then(requests => {

yarn.lock

@@ -340,6 +340,13 @@ brace-expansion@^1.1.7:
     balanced-match "^1.0.0"
     concat-map "0.0.1"
 
+brace-expansion@^2.0.1:
+  version "2.0.1"
+  resolved "https://registry.yarnpkg.com/brace-expansion/-/brace-expansion-2.0.1.tgz#1edc459e0f0c548486ecf9fc99f2221364b9a0ae"
+  integrity sha512-XnAIvQ8eM+kC6aULx6wuQiwVsnzsi9d3WxzV3FpWTGA19F621kwdbsAcFKXgKUHZWsy+mY6iL1sHTxWEFCytDA==
+  dependencies:
+    balanced-match "^1.0.0"
+
 browserslist@^4.17.5:
   version "4.18.1"
   resolved "https://registry.yarnpkg.com/browserslist/-/browserslist-4.18.1.tgz#60d3920f25b6860eb917c6c7b185576f4d8b017f"
@@ -1209,6 +1216,13 @@ minimatch@^3.0.4:
   dependencies:
     brace-expansion "^1.1.7"
 
+minimatch@^5.1.0:
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/minimatch/-/minimatch-5.1.0.tgz#1717b464f4971b144f6aabe8f2d0b8e4511e09c7"
+  integrity sha512-9TPBGGak4nHfGZsPBohm9AWg6NoT7QTCehS3BIJABslyZbzxfV78QM2Y6+i741OPZIafFAaiiEMh5OyIrJPgtg==
+  dependencies:
+    brace-expansion "^2.0.1"
+
 minimist@^1.2.0, minimist@^1.2.5:
   version "1.2.5"
   resolved "https://registry.yarnpkg.com/minimist/-/minimist-1.2.5.tgz#67d66014b66a6a8aaa0c083c5fd58df4e4e97602"