@@ -150,9 +150,9 @@ sub default_branch {

 }

 sub fork_project {

-  my ($self, $user_id, $original_user_id, $project_id) = @_;

+  my ($self, $forked_user_id, $user_id, $project_id) = @_;

-  my $original_user_row_id = $self->api->get_user_row_id($original_user_id);

+  my $user_row_id = $self->api->get_user_row_id($user_id);

   # Fork project

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

@@ -162,16 +162,14 @@ sub fork_project {

       # Original project id

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

-        ['row_id', 'private'],

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

+        {__MY__ => ['row_id', 'private']},

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

       )->one;

-      use D;d [$original_user_row_id, $project_id, $project];

-      

       # Create project

       eval {

         $self->_create_project(

-          $user_id,

+          $forked_user_id,

           $project_id,

           {

             original_project => $project->{row_id},

@@ -183,7 +181,7 @@ sub fork_project {

       # Create repository

       eval {

-        $self->_fork_rep($original_user_id, $project_id, $user_id, $project_id);

+        $self->_fork_rep($user_id, $project_id, $forked_user_id, $project_id);

       };

       croak $error = $@ if $@;

     });

@@ -220,17 +218,17 @@ sub api { shift->app->gitprep_api }

 sub member_projects {

   my ($self, $user_id, $project_id) = @_;

-  my $user_row_id = $self->api->get_user_row_id($user_id);

-  

   # DBI

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

-  # Original project id

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

-    ->select('row_id', where => {user => $user_row_id, id => $project_id})->value;

+  # project id

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

+    'project.row_id',

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

+  )->value;

   # Members

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

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

     [

       {__MY__ => ['id']},

       {user => ['id']}

@@ -241,7 +239,7 @@ sub member_projects {

     append => 'order by user.id, project.id'

   )->all;

-  return $members;

+  return $member_projects;

 }

 sub create_project {

@@ -209,7 +209,7 @@

                 my $branch = $branches->[$i];

                 my $bname = $branch->{name};

-                my $commit_author_mail = $branch->{commit}{author_email};

+                my $commit_author_email = $branch->{commit}{author_email};

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

                   'id',

                   where => {email => $commit_author_email}

@@ -6,7 +6,7 @@

   # Parameters

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

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

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

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

   # Authentication

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

@@ -15,9 +15,9 @@

   }

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

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

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

     'row_id',

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

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

   )->value;

   # Rename project

@@ -55,9 +55,8 @@

         eval {

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

             {

-              user_id => $user,

-              project_name => $project,

-              collaborator_id => $collaborator

+              project => $project_id_row_id,

+              collaborator => $collaborator

             }

           );

         };

@@ -83,7 +82,7 @@

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

           where => {

             user_id => $user,

-            project_name => $project,

+            project_name => $project_id,

             collaborator_id => $collaborator

           }

         );

@@ -102,7 +101,7 @@

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

     'collaborator_id',

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

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

     append => 'order by collaborator_id'

   )->values;

 %>

@@ -118,7 +117,7 @@

     <div class="project-settings">

       <div class="left">

         <ul>

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

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

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

         </ul>

       </div>

@@ -17,10 +17,7 @@ my $data_dir =  $ENV{GITPREP_DATA_DIR} = "$FindBin::Bin/basic";

 $ENV{GITPREP_NO_MYCONFIG} = 1;

-use Gitprep;

-

-my $app = Gitprep->new;

-$app->manager->setup_database;

+my $app = Mojo::Server->new->load_app("$FindBin::Bin/../script/gitprep");

 my $t = Test::Mojo->new($app);