refactor(SystemStreamRepo):

src/Renderer/Fragment/Issues/IssuesFragment.tsx

@@ -7,13 +7,15 @@ import {StreamEvent} from '../../Event/StreamEvent';
 import {LibraryStreamEvent} from '../../Event/LibraryStreamEvent';
 import {IssueRepo} from '../../Repository/IssueRepo';
 import {IssueEvent} from '../../Event/IssueEvent';
-import {SystemStreamId, SystemStreamRepo} from '../../Repository/SystemStreamRepo';
+import {SystemStreamId} from '../../Repository/SystemStreamRepo';
 import {StreamRepo} from '../../Repository/StreamRepo';
 import {WebViewEvent} from '../../Event/WebViewEvent';
 import {FilterHistoryRepo} from '../../Repository/FilterHistoryRepo';
 import {ColorUtil} from '../../Util/ColorUtil';
 import {GARepo} from '../../Repository/GARepo';
 import {ConfigRepo} from '../../Repository/ConfigRepo';
+import {StreamPolling} from '../../Infra/StreamPolling';
+import {SubscriptionIssuesRepo} from '../../Repository/SubscriptionIssuesRepo';
 
 const remote = electron.remote;
 
@@ -236,7 +238,10 @@ export class IssuesFragment extends React.Component<any, State> {
 
   async _unsubscribe(issue) {
     const url = issue.html_url;
-    await SystemStreamRepo.unsubscribe(url);
+    const {error} = await SubscriptionIssuesRepo.unsubscribe(url);
+    if (error) return console.error(error);
+    await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
+    SystemStreamEvent.emitRestartAllStreams();
     await this._loadIssues();
   }
 

src/Renderer/Fragment/Stream/SystemStreamsFragment.tsx

@@ -10,6 +10,8 @@ import {IssueRepo} from '../../Repository/IssueRepo';
 import {ModalSystemStreamSettingFragment} from './ModalSystemStreamSettingFragment'
 import {GARepo} from '../../Repository/GARepo';
 import {ConfigRepo} from '../../Repository/ConfigRepo';
+import {StreamPolling} from '../../Infra/StreamPolling';
+import {SubscriptionIssuesRepo} from '../../Repository/SubscriptionIssuesRepo';
 
 const remote = electron.remote;
 const MenuItem = remote.MenuItem;
@@ -122,7 +124,11 @@ export class SystemStreamsFragment extends React.Component<any, State> {
     dialog.close();
     SystemStreamEvent.emitCloseSubscriptionSetting();
 
-    await SystemStreamRepo.subscribe(url);
+    const {error} = await SubscriptionIssuesRepo.subscribe(url);
+    if (error) return console.error(error);
+
+    await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
+    SystemStreamEvent.emitRestartAllStreams();
     await this._loadStreams();
 
     const stream = this.state.streams.find((stream)=> stream.id === SystemStreamId.subscription);

src/Renderer/Repository/SubscriptionIssuesRepo.ts

@@ -1,5 +1,13 @@
 import {DBIPC} from '../../IPC/DBIPC';
 import {SubscriptionIssueEntity} from '../Type/SubscriptionIssueEntity';
+import {ConfigRepo} from './ConfigRepo';
+import {GitHubClient} from '../Infra/GitHubClient';
+import {IssueRepo} from './IssueRepo';
+import {StreamIssueRepo} from './StreamIssueRepo';
+import {StreamPolling} from '../Infra/StreamPolling';
+import {SystemStreamEvent} from '../Event/SystemStreamEvent';
+import {SystemStreamId} from './SystemStreamRepo';
+import {DateUtil} from '../Util/DateUtil';
 
 class _SubscriptionIssuesRepo {
   async getAllSubscriptionIssues(): Promise<{error?: Error; subscriptionIssues?: SubscriptionIssueEntity[]}>{
@@ -8,6 +16,68 @@ class _SubscriptionIssuesRepo {
 
     return {subscriptionIssues: rows};
   }
+
+  private async getSubscriptionIssue(url: string): Promise<{error?: Error; subscriptionIssue?: SubscriptionIssueEntity}> {
+    const {error, row} = await DBIPC.selectSingle<SubscriptionIssueEntity>('select * from subscription_issues where url = ?', [url]);
+    if (error) return {error};
+
+    return {subscriptionIssue: row};
+  }
+
+  async subscribe(url): Promise<{error?: Error}> {
+    // check already
+    const {error: e1, subscriptionIssue} = await this.getSubscriptionIssue(url);
+    if (e1) return {error: e1};
+    if (subscriptionIssue) return;
+
+    // get issue
+    const {repo, issueNumber} = this.getRepoAndIssueNumber(url);
+    const github = ConfigRepo.getConfig().github;
+    const client = new GitHubClient(github.accessToken, github.host, github.pathPrefix, github.https);
+    const res = await client.request(`/repos/${repo}/issues/${issueNumber}`);
+    if (res.error) return {error: res.error};
+    const issue = res.body;
+
+    // create
+    await IssueRepo.import([issue]);
+    const {error} = await StreamIssueRepo.createBulk(SystemStreamId.subscription, [issue]);
+    if (error) return {error};
+
+    const createdAt = DateUtil.localToUTCString(new Date());
+    const {error: e2} = await DBIPC.exec(
+      `insert into subscription_issues (issue_id, repo, url, created_at) values (?, ?, ?, ?) `,
+      [issue.id, repo, url, createdAt]
+    );
+    if (e2) return {error: e2};
+
+    await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
+    SystemStreamEvent.emitRestartAllStreams();
+  }
+
+  async unsubscribe(url: string): Promise<{error?: Error}> {
+    // check not already
+    const {error: e1, subscriptionIssue} = await this.getSubscriptionIssue(url);
+    if (e1) return {error: e1};
+    if (!subscriptionIssue) return;
+
+    const {error: e2} = await DBIPC.exec('delete from subscription_issues where url = ?', [url]);
+    if (e2) return {error: e2};
+
+    const {error: e3} = await DBIPC.exec(
+      'delete from streams_issues where stream_id = ? and issue_id = ?',
+      [SystemStreamId.subscription, subscriptionIssue.issue_id]
+    );
+    if (e3) return {error: e3};
+
+    return {};
+  }
+
+  private getRepoAndIssueNumber(url: string): {repo: string; issueNumber: number} {
+    const urlPaths = url.split('/').reverse();
+    const repo = `${urlPaths[3]}/${urlPaths[2]}`;
+    const issueNumber = parseInt(urlPaths[0], 10);
+    return {repo, issueNumber};
+  }
 }
 
 export const SubscriptionIssuesRepo = new _SubscriptionIssuesRepo();

src/Renderer/Repository/SystemStreamRepo.ts

@@ -1,11 +1,4 @@
 import {DBIPC} from '../../IPC/DBIPC';
-import {StreamPolling} from '../Infra/StreamPolling';
-import {SystemStreamEvent} from '../Event/SystemStreamEvent';
-import {ConfigRepo} from './ConfigRepo';
-import {GitHubClient} from '../Infra/GitHubClient';
-import {IssueRepo} from './IssueRepo';
-import {StreamIssueRepo} from './StreamIssueRepo';
-import moment from 'moment';
 import {SystemStreamEntity} from '../Type/SystemStreamEntity';
 
 export enum SystemStreamId {
@@ -142,49 +135,49 @@ class _SystemStreamRepo {
     return !!res.row;
   }
 
-  async subscribe(url) {
-    const already = await this.isSubscription(url);
-    if (already) return;
-
-    const urlPaths = url.split('/').reverse();
-    const repo = `${urlPaths[3]}/${urlPaths[2]}`;
-    const number = urlPaths[0];
-
-    const github = ConfigRepo.getConfig().github;
-    const client = new GitHubClient(github.accessToken, github.host, github.pathPrefix, github.https);
-    const res = await client.request(`/repos/${repo}/issues/${number}`);
-    const issue = res.body;
-
-    await IssueRepo.import([issue]);
-    const {error} = await StreamIssueRepo.createBulk(SystemStreamId.subscription, [issue]);
-    if (error) return console.error(error);
-
-    const createdAt = moment(new Date()).utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
-    await DBIPC.exec(`
-      insert into
-        subscription_issues
-        (issue_id, repo, url, created_at)
-      values
-        (?, ?, ?, ?)
-    `, [issue.id, repo, url, createdAt]);
-
-    await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
-    SystemStreamEvent.emitRestartAllStreams();
-  }
-
-  async unsubscribe(url) {
-    const already = await this.isSubscription(url);
-    if (!already) return;
-
-    const {row: subscriptionIssue} = await DBIPC.selectSingle('select * from subscription_issues where url = ?', [url]);
-    await DBIPC.exec('delete from subscription_issues where url = ?', [url]);
-
-    await DBIPC.exec('delete from streams_issues where stream_id = ? and issue_id = ?', [SystemStreamId.subscription, subscriptionIssue.issue_id]);
+  // async subscribe(url) {
+  //   const already = await this.isSubscription(url);
+  //   if (already) return;
+  //
+  //   const urlPaths = url.split('/').reverse();
+  //   const repo = `${urlPaths[3]}/${urlPaths[2]}`;
+  //   const number = urlPaths[0];
+  //
+  //   const github = ConfigRepo.getConfig().github;
+  //   const client = new GitHubClient(github.accessToken, github.host, github.pathPrefix, github.https);
+  //   const res = await client.request(`/repos/${repo}/issues/${number}`);
+  //   const issue = res.body;
+  //
+  //   await IssueRepo.import([issue]);
+  //   const {error} = await StreamIssueRepo.createBulk(SystemStreamId.subscription, [issue]);
+  //   if (error) return console.error(error);
+  //
+  //   const createdAt = moment(new Date()).utc().format('YYYY-MM-DDTHH:mm:ss[Z]');
+  //   await DBIPC.exec(`
+  //     insert into
+  //       subscription_issues
+  //       (issue_id, repo, url, created_at)
+  //     values
+  //       (?, ?, ?, ?)
+  //   `, [issue.id, repo, url, createdAt]);
+  //
+  //   await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
+  //   SystemStreamEvent.emitRestartAllStreams();
+  // }
 
-    // SystemStreamLauncher.restartAll();
-    await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
-    SystemStreamEvent.emitRestartAllStreams();
-  }
+  // async unsubscribe(url) {
+  //   const already = await this.isSubscription(url);
+  //   if (!already) return;
+  //
+  //   const {row: subscriptionIssue} = await DBIPC.selectSingle('select * from subscription_issues where url = ?', [url]);
+  //   await DBIPC.exec('delete from subscription_issues where url = ?', [url]);
+  //
+  //   await DBIPC.exec('delete from streams_issues where stream_id = ? and issue_id = ?', [SystemStreamId.subscription, subscriptionIssue.issue_id]);
+  //
+  //   // SystemStreamLauncher.restartAll();
+  //   await StreamPolling.refreshSystemStream(SystemStreamId.subscription);
+  //   SystemStreamEvent.emitRestartAllStreams();
+  // }
 }
 
 export const SystemStreamRepo = new _SystemStreamRepo();