Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
43 changes: 40 additions & 3 deletions src/MGRAST/lib/JobDB/Job.pm
Original file line number Diff line number Diff line change
Expand Up @@ -1230,29 +1230,66 @@ sub user_delete {
return (0, "Unable to delete metagenome '$mgid' because it is still processing.");
}

if($self->primary_project) {
# remove from project
if ($self->primary_project) {
$self->primary_project->remove_job($self);
}

# using argument 0 does not work, argument 'null' sets viewable to 0
$self->viewable('null');

# set status as deleted
$jobdbm->JobAttributes->create({ job => $self, tag => 'deleted', value => 'deleted by ' . $user->login });

# delete rights
my $webappdb = DBMaster->new(-database => $Conf::webapplication_db,
-backend => $Conf::webapplication_backend,
-host => $Conf::webapplication_host,
-user => $Conf::webapplication_user);

my $job_rights = $webappdb->Rights->get_objects( { data_type => 'metagenome', data_id => $mgid } );
foreach my $r (@$job_rights) {
$r->delete;
}

# delete analysis tables
use MGRAST::Analysis;
my $analysisDB = MGRAST::Analysis->new($self->_master->db_handle);
my $analysisDB = MGRAST::Analysis->new($self->_master->db_handle);
$analysisDB->delete_job($self->job_id);

######## delete shock nodes ##########

# get mgrast auth
my $mgrast_token = undef;
if ($Conf::mgrast_oauth_name && $Conf::mgrast_oauth_pswd) {
my $key = encode_base64($Conf::mgrast_oauth_name.':'.$Conf::mgrast_oauth_pswd);
my $rep = Auth::globus_token($key);
$mgrast_token = $rep ? $rep->{access_token} : undef;
}

# get shock nodes
my $agent = LWP::UserAgent->new;
my $json = JSON->new;
$json = $json->utf8();
$json->max_size(0);
$json->allow_nonref;

my @auth = ('Authorization', "OAuth ".$mgrast_token);
my $nodes = [];
eval {
my $get = $agent->get($Conf::shock_url.'/node?query&limit=0&type=metagenome&id=mgm'.$self->metagenome_id, @auth);
$nodes = $json->decode( $get->content )->{data};
};

# delete nodes
if ($@) {
print STDERR "unable to retrieve shock nodes for metagenome: ".$self->metagenome_id."\n";
} else {
# modify shock nodes
foreach my $n (@$nodes) {
$agent->delete($Conf::shock_url.'/node/'.$n->{id}, @auth);
}
}

return (1, "");
}

Expand Down
10 changes: 6 additions & 4 deletions src/MGRAST/lib/WebPage/DownloadMetagenome.pm
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ sub init {
$self->data('default', $default);

# api info for download
$self->data('api', $Conf::cgi_url."api.cgi");
$self->data('api', "http://api.metagenomics.anl.gov");

# get to metagenome using the metagenome ID
if ( $cgi->param('metagenome') ) {
Expand Down Expand Up @@ -224,9 +224,9 @@ my $css_tmp = qq~
# get download info from API
my $response = undef;
my $agent = LWP::UserAgent->new;
my $auth = ($user && (! $job->public)) ? $Conf::api_key : '';
my $url = $self->data('api')."/download/mgm".$mid;
my $json = JSON->new;
my $auth = ($user && (! $job->public)) ? $Conf::api_key : '';
my $url = $self->data('api')."/download/mgm".$mid;
my $json = JSON->new;
$json = $json->utf8();
$json->max_size(0);
$json->allow_nonref;
Expand All @@ -237,8 +237,10 @@ my $css_tmp = qq~
};
if ($@ || (! ref($response))) {
$self->application->add_message('warning', "Could not retrieve file list: ".$@);
return 1;
} elsif (exists($response->{ERROR}) && $response->{ERROR}) {
$self->application->add_message('warning', "Could not retrieve file list: ". $response->{ERROR});
return 1;
}

# group by ID
Expand Down
49 changes: 28 additions & 21 deletions src/MGRAST/lib/WebPage/PublishGenome.pm
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,13 @@ package MGRAST::WebPage::PublishGenome;

use strict;
use warnings;
no warnings('once');

use MGRAST::Metadata;
use Data::Dumper;

use JSON;
use LWP::UserAgent;
use Auth;
use MIME::Base64;
use Data::Dumper;

use WebConfig;
use base qw( WebPage );
Expand Down Expand Up @@ -60,6 +59,10 @@ sub init {
$self->app->error("Unable to retrieve the job '$id'.");
return;
}

# api info for making public
$self->data('api', "http://api.metagenomics.anl.gov");

$self->data('job', $job);
$self->data('linkin', "http://metagenomics.anl.gov/linkin.cgi?metagenome=$id");
}
Expand Down Expand Up @@ -235,27 +238,31 @@ sub publish {
my $body = "Dear $uname,\n\nYour metagenome '" . $job->name . "' ($mg_id) is now public. You can link to the metagenome using:\n" . $self->data('linkin') .
"\n\nThis is an automated message. Please contact mg-rast\@mcs.anl.gov if you have any questions or concerns.";

######## make public in mysql ##########
$job->public(1);

######## make public in shock ##########
my $mgrast_token = undef;
if ($Conf::mgrast_oauth_name && $Conf::mgrast_oauth_pswd) {
my $key = encode_base64($Conf::mgrast_oauth_name.':'.$Conf::mgrast_oauth_pswd);
my $rep = Auth::globus_token($key);
$mgrast_token = $rep ? $rep->{access_token} : undef;
}
# get shock nodes
######## use API to make public ##########
my $response = undef;
my $agent = LWP::UserAgent->new;
my @args = ('Authorization', "OAuth ".$mgrast_token);
my $nodes = [];
my $json = JSON->new;
$json = $json->utf8();
$json->max_size(0);
$json->allow_nonref;

my $url = $self->data('api')."/job/public";
my @args = (
($user && (! $job->public)) ? ('auth', $Conf::api_key) : (),
'Content_Type', 'multipart/form-data',
'Content', {metagenome_id => 'mgm'.$job->{metagenome_id}}
);

eval {
my $get = $agent->get($Conf::shock_url.'/node?query&limit=100&type=metagenome&id=mgm'.$job->metagenome_id, @args);
$nodes = $json->decode( $get->content )->{data};
my $post = $agent->post($url, @args);
$response = $json->decode($post->content);
};
# modify shock nodes
foreach my $n (@$nodes) {
$agent->delete($Conf::shock_url.'/node/'.$n.'/acl/read?users=mgrast', @args);
if ($@ || (! ref($response))) {
$self->application->add_message('warning', "Could not make metagenome public: ".$@);
return 1;
} elsif (exists($response->{ERROR}) && $response->{ERROR}) {
$self->application->add_message('warning', "Could not make metagenome public: ". $response->{ERROR});
return 1;
}

# send email
Expand Down
28 changes: 25 additions & 3 deletions src/MGRAST/lib/resources/job.pm
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,16 @@ sub info {
'body' => { "metagenome_id" => [ "string", "unique MG-RAST metagenome identifier" ],
"input_id" => ["string", "shock node id of input sequence file"] } }
},
{ 'name' => "public",
'request' => $self->cgi->url."/".$self->name."/public",
'description' => "Change status of metagenome to public.",
'method' => "POST",
'type' => "synchronous",
'attributes' => { "public" => ['boolean', 'the metagenome is public'] },
'parameters' => { 'options' => {},
'required' => {},
'body' => { "metagenome_id" => [ "string", "unique MG-RAST metagenome identifier" ] } }
},
{ 'name' => "addproject",
'request' => $self->cgi->url."/".$self->name."/addproject",
'description' => "Add exisiting MG-RAST job to existing MG-RAST project.",
Expand Down Expand Up @@ -147,8 +157,8 @@ sub request {
# determine sub-module to use
if (scalar(@{$self->rest}) == 0) {
$self->info();
} elsif ( ($self->rest->[0] eq 'reserve') || ($self->rest->[0] eq 'create') ||
($self->rest->[0] eq 'submit') || ($self->rest->[0] eq 'addproject') ) {
} elsif ( ($self->rest->[0] eq 'reserve') || ($self->rest->[0] eq 'create') || ($self->rest->[0] eq 'submit') ||
($self->rest->[0] eq 'public') || ($self->rest->[0] eq 'addproject') ) {
$self->job_action($self->rest->[0]);
} elsif (($self->rest->[0] eq 'kb2mg') || ($self->rest->[0] eq 'mg2kb')) {
$self->id_lookup($self->rest->[0]);
Expand Down Expand Up @@ -200,7 +210,7 @@ sub job_action {
job_id => $job->{job_id},
kbase_id => (exists($post->{kbase_id}) && $post->{kbase_id}) ? $self->reserve_kbase_id($mgid): undef
};
} elsif (($action eq 'create') || ($action eq 'submit') || ($action eq 'addproject')) {
} elsif (($action eq 'create') || ($action eq 'submit') || ($action eq 'public') || ($action eq 'addproject')) {
# check id format
my (undef, $id) = $post->{metagenome_id} =~ /^(mgm)?(\d+\.\d+)$/;
if (! $id) {
Expand Down Expand Up @@ -252,6 +262,18 @@ sub job_action {
}
my (undef, $awe_id) = split(/\t/, $log[1]);
$data = { awe_id => $awe_id, log => join("\n", @log) };
} elsif ($action eq 'public') {
# update shock nodes
my $nodes = $self->get_shock_query({'type' => 'metagenome', 'id' => 'mgm'.$job->{metagenome_id}}, $self->mgrast_token);
foreach my $n (@$nodes) {
my $attr = $n->{attributes};
$attr->{status} = 'public';
$self->update_shock_node($n->{id}, $attr, $self->mgrast_token);
$self->edit_shock_acl($n->{id}, $self->mgrast_token, 'mgrast', 'delete', 'read');
}
# update db
$job->public(1);
$data = { public => $job->public ? 1 : 0 };
} elsif ($action eq 'addproject') {
# check id format
my (undef, $pid) = $post->{project_id} =~ /^(mgp)?(\d+)$/;
Expand Down