trying to clean up

Author: drdrew42

lib/RenderApp/Controller/IO.pm

@@ -35,10 +35,8 @@ sub raw {
     my $file_path = $validatedInput->{sourceFilePath};
     my $problem   = $c->newProblem( { log => $c->log, read_path => $file_path } );
     $problem->{action} = 'fetch source';
-    return $c->render(
-        json   => $problem->errport(),
-        status => $problem->{status}
-    ) unless $problem->success();
+    return $c->exception( $problem->{_message}, $problem->{status} )
+      unless $problem->success();
     $c->render( text => $problem->{problem_contents} );
 }
 
@@ -73,17 +71,15 @@ async sub writer {
         }
     );
 
-    return $c->render(
-        json   => $problem->errport(),
-        status => $problem->{status}
-    ) unless $problem->success();
+    return $c->exception( $problem->{_message}, $problem->{status} )
+      unless $problem->success();
 
     $c->render_later;
     my $saveSuccess = await $problem->save;
 
     return ( $saveSuccess ) ?
       $c->render( text => $problem->{write_path} ) :
-      $c->render( json => $problem->errport(), status => $problem->{status} );
+      $c->exception( $problem->{_message}, $problem->{status} );
 }
 
 sub upload {

lib/RenderApp/Controller/Render.pm

@@ -61,7 +61,6 @@ sub parseRequest {
     # override key-values in params with those provided in the JWT
     @params{ keys %$claims } = values %$claims;
   }
-  warn join(', ', keys %params);
   return \%params;
 }
 
@@ -118,41 +117,25 @@ async sub problem {
   }
 
   my $problem = $c->newProblem({ log => $c->log, read_path => $file_path, random_seed => $random_seed, problem_contents => $problem_contents });
-  return $c->exception($problem->{_message}, status => $problem->{status}) unless $problem->success();
+  return $c->exception($problem->{_message}, $problem->{status})
+    unless $problem->success();
 
   $inputs_ref->{sourceFilePath} = $problem->{read_path}; # in case the path was updated...
 
-  my @input_errs = checkInputs($inputs_ref);
-  if (@input_errs) {
-    my $err_log = "Form data submitted for ".$inputs_ref->{sourceFilePath}." contained errors: {";
-    $err_log .= join "}, {", @input_errs;
-    $c->log->error($err_log."}");
-  }
+  my $input_errs = checkInputs($inputs_ref);
 
-  $c->render_later;
+  $c->render_later; # tell Mojo that this might take a while
   my $ww_return_json = await $problem->render($inputs_ref);
 
-  unless ($problem->success()) {
-    $c->log->warn($problem->{_message});
-    return $c->render(
-      json   => $problem->errport(),
-      status => $problem->{status}
-    );
-  }
+  return $c->exception( $problem->{_message}, $problem->{status} )
+    unless $problem->success();
 
   my $ww_return_hash = decode_json($ww_return_json);
-  my @output_errs = checkOutputs($ww_return_hash);
-  if (@output_errs) {
-    my $err_log = "Output from rendering ".$inputs_ref->{sourceFilePath}." contained errors: {";
-    $err_log .= join "}, {", @output_errs;
-    $c->log->error($err_log."}");
-  }
+  my $output_errs = checkOutputs($ww_return_hash);
 
-  $ww_return_hash->{debug}->{render_warn} = [@input_errs, @output_errs];
+  $ww_return_hash->{debug}->{render_warn} = [$input_errs, $output_errs];
 
   # if answers are submitted and there is a provided answerURL...
-
-
   if ($inputs_ref->{JWTanswerURL} && $ww_return_hash->{answerJWT} && $inputs_ref->{submitAnswers}) {
     my $answerJWTresponse = {
       iss    => $ENV{SITE_HOST},
@@ -220,7 +203,11 @@ sub checkInputs {
       push @errs, $err;
     }
   }
-  return @errs;
+  return "Form data submitted for "
+      . $inputs_ref->{sourceFilePath}
+      . " contained errors: {"
+      . join "}, {", @errs
+      . "}";
 }
 
 sub checkOutputs {
@@ -248,14 +235,19 @@ sub checkOutputs {
       }
     }
   }
-  return @errs;
+  return
+      "Output from rendering "
+    . $outputs_ref->{sourceFilePath}
+    . " contained errors: {"
+    . join "}, {", @errs . "}";
 }
 
 sub exception {
   my $c = shift;
   my $id = $c->logID;
   my $message = "[$id] " . shift;
   my $status = shift;
+  $c->log->error("($status) EXCEPTION: $message");
   return $c->respond_to(
     json => { json => {
         message => $message,

lib/RenderApp/Controller/RenderProblem.pm

@@ -553,7 +553,7 @@ sub fake_user {
         first_name    => 'Motoko',
         last_name     => 'Kusanagi',
         email_address => '[email protected]',
-        student_id    => '',
+        student_id    => '123456789',
         section       => '9',
         recitation    => '',
         comment       => '',

lib/RenderApp/Model/Problem.pm

@@ -28,7 +28,7 @@ use RenderApp::Controller::RenderProblem;
 # - load   (overwrite problem_contents with contents of file at read_path)
 ## Error handling
 # - success (checks for internal errors and sets error code and message)
-# - errport (delivers a hash reference to be rendered as JSON)
+# - exception (renders JSON/HTML message w/ status & logs)
 
 our $codes = {
     400 => 'Bad Request',
@@ -54,7 +54,6 @@ sub new {
 
 sub _init {
     my ( $self, $args ) = @_;
-    my $availability = 'private';
     $self->{log} = $args->{log} if $args->{log};
 
     my $read_path        = $args->{read_path}        || '';
@@ -222,15 +221,13 @@ sub render {
     })->catch(sub {
         $self->{exception} = Mojo::Exception->new(shift)->trace;
         $self->{_error} = "500 Render failed: " . $self->{exception}->message;
-        $self->{log}->debug( $self->{_error} );
     });
     return $renderPromise;
 }
 
 sub success {
     my $self = shift;
-    # my $report = ( $self->{_error} =~ /\S/ ) ? $self->{_error} : 'NO ERRORS';
-    # $self->{log}->debug('CHECKING SUCCESS... ' . $report);
+    my $report = ( $self->{_error} =~ /\S/ ) ? $self->{_error} : 'NO ERRORS';
     return 1 unless $self->{_error} =~ /\S/;
     my ( $code, $mesg ) = split( / /, $self->{_error}, 2 );
     $self->{status}   = $code;
@@ -239,17 +236,6 @@ sub success {
     return 0;
 }
 
-sub errport {
-    my $self = shift;
-    return unless $self->{_error};
-    my $err_ref = {
-        statusCode => $self->{status},
-        status     => $self->{_error},
-        message    => $self->{_message},
-    };
-    return $err_ref;
-}
-
 sub DESTROY {
     my $self     = shift;
     my $duration = time - $self->{start};