@@ -5,7 +5,7 @@ requires 'DBIx::Custom', '== 0.28';

 requires 'Config::Tiny', '== 2.14';

 requires 'Time::HiRes', '== 1.9725';

 requires 'Test::Simple', '== 0.98';

-requires 'Validator::Custom', '== 0.20';

+requires 'Validator::Custom', '== 0.22';

 requires 'DBIx::Connector', '== 0.53';

 requires 'Module::Build', '== 0.4003';

 requires 'Test::Harness', '== 3.26';

@@ -102,7 +102,8 @@ sub startup {

   my $models = [

     {table => 'user', primary_key => 'id'},

     {table => 'project', primary_key => ['user_id', 'name']},

-    {table => 'number', primary_key => 'key'}

+    {table => 'number', primary_key => 'key'},

+    {table => 'collaboration', primary_key => ['user_id', 'project_name', 'collaborator_id']}

   ];

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

@@ -346,6 +346,28 @@ EOS

     croak $error;

   }

+  # Create collaboration table

+  eval {

+    my $sql = <<"EOS";

+create table collaboration (

+  row_id integer primary key autoincrement,

+  user_id not null unique default '',

+  project_name not null unique default '',

+  collaborator_id not null unique default '',

+  unique(user_id, project_name, collaborator_id)

+);

+EOS

+    $dbi->execute($sql);

+  };

+  

+  # Check collaboration table

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

+  if ($@) {

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

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

+    croak $error;

+  }

+

   # Create number table

   eval {

     my $sql = <<"EOS";

@@ -2,10 +2,11 @@

   # API

   my $api = gitprep_api;

   my $manager = app->manager;

-  

+

   # Parameters

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

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

+  my $project = param('project');

   # Authentication

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

@@ -17,17 +18,52 @@

   my $git = app->git;

   my $errors;

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

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

-    

-    eval { $git->description($user, $project) };

-    if (my $e = $@) {

-      app->log->error(url_with . ": $e");

-      $errors = ['Internal Error'];

+    my $params = $api->params;

+    my $rule = [

+      collaborator => [

+        ['not_blank' => 'collaborator is empty.'],

+        # Check user

+        sub {

+          my $collaborator = shift || '';

+          

+          if ($collaborator eq $user) {

+            return {result => 0, message => "User $collaborator is yourself"};

+          }

+          else {

+            my $row = app->dbi->model('user')->select(id => $collaborator)->one;

+            

+            return $row ? 1 : {result => 0, message => "User $collaborator don't exists"};

+          }

+        }

+      ]

+    ];

+    my $vresult = app->validator->validate($params, $rule);

+    if ($vresult->is_ok) {

+      my $safe_params = $vresult->data;

+      my $collaborator = $safe_params->{collaborator};

+      

+      # Insert

+      eval {

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

+          {

+            user_id => $user,

+            project_name => $project,

+            collaborator_id => $collaborator

+          }

+        );

+      };

+      if (my $e = $@) {

+        app->log->error(url_with . ": $e");

+        $errors = ['Internal Error'];

+      }

+      else {

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

+        $self->redirect_to('current');

+        return;

+      }

     }

     else {

-      flash(message => 'Collaborator is added.');

-      $self->redirect_to('current');

-      return;

+      $errors = $vresult->messages;

     }

   }

 %>