refactor(IssueRepo):

src/IPC/DBIPC.ts

@@ -28,8 +28,11 @@ type SQLRowReturn<T> = {
 };
 
 class _DBIPC {
+  private log: boolean = false;
+
   // exec
   async exec(sql: SQLParams['sql'], params?: SQLParams['params']): Promise<SQLRunReturn> {
+    if (this.log) console.log(sql, params);
     const p: SQLParams = {sql, params};
     return ipcRenderer.invoke(ChannelNames.exec, p);
   }
@@ -40,6 +43,7 @@ class _DBIPC {
 
   // select
   async select<T = any>(sql: SQLParams['sql'], params?: SQLParams['params']): Promise<SQLRowsReturn<T>> {
+    if (this.log) console.log(sql, params);
     const p: SQLParams = {sql, params};
     return ipcRenderer.invoke(ChannelNames.select, p);
   }
@@ -50,6 +54,7 @@ class _DBIPC {
 
   // selectSingle
   async selectSingle<T = any>(sql: SQLParams['sql'], params?: SQLParams['params']): Promise<SQLRowReturn<T>> {
+    if (this.log) console.log(sql, params);
     const p: SQLParams = {sql, params};
     return ipcRenderer.invoke(ChannelNames.selectSingle, p);
   }

src/Renderer/Infra/Stream.ts

@@ -34,7 +34,6 @@ export class Stream {
     if (this.hasError) return;
 
     // build search query
-    const searchedAt = DateUtil.localToUTCString(new Date());
     this.queries = await this.buildSearchQueries();
     if (!this.queries.length) return;
     const queries = this.queries.map(query =>{
@@ -46,8 +45,7 @@ export class Stream {
     });
 
     // 初回はデータを取りすぎないようにする
-    const {count: currentIssuesCount} = await StreamIssueRepo.totalCount(this.id);
-    const maxSearchingCount = currentIssuesCount === 0 ? PerPage : MaxSearchingCount;
+    const maxSearchingCount = this.searchedAt ? MaxSearchingCount : PerPage;
 
     // search
     const {error} = await this.search(queries, maxSearchingCount);
@@ -59,9 +57,9 @@ export class Stream {
 
     // すべて取得したときにsearchedAtを更新する
     if (this.queryIndex === 0 && this.page === 1) {
-      this.searchedAt = searchedAt;
+      this.searchedAt = DateUtil.localToUTCString(new Date());
       if (this.id > 0) { // hack:
-        const {error} = await StreamRepo.updateSearchedAt(this.id, searchedAt);
+        const {error} = await StreamRepo.updateSearchedAt(this.id, this.searchedAt);
         if (error) {
           console.error(error);
           this.hasError = true;
@@ -144,8 +142,7 @@ export class Stream {
       }
     }
 
-    const {updatedIssueIds} = await IssueRepo.import(issues);
-    const {error: e1} = await StreamIssueRepo.createBulk(this.id, issues);
+    const {error: e1, updatedIssueIds} = await IssueRepo.createBulk(this.id, issues);
     if (e1) return {error: e1};
 
     if (updatedIssueIds.length) {

src/Renderer/Repository/IssueRepo.ts

@@ -6,24 +6,37 @@ import moment from 'moment';
 import {IssueEvent} from '../Event/IssueEvent';
 import {IssueFilter} from './Issue/IssueFilter';
 import {IssueEntity} from '../Type/IssueEntity';
+import {RemoteIssueEntity} from '../Type/RemoteIssueEntity';
+import {GitHubUtil} from '../Util/GitHubUtil';
+import {StreamIssueRepo} from './StreamIssueRepo';
 
 // todo: refactor
 class _IssueRepo {
-  async getIssues(streamId: number): Promise<{error?: Error; issues?: IssueEntity[]}> {
-    const {error, rows} = await DBIPC.select<IssueEntity>(`
-      select
-        t1.*
-      from
-        issues as t1
-      inner join
-        streams_issues as t2 on t1.id = t2.issue_id
-      where
-        t2.stream_id = ?
-    `, [streamId]);
+  private async relations(issues: IssueEntity[]) {
+    for (const issue of issues) {
+      issue.value = JSON.parse(issue.value as any);
+      // // 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] : [];
+      // }
+    }
+  }
 
+  async getIssues(issueIds: number[]): Promise<{error?: Error; issues?: IssueEntity[]}> {
+    const {error, rows: issues} = await DBIPC.select<IssueEntity>(`select * from issues where id in (${issueIds.join(',')})`);
     if (error) return {error};
 
-    return {issues: rows};
+    await this.relations(issues);
+    return {issues};
+  }
+
+  async getIssue(issueId: number): Promise<{error?: Error; issue?: IssueEntity}> {
+    const {error, issues} = await this.getIssues([issueId]);
+    if (error) return {error};
+
+    return {issue: issues[0]};
   }
 
   async getTotalCount(): Promise<{error?: Error; count?: number}>{
@@ -49,47 +62,49 @@ class _IssueRepo {
     return {count: row.count};
   }
 
-  async import(issues: any[], defaultReadAt: string = null): Promise<{error?: Error; updatedIssueIds?: number[]}> {
+  async createBulk(streamId: number, issues: RemoteIssueEntity[]): Promise<{error?: Error; updatedIssueIds?: number[]}> {
     const updatedIds = [];
 
     for (const issue of issues) {
-      const paths = issue.url.split('/').reverse();
-      const user = paths[3];
-      const repo = `${paths[3]}/${paths[2]}`;
-
-      if (!issue.assignees) {
-        if (issue.assignee) {
-          issue.assignees = [JSON.parse(JSON.stringify(issue.assignee))];
-        } else {
-          issue.assignees = [];
-        }
-      }
-
-      const res = await DBIPC.selectSingle('select * from issues where id = ?', [issue.id]);
-      const currentIssue = res.row;
+      // const paths = issue.url.split('/').reverse();
+      // const user = paths[3];
+      // const repo = `${paths[3]}/${paths[2]}`;
+      const {repo, user} = GitHubUtil.getInfo(issue.url);
+
+      // if (!issue.assignees) {
+      //   if (issue.assignee) {
+      //     issue.assignees = [JSON.parse(JSON.stringify(issue.assignee))];
+      //   } else {
+      //     issue.assignees = [];
+      //   }
+      // }
+
+      const res = await this.getIssue(issue.id);
+      if (res.error) return {error: res.error};
+      const currentIssue = res.issue;
       const params = [
         issue.id,
         issue.pull_request ? 'pr' : 'issue',
         issue.title,
         issue.created_at,
         issue.updated_at,
-        issue.closed_at ? issue.closed_at : null,
-        currentIssue ? currentIssue.read_at : defaultReadAt,
+        issue.closed_at || null,
+        currentIssue?.read_at || null,
         issue.number,
         user,
         repo,
         issue.user.login, // author
         issue.assignees.length ? issue.assignees.map((assignee)=> `<<<<${assignee.login}>>>>`).join('') : null, // hack: assignees format
         issue.labels.length ? issue.labels.map((label)=> `<<<<${label.name}>>>>`).join('') : null, // hack: labels format
-        issue.milestone ? issue.milestone.title : null,
-        issue.milestone ? issue.milestone.due_on : null,
+        issue.milestone?.title || null,
+        issue.milestone?.due_on || null,
         issue.html_url,
         issue.body,
         JSON.stringify(issue)
       ];
 
       if (currentIssue) {
-        await DBIPC.exec(`
+        const {error} = await DBIPC.exec(`
           update
             issues
           set
@@ -115,9 +130,10 @@ class _IssueRepo {
             id = ${issue.id}
         `, params);
 
+        if (error) return {error};
         if (issue.updated_at > currentIssue.updated_at) updatedIds.push(issue.id);
       } else {
-        await DBIPC.exec(`
+        const {error} = await DBIPC.exec(`
           insert into
             issues
             (
@@ -144,23 +160,26 @@ class _IssueRepo {
             (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)
         `, params);
 
-        if (!defaultReadAt) updatedIds.push(issue.id);
+        if (error) return {error};
+        updatedIds.push(issue.id);
       }
     }
 
-    // see StreamsIssuesTable
+    // limit max records
     const max = ConfigRepo.getConfig().database.max;
-    await DBIPC.exec(`
-      delete from
-        issues
-      where
-        id in (select id from issues order by updated_at desc limit ${max}, 1000)
-    `);
+    await DBIPC.exec(`delete from issues where id in (select id from issues order by updated_at desc limit ${max}, 1000)`);
+
+    // create stream-issue
+    const issueIds = issues.map(issue => issue.id);
+    const res = await this.getIssues(issueIds);
+    if (res.error) return {error: res.error};
+    const {error} = await StreamIssueRepo.createBulk(streamId, res.issues);
+    if (error) return {error};
 
     return {updatedIssueIds: updatedIds};
   }
 
-  isRead(issue) {
+  isRead(issue: IssueEntity): boolean {
     return issue && issue.read_at !== null && issue.read_at >= issue.updated_at;
   }
 

src/Renderer/Repository/SubscriptionIssuesRepo.ts

@@ -3,11 +3,11 @@ 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';
+import {GitHubUtil} from '../Util/GitHubUtil';
 
 class _SubscriptionIssuesRepo {
   async getAllSubscriptionIssues(): Promise<{error?: Error; subscriptionIssues?: SubscriptionIssueEntity[]}>{
@@ -31,16 +31,15 @@ class _SubscriptionIssuesRepo {
     if (subscriptionIssue) return;
 
     // get issue
-    const {repo, issueNumber} = this.getRepoAndIssueNumber(url);
+    const {repo, issueNumber} = GitHubUtil.getInfo(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]);
+    const {error} = await IssueRepo.createBulk(SystemStreamId.subscription, [issue]);
     if (error) return {error};
 
     const createdAt = DateUtil.localToUTCString(new Date());
@@ -72,12 +71,12 @@ class _SubscriptionIssuesRepo {
     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};
-  }
+  // 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

@@ -130,10 +130,10 @@ class _SystemStreamRepo {
   //   return StreamPolling.getSystemStreamQueries(streamId);
   // }
 
-  async isSubscription(url) {
-    const res = await DBIPC.selectSingle('select * from subscription_issues where url = ?', [url]);
-    return !!res.row;
-  }
+  // async isSubscription(url) {
+  //   const res = await DBIPC.selectSingle('select * from subscription_issues where url = ?', [url]);
+  //   return !!res.row;
+  // }
 
   // async subscribe(url) {
   //   const already = await this.isSubscription(url);

src/Renderer/Type/IssueEntity.ts

@@ -1,3 +1,5 @@
+import {RemoteIssueEntity} from './RemoteIssueEntity';
+
 export type IssueEntity = {
   id: number;
   type: string;
@@ -21,5 +23,5 @@ export type IssueEntity = {
   body: string;
   read_body: string;
   prev_read_body: string;
-  value: string;
+  value: RemoteIssueEntity;
 }

src/Renderer/Type/RemoteIssueEntity.ts

@@ -0,0 +1,31 @@
+export type RemoteIssueEntity = {
+  id: number;
+  pull_request: any;
+  title: string;
+  number: number;
+  user: RemoteUserEntity;
+  labels: RemoteLabelEntity[];
+  milestone: RemoteMilestoneEntity;
+  created_at: string;
+  updated_at: string;
+  closed_at: string;
+  draft: boolean;
+  url: string;
+  html_url: string;
+  body: string;
+  assignees: RemoteUserEntity[];
+  assignee: RemoteUserEntity;
+}
+
+type RemoteUserEntity = {
+  login: string;
+}
+
+type RemoteLabelEntity = {
+  name: string;
+}
+
+type RemoteMilestoneEntity = {
+  title: string;
+  due_on: string;
+}

src/Renderer/Util/GitHubUtil.ts

@@ -0,0 +1,11 @@
+class _GitHubUtil {
+  getInfo(url: string): {repo: string; issueNumber: number, user: string} {
+    const urlPaths = url.split('/').reverse();
+    const repo = `${urlPaths[3]}/${urlPaths[2]}`;
+    const issueNumber = parseInt(urlPaths[0], 10);
+    const user = urlPaths[3];
+    return {repo, issueNumber, user};
+  }
+}
+
+export const GitHubUtil = new _GitHubUtil();