From 2b0a3825d37dbafaaa722ae2126e14d65cd184eb Mon Sep 17 00:00:00 2001
From: titima15 <tt15@cornell.edu>
Date: Thu, 19 Sep 2024 13:58:25 -0400
Subject: [PATCH] check projects

---
 lib/CXGN/TrackingActivity/AddActivityProject.pm |  4 +--
 lib/SGN/Controller/AJAX/Order.pm                |  9 +++++-
 lib/SGN/Controller/AJAX/TrackingActivity.pm     | 28 ++++++++---------
 lib/SGN/Controller/AJAX/Transformation.pm       | 42 ++++++++++++++++---------
 4 files changed, 51 insertions(+), 32 deletions(-)

diff --git a/lib/CXGN/TrackingActivity/AddActivityProject.pm b/lib/CXGN/TrackingActivity/AddActivityProject.pm
index a39ee0a65f..f5b9fee418 100644
--- a/lib/CXGN/TrackingActivity/AddActivityProject.pm
+++ b/lib/CXGN/TrackingActivity/AddActivityProject.pm
@@ -167,10 +167,10 @@ sub save_activity_project {
             subject_project_id => $project_id,
             type_id => $progress_of_cvterm_id,
         });
-        $project_rel_row->insert();        
+        $project_rel_row->insert();
     }
 
-    return $project_id;
+    return {project_id => $project_id};
 
 }
 
diff --git a/lib/SGN/Controller/AJAX/Order.pm b/lib/SGN/Controller/AJAX/Order.pm
index 560db70569..17cd9bcfa4 100644
--- a/lib/SGN/Controller/AJAX/Order.pm
+++ b/lib/SGN/Controller/AJAX/Order.pm
@@ -176,7 +176,14 @@ sub submit_order_POST : Args(0) {
                     project_vendor => $contact_id
                 });
 
-                $activity_project_id = $add_activity_project->save_activity_project();
+                my $return = $add_activity_project->save_activity_project();
+                if ($return->{error}) {
+                    my $error = $return->{error};
+                    $c->stash->{rest} = {error_string => $error};
+                    return;
+                } else {
+                    $activity_project_id = $return->{project_id};                    
+                }
             }
 
             foreach my $identifier_info (@tracking_identifiers) {
diff --git a/lib/SGN/Controller/AJAX/TrackingActivity.pm b/lib/SGN/Controller/AJAX/TrackingActivity.pm
index 0a5842fd3d..80aa766475 100644
--- a/lib/SGN/Controller/AJAX/TrackingActivity.pm
+++ b/lib/SGN/Controller/AJAX/TrackingActivity.pm
@@ -80,7 +80,7 @@ sub create_tracking_activity_project_POST : Args(0) {
         return;
     }
 
-    my $error;
+    my $return;
     eval{
         my $add_activity_project = CXGN::TrackingActivity::AddActivityProject->new({
             bcs_schema => $schema,
@@ -94,29 +94,27 @@ sub create_tracking_activity_project_POST : Args(0) {
             owner_id => $user_id
         });
 
-        my $return = $add_activity_project->save_activity_project();
-        if (!$return){
-            $c->stash->{rest} = {error => "Error saving project",};
-            return;
-        }
-
-#        if ($return->{error}){
-#            $error = $return->{error};
-#        }
+        $return = $add_activity_project->save_activity_project();
     };
 
-    if ($@) {
-        $c->stash->{rest} = {error => $@};
+    if (!$return){
+        $c->stash->{rest} = {error => "Error saving project",};
         return;
-    };
+    }
 
+    if ($return->{error}){
+        $c->stash->{rest} = {error => $return->{error}};
+        return;
+    }
 
-    if ($error){
-        $c->stash->{rest} = {error => $error};
+    if ($@) {
+        $c->stash->{rest} = {error => $@};
+        return;
     } else {
         $c->stash->{rest} = {success => 1};
     }
 
+
 }
 
 
diff --git a/lib/SGN/Controller/AJAX/Transformation.pm b/lib/SGN/Controller/AJAX/Transformation.pm
index 81eb2e213c..7a7f9c4f65 100644
--- a/lib/SGN/Controller/AJAX/Transformation.pm
+++ b/lib/SGN/Controller/AJAX/Transformation.pm
@@ -43,7 +43,6 @@ sub add_transformation_project_POST :Args(0){
     my $project_description = $c->req->param('project_description');
     $project_name =~ s/^\s+|\s+$//g;
 
-    print STDERR "PROJECT NAME =".Dumper($project_name)."\n";
     if (!$c->user()){
         $c->stash->{rest} = {error => "You need to be logged in to add a transformation project."};
         return;
@@ -64,6 +63,7 @@ sub add_transformation_project_POST :Args(0){
        }
 
     my $error;
+    my $return;
     my $transformation_project_id;
     eval{
         my $add_transformation_project = CXGN::Transformation::AddTransformationProject->new({
@@ -77,14 +77,23 @@ sub add_transformation_project_POST :Args(0){
             owner_id => $user_id
         });
 
-        my $return = $add_transformation_project->save_transformation_project();
-        if ($return->{error}){
-            $error = $return->{error};
-        } else {
-            $transformation_project_id = $return->{project_id};
-        }
+        $return = $add_transformation_project->save_transformation_project();
     };
 
+    if (!$return){
+        $c->stash->{rest} = {error => "Error saving project",};
+        return;
+    }
+
+    if ($return->{error}){
+        $error = $return->{error};
+        $c->stash->{rest}={error => $error};
+        return;
+    } else {
+        $transformation_project_id = $return->{project_id};
+    }
+
+
     if ($@) {
         $c->stash->{rest} = {error => $@};
         return;
@@ -92,7 +101,6 @@ sub add_transformation_project_POST :Args(0){
 
     my $tracking_transformation = $c->config->{tracking_transformation};
     if ($tracking_transformation) {
-        my $tracking_project_id;
         my $tracking_project_name = $project_name."_"."progress";
 
         my $add_tracking_project = CXGN::TrackingActivity::AddActivityProject->new({
@@ -108,15 +116,21 @@ sub add_transformation_project_POST :Args(0){
             progress_of_project_id => $transformation_project_id,
         });
 
-        $tracking_project_id = $add_tracking_project->save_activity_project();
-    }
+        my $return = $add_tracking_project->save_activity_project();
+        if (!$return){
+            $c->stash->{rest} = {error => "Error saving project",};
+            return;
+        }
 
-    if ($error){
-        $c->stash->{rest} = {error => $error};
-    } else {
-        $c->stash->{rest} = {success => 1};
+        if ($return->{error}){
+            $error = $return->{error};
+            $c->stash->{rest} = {error => $error};
+            return;
+        }
     }
 
+    $c->stash->{rest} = {success => 1};
+
 }
 
 
-- 
2.11.4.GIT