move new User model to the new model location

at the same time make my new download model stub more like existing
models

Author: jberger

lib/MetaCPAN/API/Model/Download.pm

@@ -1,10 +1,17 @@
 package MetaCPAN::API::Model::Download;
 
-use Mojo::Base -base;
+use MetaCPAN::Moose;
 
-use Carp ();
+use MetaCPAN::Types qw( Object );
 
-has es => sub { Carp::croak 'es is required' };
+has es => (
+    is       => 'ro',
+    isa      => Object,
+    handles  => { _run_query => 'search', },
+    required => 1,
+);
+
+__PACKAGE__->meta->make_immutable;
 
 1;
 

lib/MetaCPAN/Model/User.pm renamed to lib/MetaCPAN/API/Model/User.pm

@@ -1,10 +1,7 @@
-package MetaCPAN::Model::User;
+package MetaCPAN::API::Model::User;
 
 use MetaCPAN::Moose;
 
-use Log::Contextual qw( :log :dlog );
-use MooseX::StrictConstructor;
-
 use MetaCPAN::Types qw( Object );
 
 #use MetaCPAN::Util qw( single_valued_arrayref_to_scalar );
@@ -38,5 +35,7 @@ sub lookup {
     return $res->{hits}{hits}[0]{_source};
 }
 
+__PACKAGE__->meta->make_immutable;
+
 1;
 

lib/MetaCPAN/API/Plugin/Model.pm

@@ -6,9 +6,9 @@ use Carp ();
 
 # Models from the catalyst app
 use MetaCPAN::Model::Search ();
-use MetaCPAN::Model::User   ();
 
 # New models
+use MetaCPAN::API::Model::User     ();
 use MetaCPAN::API::Model::Download ();
 
 has app => sub { Carp::croak 'app is required' }, weak => 1;
@@ -28,7 +28,7 @@ has search => sub {
 
 has user => sub {
     my $self = shift;
-    return MetaCPAN::Model::User->new( es => $self->app->es );
+    return MetaCPAN::API::Model::User->new( es => $self->app->es );
 };
 
 sub register {