Move the issue filter function

Author: alexcanessa

lib/src/Gren.js

@@ -183,7 +183,7 @@ class Gren {
     _createRelease(releaseOptions) {
         const loaded = utils.task(this, 'Preparing the release');
 
-        return this.repo._createRelease(releaseOptions)
+        return this.repo.createRelease(releaseOptions)
             .then(response => {
                 loaded();
                 const release = response.data;
@@ -600,21 +600,6 @@ class Gren {
         return ignoreIssuesWith.some(label => labels.map(({ name }) => name).includes(label));
     }
 
-    /**
-     * Filter the issue based on gren options and labels
-     *
-     * @since 0.9.0
-     * @private
-     *
-     * @param  {Object} issue
-     *
-     * @return {Boolean}
-     */
-    _filterIssue(issue) {
-        return !issue.pull_request && !this._lablesAreIgnored(issue.labels) &&
-            !((this.options.onlyMilestones || this.options.dataSource === 'milestones') && !issue.milestone);
-    }
-
     /**
      * Get all the closed issues from the current repo
      *
@@ -632,14 +617,10 @@ class Gren {
             state: 'closed',
             since: releaseRanges[releaseRanges.length - 1][1].date
         })
-            .then(response => {
+            .then(({ data }) => {
                 loaded();
 
-                const filteredIssues = response.data.filter(this._filterIssue.bind(this));
-
-                process.stdout.write(filteredIssues.length + ' issues found\n');
-
-                return filteredIssues;
+                return data;
             });
     }
 
@@ -723,6 +704,21 @@ class Gren {
         return this._templateGroups(groups);
     }
 
+    /**
+     * Filter the issue based on gren options and labels
+     *
+     * @since 0.9.0
+     * @private
+     *
+     * @param  {Object} issue
+     *
+     * @return {Boolean}
+     */
+    _filterIssue(issue) {
+        return !issue.pull_request && !this._lablesAreIgnored(issue.labels) &&
+            !((this.options.onlyMilestones || this.options.dataSource === 'milestones') && !issue.milestone);
+    }
+
     /**
      * Filter the issue based on the date range, or if is in the release
      * milestone.
@@ -763,9 +759,13 @@ class Gren {
         return this._getClosedIssues(releaseRanges)
             .then(issues => releaseRanges
                 .map(range => {
-                    const filteredIssues = issues.filter(this._filterBlockIssue.bind(this, range));
+                    const filteredIssues = issues
+                        .filter(this._filterIssue.bind(this))
+                        .filter(this._filterBlockIssue.bind(this, range));
                     const body = (!range[0].body || this.options.override) && this._groupBy(filteredIssues);
 
+                    process.stdout.write(filteredIssues.length + ' issues found\n');
+
                     return {
                         id: range[0].id,
                         release: range[0].name,