@@ -197,8 +197,8 @@ sub startup {

       table => 'collaboration',

       primary_key => 'row_id',

       join => [

-        'left join user on collaboration.collaborator = user.row_id',

-        'left join project on collaboration.project = project.row_id'

+        'left join user on collaboration.user = user.row_id',

+        'left join project on collaboration.project = project.row_id',

       ]

     },

     {

@@ -175,7 +175,7 @@ unless ($new_collaboration_count) {

       where => {id => $old_collaboration->{collaborator_id}}

     )->value;

     if (defined $user_row_id) {

-      $new_collaboration->{collaborator} = $user_row_id;

+      $new_collaboration->{user} = $user_row_id;

     }

     else {

       next;

@@ -65,8 +65,7 @@ EOS

   eval { $dbi->select([qw/row_id id admin password salt email name/], table => 'user') };

   if ($@) {

     my $error = "Can't create user table properly: $@";

-    $self->app->log->error($error);

-    croak $error;

+    die $error;

   }

   # Create project table

@@ -103,8 +102,7 @@ EOS

   };

   if ($@) {

     my $error = "Can't create project table properly: $@";

-    $self->app->log->error($error);

-    croak $error;

+    die $error;

   }

   # Create ssh_public_key table

@@ -131,8 +129,7 @@ EOS

   eval { $dbi->select([qw/row_id user key title/], table => 'ssh_public_key') };

   if ($@) {

     my $error = "Can't create ssh_public_key table properly: $@";

-    $self->app->log->error($error);

-    croak $error;

+    die $error;

   }

   # Create collaboration table

@@ -141,19 +138,18 @@ EOS

 create table collaboration (

   row_id integer primary key autoincrement,

   project integer not null default 0,

-  collaborator integer not null default 0,

-  unique(project, collaborator)

+  user integer not null default 0,

+  unique(project, user)

 );

 EOS

     $dbi->execute($sql);

   };

   # Check collaboration table

-  eval { $dbi->select([qw/row_id project collaborator/], table => 'collaboration') };

+  eval { $dbi->select([qw/row_id project user/], table => 'collaboration') };

   if ($@) {

     my $error = "Can't create collaboration table properly: $@";

-    $self->app->log->error($error);

-    croak $error;

+    die $error;

   }

   # Create pull_request table

@@ -185,7 +181,6 @@ EOS

   eval { $dbi->select([qw/row_id project branch1 branch2 title open open_time open_user/], table => 'pull_request') };

   if ($@) {

     my $error = "Can't create pull_request table properly: $@";

-    $self->app->log->error($error);

-    croak $error;

+    die $error;

   }

 }

@@ -5,19 +5,18 @@

   # Parameters

   my $op = param('op') || '';

-  my $user = param('user') || '';

+  my $user_id = param('user') || '';

   my $project_id = param('project');

   # Authentication

-  unless ($api->logined($user)) {

+  unless ($api->logined($user_id)) {

     $self->redirect_to('/');

     return;

   }

-  my $user_row_id = app->dbi->model('user')->select('row_id', where => {id => $user})->value;

-  my $project_id_row_id = app->dbi->model('project')->model('project')->select(

-    'row_id',

-    where => {user => $user_row_id, id => $project_id}

+  my $project_row_id = app->dbi->model('project')->select(

+    'project.row_id',

+    where => {'user.id' => $user_id, 'project.id' => $project_id}

   )->value;

   # Rename project

@@ -25,7 +24,7 @@

   my $errors;

   if (lc $self->req->method eq 'post') {

     if ($op eq 'add') {

-      my $collaborator = param('collaborator');

+      my $collaborator_id = param('collaborator');

       # Validator

       my $vc = app->vc;

@@ -34,29 +33,39 @@

       my $validation = $vc->validation;

       # collaborator check

-      if (!length $collaborator) {

+      if (!length $collaborator_id) {

         $validation->add_failed(collaborator => "collaborator is empty");

       }

-      elsif ($collaborator eq $user) {

-        $validation->add_failed(collaborator => "User $collaborator is yourself");

+      elsif ($collaborator_id eq $user_id) {

+        $validation->add_failed(collaborator => "User $collaborator_id is yourself");

       }

       else {

         my $row = app->dbi->model('user')->select(

-          where => {id => $collaborator}

+          where => {id => $collaborator_id}

         )->one;

         if (!$row) {

-          $validation->add_failed(collaborator => "User $collaborator don't exists");

+          $validation->add_failed(collaborator => "User $collaborator_id don't exists");

+        }

+        else {

+          my $row = app->dbi->model('collaboration')->select(

+            where => {project => $project_row_id, 'user.id' => $collaborator_id}

+          )->one;

+          if ($row) {

+            $validation->add_failed(collaborator => "Collaborator $collaborator_id already exists");

+          }

         }

       }

       if ($validation->is_valid) {

+        my $collaborator_row_id = $api->get_user_row_id($collaborator_id);

+        

         # Insert

         eval {

           app->dbi->model('collaboration')->insert(

             {

-              project => $project_id_row_id,

-              collaborator => $collaborator

+              project => $project_row_id,

+              user => $collaborator_row_id

             }

           );

         };

@@ -65,7 +74,7 @@

           $errors = ['Internal Error'];

         }

         else {

-          flash(message => "Collaborator $collaborator is added.");

+          flash(message => "Collaborator $collaborator_id is added.");

           $self->redirect_to('current');

           return;

         }

@@ -75,15 +84,16 @@

       }

     }

     elsif ($op eq 'remove') {

-      my $collaborator = param('collaborator');

+      my $collaborator_id = param('collaborator');

+      

+      my $collaborator_row_id = $api->get_user_row_id($collaborator_id);

       # Delete

       eval {

         app->dbi->model('collaboration')->delete(

           where => {

-            user_id => $user,

-            project_name => $project_id,

-            collaborator_id => $collaborator

+            project => $project_row_id,

+            user => $collaborator_row_id

           }

         );

       };

@@ -92,7 +102,7 @@

         $errors = ['Internal Error'];

       }

       else {

-        flash(message => "Collaborator $collaborator is removed.");

+        flash(message => "Collaborator $collaborator_id is removed.");

         $self->redirect_to('current');

         return;

       }

@@ -100,10 +110,12 @@

   }

   my $collaborators = app->dbi->model('collaboration')->select(

-    'collaborator_id',

-    where => {user_id => $user, project_name => $project_id},

-    append => 'order by collaborator_id'

-  )->values;

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

+    where => {project => $project_row_id},

+    append => 'order by collaboration.user'

+  )->all;

+  

+  use D;d [$user_id, $project_id, $collaborators];

 %>

 % layout 'common', title => 'Collaboration';

@@ -117,7 +129,7 @@

     <div class="project-settings">

       <div class="left">

         <ul>

-          <li><a href="<%= url_for("/$user/$project_id/settings") %>">Options</a></li>

+          <li><a href="<%= url_for("/$user_id/$project_id/settings") %>">Options</a></li>

           <li><b>Collaborators</b></li>

         </ul>

       </div>

@@ -129,9 +141,9 @@

                 % for my $collaborator (@$collaborators) {

                   <tr>

                     <td>

-                      <a href="<%= url_for("/$collaborator") %>"><%= $collaborator %></a>

+                      <a href="<%= url_for("/$collaborator->{'user.id'}") %>"><%= $collaborator->{'user.id'} %></a>

                       <form action="<%= url_for->query(op => 'remove') %>" method="post" style="display:inline-block">

-                        <%= hidden_field 'collaborator' => $collaborator %>

+                        <%= hidden_field 'collaborator' => $collaborator->{'user.id'} %>

                         (<a href="javascript:void(0)" onclick="$(this).closest('form').submit();" style="color:red">remove</a>)

                       </form>

                     </td>