refactor(IssueRepo):

src/Renderer/Fragment/Issues/IssuesFragment.tsx

@@ -195,12 +195,20 @@ export class IssuesFragment extends React.Component<any, State> {
     let ids;
     if (this._libraryStreamName && type === 'library' && this._libraryStreamName === streamIdOrName) {
       ids = updatedIssueIds;
-    } else if (this._streamId !== null && type == 'system') {
-      const {error, issueIds} = await IssueRepo.includeIds(this._streamId, updatedIssueIds);
+    } else if (this._streamId !== null && this._streamId < 0) {
+      // todo: eventから受け取ったstreamを使えるようにする
+      const res = await SystemStreamRepo.getSystemStream(this._streamId);
+      if (res.error) return console.error(res.error);
+
+      const {error, issueIds} = await IssueRepo.includeIds(updatedIssueIds, this._streamId, res.systemStream.defaultFilter);
       if (error) return console.error(error);
       ids = issueIds;
-    } else if (this._streamId !== null && type == 'stream') {
-      const {error, issueIds} = await IssueRepo.includeIds(this._streamId, updatedIssueIds, this._filterQuery);
+    } else if (this._streamId !== null && this._streamId >= 0) {
+      // todo: eventから受け取ったstreamを使えるようにする
+      const res = await StreamRepo.getStream(this._streamId);
+      if (res.error) return console.error(res.error);
+
+      const {error, issueIds} = await IssueRepo.includeIds(updatedIssueIds, this._streamId, res.stream.defaultFilter, this._filterQuery);
       if (error) return console.error(error);
       ids = issueIds;
     } else {

src/Renderer/Repository/Issue/Issue.ts

@@ -1,99 +1,96 @@
-import {IssueFilter} from './IssueFilter';
-import {DBIPC} from '../../../IPC/DBIPC';
+// class _Issue {
+  // async findIssues(streamId, filterQuery = null, pageNumber = 0, perPage = 30) {
+  //   const sql = this._buildSQL();
+  //   let issues;
+  //   let totalCount;
+  //   const offset = pageNumber * perPage;
+  //
+  //   const extraCondition = IssueFilter.buildCondition(filterQuery);
+  //   if (extraCondition.filter) {
+  //     // hack
+  //     sql.issuesQuery = sql.issuesQuery.replace('where -- replace', `where ${extraCondition.filter} and`);
+  //     sql.countQuery = sql.countQuery.replace('where -- replace', `where ${extraCondition.filter} and`);
+  //   }
+  //   if (extraCondition.sort) {
+  //     // hack
+  //     sql.issuesQuery = sql.issuesQuery.replace(/order by\s+[\w\s]+/m, `order by ${extraCondition.sort}\n`);
+  //   }
+  //
+  //   const {row: temp} = await DBIPC.selectSingle(sql.countQuery, [streamId]);
+  //   totalCount = temp.count;
+  //
+  //   // hack: if pageNumber is negative, immediate return. because performance.
+  //   if (pageNumber < 0) return {totalCount};
+  //
+  //   const {rows} = await DBIPC.select(sql.issuesQuery + ` limit ${offset}, ${perPage}`, [streamId]);
+  //   issues = rows;
+  //   for (const issue of issues) {
+  //     const value = JSON.parse(issue.value);
+  //
+  //     // todo: this hack is for old github response
+  //     // we must add value.assignee before `issue.value = value`.
+  //     // because issue.value is setter/getter, so setter behavior is special.
+  //     if (!value.assignees) {
+  //       value.assignees = value.assignee ? [value.assignee] : [];
+  //     }
+  //
+  //     issue.value = value;
+  //   }
+  //
+  //   const hasNextPage = offset + perPage < totalCount;
+  //   return {issues, totalCount, hasNextPage};
+  // }
+  //
+  // _buildSQL() {
+  //   const issuesQuery = `
+  //     select
+  //       t1.*
+  //     from
+  //       issues as t1
+  //     inner join
+  //       streams_issues as t2 on t1.id = t2.issue_id
+  //     where -- replace
+  //       stream_id = ?
+  //       and archived_at is null
+  //     order by
+  //       updated_at desc
+  //   `;
+  //
+  //   const countQuery = `
+  //     select
+  //       count(1) as count
+  //     from
+  //       issues as t1
+  //     inner join
+  //       streams_issues as t2 on t1.id = t2.issue_id
+  //     where -- replace
+  //       stream_id = ?
+  //       and archived_at is null
+  //   `;
+  //
+  //   return {issuesQuery, countQuery};
+  // }
 
-class _Issue {
-  async findIssues(streamId, filterQuery = null, pageNumber = 0, perPage = 30) {
-    const sql = this._buildSQL();
-    let issues;
-    let totalCount;
-    const offset = pageNumber * perPage;
+  // async includeIds(streamId, issueIds, filter = null) {
+  //   let filterCondition = '';
+  //   if (filter) {
+  //     const tmp = IssueFilter.buildCondition(filter);
+  //     filterCondition = `inner join (select id from issues where ${tmp.filter}) as t2 on t1.issue_id = t2.id`;
+  //   }
+  //
+  //   const {rows: includedIssueIds} = await DBIPC.select(`
+  //     select
+  //       issue_id
+  //     from
+  //       streams_issues as t1
+  //     ${filterCondition}
+  //     where
+  //       stream_id = ? and
+  //       issue_id in (${issueIds.join(',')})
+  //   `, [streamId]);
+  //
+  //   return includedIssueIds.map((item)=> item.issue_id);
+  // }
+// }
 
-    const extraCondition = IssueFilter.buildCondition(filterQuery);
-    if (extraCondition.filter) {
-      // hack
-      sql.issuesQuery = sql.issuesQuery.replace('where -- replace', `where ${extraCondition.filter} and`);
-      sql.countQuery = sql.countQuery.replace('where -- replace', `where ${extraCondition.filter} and`);
-    }
-    if (extraCondition.sort) {
-      // hack
-      sql.issuesQuery = sql.issuesQuery.replace(/order by\s+[\w\s]+/m, `order by ${extraCondition.sort}\n`);
-    }
-
-    const {row: temp} = await DBIPC.selectSingle(sql.countQuery, [streamId]);
-    totalCount = temp.count;
-
-    // hack: if pageNumber is negative, immediate return. because performance.
-    if (pageNumber < 0) return {totalCount};
-
-    const {rows} = await DBIPC.select(sql.issuesQuery + ` limit ${offset}, ${perPage}`, [streamId]);
-    issues = rows;
-    for (const issue of issues) {
-      const value = JSON.parse(issue.value);
-
-      // todo: this hack is for old github response
-      // we must add value.assignee before `issue.value = value`.
-      // because issue.value is setter/getter, so setter behavior is special.
-      if (!value.assignees) {
-        value.assignees = value.assignee ? [value.assignee] : [];
-      }
-
-      issue.value = value;
-    }
-
-    const hasNextPage = offset + perPage < totalCount;
-    return {issues, totalCount, hasNextPage};
-  }
-
-  _buildSQL() {
-    const issuesQuery = `
-      select
-        t1.*
-      from
-        issues as t1
-      inner join
-        streams_issues as t2 on t1.id = t2.issue_id
-      where -- replace
-        stream_id = ?
-        and archived_at is null
-      order by
-        updated_at desc
-    `;
-
-    const countQuery = `
-      select
-        count(1) as count
-      from
-        issues as t1
-      inner join
-        streams_issues as t2 on t1.id = t2.issue_id
-      where -- replace
-        stream_id = ?
-        and archived_at is null
-    `;
-
-    return {issuesQuery, countQuery};
-  }
-
-  async includeIds(streamId, issueIds, filter = null) {
-    let filterCondition = '';
-    if (filter) {
-      const tmp = IssueFilter.buildCondition(filter);
-      filterCondition = `inner join (select id from issues where ${tmp.filter}) as t2 on t1.issue_id = t2.id`;
-    }
-
-    const {rows: includedIssueIds} = await DBIPC.select(`
-      select
-        issue_id
-      from
-        streams_issues as t1
-      ${filterCondition}
-      where
-        stream_id = ? and
-        issue_id in (${issueIds.join(',')})
-    `, [streamId]);
-
-    return includedIssueIds.map((item)=> item.issue_id);
-  }
-}
-
-export const Issue = new _Issue();
+// export const Issue = new _Issue();

src/Renderer/Repository/IssueRepo.ts

@@ -1,6 +1,5 @@
 import {DBIPC} from '../../IPC/DBIPC';
 import {ConfigRepo} from './ConfigRepo';
-import {Issue} from './Issue/Issue';
 import {LibraryIssue} from './Issue/LibraryIssue';
 import {IssueEvent} from '../Event/IssueEvent';
 import {IssueFilter} from './Issue/IssueFilter';
@@ -369,11 +368,30 @@ class _IssueRepo {
     return {};
   }
 
-  async includeIds(streamId: number, issueIds: number[], filter: string = null): Promise<{error?: Error; issueIds?: number[]}> {
-    const ids = await Issue.includeIds(streamId, issueIds, filter);
-    return {issueIds: ids};
+  async includeIds(issueIds: number[], streamId: number | null, defaultFilter: string, userFilter: string = ''): Promise<{error?: Error; issueIds?: number[]}> {
+    const cond = IssueFilter.buildCondition(`${userFilter} ${defaultFilter}`);
+    const sql = `
+      select
+        id
+      from
+        issues
+      where
+        ${cond.filter}
+        ${streamId !== null ? `and id in (select issue_id from streams_issues where stream_id = ${streamId})` : ''}
+        and id in (${issueIds.join(',')})
+    `;
+    const {error, rows} = await DBIPC.select<{id: number}>(sql);
+    if (error) return {error};
+
+    const includedIssueIds = rows.map(row => row.id);
+    return {issueIds: includedIssueIds};
   }
 
+  // async includeIds(streamId: number, issueIds: number[], filter: string = ''): Promise<{error?: Error; issueIds?: number[]}> {
+  //   const ids = await Issue.includeIds(streamId, issueIds, filter);
+  //   return {issueIds: ids};
+  // }
+
   private async buildSQL(streamId: number, filter: string, page: number, perPage: number): Promise<{issuesSQL: string; countSQL: string; unreadCountSQL: string}> {
     const cond = IssueFilter.buildCondition(filter);
     const wheres: string[] = [];