@@ -202,6 +202,29 @@ sub startup {

         'left join project as __project on collaboration.project = __project.row_id',

       ]

     },

+    {

+      table => 'issue',

+      join => [

+        'left join pull_request as __pull_request on issue.pull_request = __pull_request.row_id',

+        

+        'left join user as __open_user on issue.open_user = __open_user.row_id',

+        'left join project as __pull_request__base_project on __pull_request.base_project = __pull_request__base_project.row_id',

+        'left join user as __pull_request__base_project__user'

+          . ' on __pull_request__base_project.user = __pull_request__base_project__user.row_id',

+        'left join project as __pull_request__target_project on __pull_request.target_project = __pull_request__target_project.row_id',

+        'left join user as __pull_request__target_project__user'

+          . ' on __pull_request__target_project.user = __pull_request__target_project__user.row_id'

+

+      ]

+    },

+    {

+      table => 'issue_message',

+      primary_key => 'row_id',

+      join => [

+        'left join user as __user on issue_message.user = __user.row_id',

+        'left join issue as __issue on issue_message.issue = __issue.row_id'

+      ]

+    },

     {

       table => 'pull_request',

       primary_key => 'row_id',

@@ -215,14 +238,6 @@ sub startup {

           . ' on __target_project.user = __target_project__user.row_id'

       ]

     },

-    {

-      table => 'pull_request_message',

-      primary_key => 'row_id',

-      join => [

-        'left join user as __user on pull_request_message.user = __user.row_id',

-        'left join pull_request as __pull_request on pull_request_message.pull_request = __pull_request.row_id'

-      ]

-    }

   ];

   $dbi->create_model($_) for @$models;

   $dbi->setup_model;

@@ -98,7 +98,7 @@

             where => {id => $base_user_id}

           )->value;

-          my $new_pull_request_row_id;

+          my $new_issue_row_id;

           my $session_user_row_id = $api->session_user_row_id;

           app->dbi->connector->txn(sub {

             # New pull request

@@ -115,20 +115,20 @@

             app->dbi->model('pull_request')->insert($new_pull_request_params);

-            $new_pull_request_row_id = app->dbi->model('pull_request')->select(

+            $new_issue_row_id = app->dbi->model('issue')->select(

               'row_id',

               where => {

-                base_project => $project_row_id,

-                base_branch => $base_branch,

-                target_project => $target_project->{row_id},

-                target_branch => $target_branch

+                '__pull_request.base_project' => $project_row_id,

+                '__pull_request.base_branch' => $base_branch,

+                '__pull_request.target_project' => $target_project->{row_id},

+                '__pull_request.target_branch' => $target_branch

               }

             )->value;

             # Get pull request message number

-            my $number = app->dbi->model('pull_request_message')->select(

+            my $number = app->dbi->model('issue_message')->select(

               'max(number)',

-              where => {pull_request => $new_pull_request_row_id},

+              where => {issue => $new_issue_row_id},

               append => 'group by number'

             )->value;

@@ -137,8 +137,8 @@

             my $new_number = $number + 1;

             # New pull request message

-            my $new_pull_request_message_params = {

-              pull_request => $new_pull_request_row_id,

+            my $new_issue_message_params = {

+              issue => $new_issue_row_id,

               number => $new_number,

               message => $message,

               create_time => $now_epoch,

@@ -146,10 +146,10 @@

               user => $session_user_row_id

             };

-            app->dbi->model('pull_request_message')->insert($new_pull_request_message_params);

+            app->dbi->model('issue_message')->insert($new_issue_message_params);

           });

-          $self->redirect_to("/$base_user_id/$base_project_id/pull/$new_pull_request_row_id");

+          $self->redirect_to("/$base_user_id/$base_project_id/pull/$new_issue_row_id");

           return;

         }

       }

@@ -180,7 +180,7 @@

   my $end_commit = $git->get_commit($target_rep_info, $target_branch);

   # Pull request first message 

-  my $pull_request_message_first = app->dbi->model('pull_request_message')->select(

+  my $issue_message_first = app->dbi->model('issue_message')->select(

     [

       {__MY__ => '*'},

       {__user => ['id']}

@@ -308,14 +308,14 @@

         </ul>

         <div class="pull-comment">

           <div class="pull-comment-header">

-            <b><%= $pull_request_message_first->{'__open_user.id'} %></b>

+            <b><%= $issue_message_first->{'__open_user.id'} %></b>

             <span style="color:#767676">

               commented

-              <%= $api->age_string($pull_request_message_first->{update_time}) %>

+              <%= $api->age_string($issue_message_first->{update_time}) %>

             </span>

           </div>

           <div class="pull-comment-body">

-            <%= $pull_request_message_first->{message} %>

+            <%= $issue_message_first->{message} %>

           </div>

         </div>

@@ -13,20 +13,36 @@

   # Git

   my $git = $self->app->git;

-  # Pull requests

-  my $pull_requests = app->dbi->model('pull_request')->select(

+  # Issues which have pull request

+  my $issues = app->dbi->model('issue')->select(

     [

       {__MY__ => '*'},

-      {__open_user => ['id']}

+      {__open_user => ['id']},

+      {__pull_request => ['target_branch']}

     ],

-    where => {open => $open}

+    where => [

+      ['and', ':issue.open{=}', ':pull_request{<>}'],

+      {'issue.open' => $open, pull_request => 0}

+    ]

   )->all;

   # Open count

-  my $open_count = app->dbi->model('pull_request')->select('count(*)', where => {open => 1})->value;

+  my $open_count = app->dbi->model('issue')->select(

+    'count(*)',

+    where => [

+      ['and', ':issue.open{=}', ':pull_request{<>}'],

+      {'issue.open' => 1, pull_request => 0}

+    ]

+  )->value;

   # Close count

-  my $close_count = app->dbi->model('pull_request')->select('count(*)', where => {open => 0})->value;

+  my $close_count = app->dbi->model('issue')->select(

+    'count(*)',

+    where => [

+      ['and', ':issue.open{=}', ':pull_request{<>}'],

+      {'issue.open' => 0, pull_request => 0}

+    ]

+  )->value;

 %>

 % layout 'common', title => "Pull Requests Tags \x{30fb} $user_id/$project_id";

@@ -50,26 +66,26 @@

         % }

       </div>

       <div class="pulls-body">

-        % if (@$pull_requests) {

+        % if (@$issues) {

           <ul>

-            % for my $pull_request (@$pull_requests) {

+            % for my $issue (@$issues) {

               <%

-                my $target_branch = $pull_request->{target_branch};

+                my $target_branch = $issue->{'__pull_request.target_branch'};

                 my $commit = app->git->get_commit(app->rep_info($user_id, $project_id), $target_branch);

-                my $open_time = $pull_request->{open_time};

+                my $open_time = $issue->{open_time};

                 my $open_time_age = Time::Moment->now->epoch - $open_time;

                 my $open_time_age_string = $self->app->git->_age_string($open_time_age);

               %>

               <li>

                 <div class="pulls-title">

-                  <a href="<%= "/$user_id/$project_id/pull/$pull_request->{row_id}" %>">

-                    <b><%= $pull_request->{title} %></b>

+                  <a href="<%= "/$user_id/$project_id/pull/$issue->{row_id}" %>">

+                    <b><%= $issue->{title} %></b>

                   </a>

                 </div>

                 <div class="pulls-description">

-                  #<%= $pull_request->{row_id} %> <%= $pull_request->{open} ? 'opened' : 'closed' %>

+                  #<%= $issue->{row_id} %> <%= $issue->{open} ? 'opened' : 'closed' %>

                   <%= $open_time_age_string %>

-                  by <%= $pull_request->{'__open_user.id'} %>

+                  by <%= $issue->{'__open_user.id'} %>

                 </div>

               </li>

             % }