From 0c7bb48b06ea9b9b0dbd29d0ab335fe4886fc115 Mon Sep 17 00:00:00 2001
From: Jason Casden <casden@email.unc.edu>
Date: Fri, 3 Feb 2023 13:11:17 -0500
Subject: [PATCH 1/2] Fix old bug when accessing an int as an array due to
 inconsistent implementation across transformers

---
 service/transformers/CalTransformer.php | 4 ++--
 service/transformers/LcaTransformer.php | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/service/transformers/CalTransformer.php b/service/transformers/CalTransformer.php
index a82f1ee19..a6a6d0ee0 100644
--- a/service/transformers/CalTransformer.php
+++ b/service/transformers/CalTransformer.php
@@ -79,8 +79,8 @@ private function addActivity($row, &$count)
 
         foreach($activities as &$activity)
         {
-            if ((isset($row['act']) && $activity['id'] == $row['act']) ||
-                (! isset($row['act']) && $activity['id'] == $row[-1]))
+            if ((isset($row['act']) && $activity == $row['act']) ||
+                (! isset($row['act']) && $activity == $row[-1]))
             {
                 unset($activity);
                 return;
diff --git a/service/transformers/LcaTransformer.php b/service/transformers/LcaTransformer.php
index 5029a505d..68ee075a8 100644
--- a/service/transformers/LcaTransformer.php
+++ b/service/transformers/LcaTransformer.php
@@ -107,7 +107,7 @@ private function addActivity($row, &$count)
         {
             foreach($activities as &$activity)
             {
-                if ($activity['id'] == $row['act'])
+                if ($activity == $row['act'])
                 {
                     unset($activity);
                     return null;
@@ -120,7 +120,7 @@ private function addActivity($row, &$count)
         {
             foreach($activities as &$activity)
             {
-                if ($activity['id'] == -1)
+                if ($activity == -1)
                 {
                     unset($activity);
                     return null;

From 0918bfddd46237af8c9d307afa40aa75a83c4439 Mon Sep 17 00:00:00 2001
From: Jason Casden <casden@email.unc.edu>
Date: Fri, 3 Feb 2023 13:36:19 -0500
Subject: [PATCH 2/2] Fix paste error when checking for empty activity lists

---
 service/transformers/CalTransformer.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/service/transformers/CalTransformer.php b/service/transformers/CalTransformer.php
index a6a6d0ee0..2c74f9af0 100644
--- a/service/transformers/CalTransformer.php
+++ b/service/transformers/CalTransformer.php
@@ -80,7 +80,7 @@ private function addActivity($row, &$count)
         foreach($activities as &$activity)
         {
             if ((isset($row['act']) && $activity == $row['act']) ||
-                (! isset($row['act']) && $activity == $row[-1]))
+                (! isset($row['act']) && $activity == -1))
             {
                 unset($activity);
                 return;