Fix: Sunday School dashboard and group role management issues (#7704)

Author: DawoudIO

src/ChurchCRM/Service/DashboardService.php

@@ -5,6 +5,7 @@
 use ChurchCRM\dto\SystemConfig;
 use ChurchCRM\model\ChurchCRM\FamilyQuery;
 use ChurchCRM\model\ChurchCRM\PersonQuery;
+use ChurchCRM\Utils\Functions;
 use Propel\Runtime\ActiveQuery\Criteria;
 
 const GENDER_STATS_UNASSIGNED = 0;
@@ -108,7 +109,7 @@ public function getGroupStats(): array
                 p2g2r_rle_ID = 2 and grp_Type = 4) as SundaySchoolKidsCount
         from dual ;
         ';
-        $rsQuickStat = RunQuery($sSQL);
+        $rsQuickStat = Functions::runQuery($sSQL);
         $row = mysqli_fetch_array($rsQuickStat);
 
         return ['groups' => $row['Group_cnt'], 'sundaySchoolClasses' => $row['SundaySchoolClasses'], 'sundaySchoolkids' => $row['SundaySchoolKidsCount']];

src/ChurchCRM/Service/DepositService.php

@@ -3,6 +3,7 @@
 
 use ChurchCRM\model\ChurchCRM\Deposit;
 use ChurchCRM\Service\AuthService;
+use ChurchCRM\Utils\Functions;
 
 class DepositService {
     /**
@@ -64,7 +65,7 @@ public function setDeposit(string $depositType, string $depositComment, string $
             if ($depositClosed && ($depositType === 'CreditCard' || $depositType === 'BankDraft')) {
                 // Delete any failed transactions on this deposit slip now that it is closing
                 $q = 'DELETE FROM pledge_plg WHERE plg_depID = ' . $iDepositSlipID . ' AND plg_PledgeOrPayment="Payment" AND plg_aut_Cleared=0';
-                \RunQuery($q);
+                Functions::runQuery($q);
             }
         } else {
             $deposit = new \ChurchCRM\model\ChurchCRM\Deposit();

src/ChurchCRM/Service/FinancialService.php

@@ -11,6 +11,7 @@
 use ChurchCRM\model\ChurchCRM\FamilyQuery;
 use ChurchCRM\model\ChurchCRM\Pledge;
 use ChurchCRM\model\ChurchCRM\PledgeQuery;
+use ChurchCRM\Utils\Functions;
 use ChurchCRM\Utils\InputUtils;
 use Propel\Runtime\ActiveQuery\Criteria;
 use ChurchCRM\Service\AuthService;
@@ -79,7 +80,7 @@ public function getMemberByScanString(string $tScanString): array
             throw new \Exception('error in locating family');
         }
         $sSQL = 'SELECT fam_ID, fam_Name FROM family_fam WHERE fam_scanCheck="' . $routeAndAccount . '"';
-        $rsFam = RunQuery($sSQL);
+        $rsFam = Functions::runQuery($sSQL);
         $row = mysqli_fetch_array($rsFam);
         $iCheckNo = $micrObj->findCheckNo($tScanString);
 
@@ -105,7 +106,7 @@ public function setDeposit(string $depositType, string $depositComment, string $
             if ($depositClosed && ($depositType === 'CreditCard' || $depositType === 'BankDraft')) {
                 // Delete any failed transactions on this deposit slip now that it is closing
                 $q = 'DELETE FROM pledge_plg WHERE plg_depID = ' . $iDepositSlipID . ' AND plg_PledgeOrPayment="Payment" AND plg_aut_Cleared=0';
-                RunQuery($q);
+                Functions::runQuery($q);
             }
         } else {
             $deposit = new Deposit();
@@ -131,7 +132,7 @@ public function getDepositTotal($id, $type = null)
         }
         // Get deposit total
         $sSQL = "SELECT SUM(plg_amount) AS deposit_total FROM pledge_plg WHERE plg_depID = '$id' AND plg_PledgeOrPayment = 'Payment' " . $sqlClause;
-        $rsDepositTotal = RunQuery($sSQL);
+        $rsDepositTotal = Functions::runQuery($sSQL);
         [$deposit_total] = mysqli_fetch_row($rsDepositTotal);
 
         return $deposit_total;
@@ -193,7 +194,7 @@ public function locateFamilyCheck(string $checkNumber, string $fam_ID)
         $sSQL = 'SELECT count(plg_FamID) from pledge_plg
                  WHERE plg_CheckNo = ' . $checkNumber . ' AND
                  plg_FamID = ' . $fam_ID;
-        $rCount = RunQuery($sSQL);
+        $rCount = Functions::runQuery($sSQL);
 
         return mysqli_fetch_array($rCount)[0];
     }
@@ -230,7 +231,7 @@ public function processCurrencyDenominations(object $payment, string $groupKey):
             }
             $sSQL = "INSERT INTO pledge_denominations_pdem (pdem_plg_GroupKey, plg_depID, pdem_denominationID, pdem_denominationQuantity)
       VALUES ('" . $groupKey . "','" . $payment->DepositID . "','" . $cdom->currencyID . "','" . $cdom->Count . "')";
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
             unset($sSQL);
         }
     }
@@ -312,7 +313,7 @@ public function getPledgeorPayment(string $GroupKey): string
         AuthService::requireUserGroupMembership('bFinance');
         $total = 0;
         $sSQL = 'SELECT plg_plgID, plg_FamID, plg_date, plg_fundID, plg_amount, plg_NonDeductible,plg_comment, plg_FYID, plg_method, plg_EditedBy from pledge_plg where plg_GroupKey="' . $GroupKey . '"';
-        $rsKeys = RunQuery($sSQL);
+        $rsKeys = Functions::runQuery($sSQL);
         $payment = new \stdClass();
         $payment->funds = [];
         while ($aRow = mysqli_fetch_array($rsKeys)) {
@@ -378,7 +379,7 @@ public function getCurrencyTypeOnDeposit(string $currencyID, string $depositID)
                  where  plg_depID = ' . $depositID . '
                  AND
                  pdem_denominationID = ' . $currencyID;
-        $rscurrencyDenomination = RunQuery($sSQL);
+        $rscurrencyDenomination = Functions::runQuery($sSQL);
 
         return mysqli_fetch_array($rscurrencyDenomination)[0];
     }
@@ -391,7 +392,7 @@ public function getCurrency(): array
         $currencies = [];
         // Get the list of Currency denominations
         $sSQL = 'SELECT * FROM currency_denominations_cdem';
-        $rscurrencyDenomination = RunQuery($sSQL);
+        $rscurrencyDenomination = Functions::runQuery($sSQL);
         mysqli_data_seek($rscurrencyDenomination, 0);
         while ($row = mysqli_fetch_array($rscurrencyDenomination)) {
             $currency = new \stdClass();
@@ -414,7 +415,7 @@ public function getActiveFunds(): array
         $funds = [];
         $sSQL = 'SELECT fun_ID,fun_Name,fun_Description,fun_Active FROM donationfund_fun';
         $sSQL .= " WHERE fun_Active = 'true'"; // New donations should show only active funds.
-        $rsFunds = RunQuery($sSQL);
+        $rsFunds = Functions::runQuery($sSQL);
         mysqli_data_seek($rsFunds, 0);
         while ($aRow = mysqli_fetch_array($rsFunds)) {
             $fund = new \stdClass();

src/ChurchCRM/Service/GroupService.php

@@ -8,6 +8,7 @@
 use ChurchCRM\model\ChurchCRM\Person2group2roleP2g2r;
 use ChurchCRM\model\ChurchCRM\PersonQuery;
 use ChurchCRM\Service\AuthService;
+use ChurchCRM\Utils\Functions;
 use Propel\Runtime\Propel;
 
 class GroupService
@@ -38,33 +39,33 @@ public function removeUserFromGroup(int $groupID, int $personID): void
     {
         AuthService::requireUserGroupMembership('bManageGroups');
         $sSQL = 'DELETE FROM person2group2role_p2g2r WHERE p2g2r_per_ID = ' . $personID . ' AND p2g2r_grp_ID = ' . $groupID;
-        RunQuery($sSQL);
+        Functions::runQuery($sSQL);
 
         // Check if this group has special properties
         $sSQL = 'SELECT grp_hasSpecialProps FROM group_grp WHERE grp_ID = ' . $groupID;
-        $rsTemp = RunQuery($sSQL);
+        $rsTemp = Functions::runQuery($sSQL);
         $rowTemp = mysqli_fetch_row($rsTemp);
         $bHasProp = $rowTemp[0];
 
         if ($bHasProp == 'true') {
             $sSQL = 'DELETE FROM groupprop_' . $groupID . " WHERE per_ID = '" . $personID . "'";
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
         }
 
         // Reset any group specific property fields of type "Person from Group" with this person assigned
         $sSQL = 'SELECT grp_ID, prop_Field FROM groupprop_master WHERE type_ID = 9 AND prop_Special = ' . $groupID;
-        $result = RunQuery($sSQL);
+        $result = Functions::runQuery($sSQL);
         while ($aRow = mysqli_fetch_array($result)) {
             $sSQL = 'UPDATE groupprop_' . $aRow['grp_ID'] . ' SET ' . $aRow['prop_Field'] . ' = NULL WHERE ' . $aRow['prop_Field'] . ' = ' . $personID;
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
         }
 
         // Reset any custom person fields of type "Person from Group" with this person assigned
         $sSQL = 'SELECT custom_Field FROM person_custom_master WHERE type_ID = 9 AND custom_Special = ' . $groupID;
-        $result = RunQuery($sSQL);
+        $result = Functions::runQuery($sSQL);
         while ($aRow = mysqli_fetch_array($result)) {
             $sSQL = 'UPDATE person_custom SET ' . $aRow['custom_Field'] . ' = NULL WHERE ' . $aRow['custom_Field'] . ' = ' . $personID;
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
         }
     }
 
@@ -165,7 +166,7 @@ public function getGroupRoles(int $groupID): array
               LEFT JOIN list_lst ON
               list_lst.lst_ID = group_grp.grp_RoleListID
               WHERE group_grp.grp_ID = ' . $groupID;
-        $rsList = RunQuery($sSQL);
+        $rsList = Functions::runQuery($sSQL);
 
         // Validate that this list ID is really for a group roles list. (for security)
         if (mysqli_num_rows($rsList) === 0) {
@@ -188,7 +189,7 @@ public function setGroupRoleOrder(string $groupID, string $groupRoleID, string $
                  SET list_lst.lst_OptionSequence = "' . $groupRoleOrder . '"
                  WHERE group_grp.grp_ID = "' . $groupID . '"
                     AND list_lst.lst_OptionID = ' . $groupRoleID;
-        RunQuery($sSQL);
+        Functions::runQuery($sSQL);
     }
 
     public function getGroupRoleOrder(string $groupID, string $groupRoleID)
@@ -199,7 +200,7 @@ public function getGroupRoleOrder(string $groupID, string $groupRoleID)
                  WHERE group_grp.grp_ID = "' . $groupID . '"
                    AND list_lst.lst_OptionID = ' . $groupRoleID;
 
-        $rsPropList = RunQuery($sSQL);
+        $rsPropList = Functions::runQuery($sSQL);
         $rowOrder = mysqli_fetch_array($rsPropList);
 
         return $rowOrder[0];
@@ -212,7 +213,7 @@ public function deleteGroupRole(string $groupID, string $groupRoleID): array
                 INNER JOIN group_grp
                     ON group_grp.grp_RoleListID = list_lst.lst_ID
                  WHERE group_grp.grp_ID = "' . $groupID . '"';
-        $rsPropList = RunQuery($sSQL);
+        $rsPropList = Functions::runQuery($sSQL);
         $numRows = mysqli_num_rows($rsPropList);
         // Make sure we never delete the only option
         if ($numRows > 1) {
@@ -223,22 +224,22 @@ public function deleteGroupRole(string $groupID, string $groupRoleID): array
                     WHERE group_grp.grp_ID = "' . $groupID . '"
                     AND lst_OptionID = ' . $groupRoleID;
 
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
 
             //check if we've deleted the old group default role.  If so, reset default to role ID 1
             // Next, if any group members were using the deleted role, reset their role to the group default.
             // Reset if default role was just removed.
             $sSQL = "UPDATE group_grp SET grp_DefaultRole = 1 WHERE grp_ID = $groupID AND grp_DefaultRole = $groupRoleID";
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
 
             // Get the current default role and Group ID (so we can update the p2g2r table)
             // This seems backwards, but grp_RoleListID is unique, having a 1-1 relationship with grp_ID.
             $sSQL = "SELECT grp_ID,grp_DefaultRole FROM group_grp WHERE grp_ID = $groupID";
-            $rsTemp = RunQuery($sSQL);
+            $rsTemp = Functions::runQuery($sSQL);
             $aTemp = mysqli_fetch_array($rsTemp);
 
             $sSQL = "UPDATE person2group2role_p2g2r SET p2g2r_rle_ID = 1 WHERE p2g2r_grp_ID = $groupID AND p2g2r_rle_ID = $groupRoleID";
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
 
             //Shift the remaining rows IDs up by one
 
@@ -249,7 +250,7 @@ public function deleteGroupRole(string $groupID, string $groupRoleID): array
                     WHERE group_grp.grp_ID = ' . $groupID . '
                     AND list_lst.lst_OptionID >= ' . $groupRoleID;
 
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
 
             //Shift up the remaining row Sequences by one
 
@@ -262,7 +263,7 @@ public function deleteGroupRole(string $groupID, string $groupRoleID): array
 
             //echo $sSQL;
 
-            RunQuery($sSQL);
+            Functions::runQuery($sSQL);
 
             return $this->getGroupRoles($groupID);
         } else {
@@ -275,45 +276,51 @@ public function addGroupRole(string $groupID, string $groupRoleName): array
         AuthService::requireUserGroupMembership('bManageGroups');
         if (strlen($groupRoleName) === 0) {
             throw new \Exception('New field name cannot be blank');
-        } else {
-            // Check for a duplicate option name
-            $sSQL = 'SELECT \'\' FROM list_lst
-                INNER JOIN group_grp
-                    ON group_grp.grp_RoleListID = list_lst.lst_ID
-                 WHERE group_grp.grp_ID = "' . $groupID . '" AND
-                 lst_OptionName = "' . $groupRoleName . '"';
-            $rsCount = RunQuery($sSQL);
-            if (mysqli_num_rows($rsCount) > 0) {
-                throw new \Exception('Field ' . $groupRoleName . ' already exists');
-            } else {
-                $sSQL = "SELECT grp_RoleListID FROM group_grp WHERE grp_ID = $groupID";
-                $rsTemp = RunQuery($sSQL);
-                $listIDTemp = mysqli_fetch_array($rsTemp);
-                $listID = $listIDTemp[0];
-                // Get count of the options
-                $sSQL = "SELECT '' FROM list_lst WHERE lst_ID = $listID";
-                $rsTemp = RunQuery($sSQL);
-                $numRows = mysqli_num_rows($rsTemp);
-                $newOptionSequence = $numRows + 1;
-
-                // Get the new OptionID
-                $sSQL = "SELECT MAX(lst_OptionID) FROM list_lst WHERE lst_ID = $listID";
-                $rsTemp = RunQuery($sSQL);
-                $aTemp = mysqli_fetch_array($rsTemp);
-                $newOptionID = $aTemp[0] + 1;
-
-                // Insert into the appropriate options table
-                $listOption = new ListOption();
-                $listOption
-                    ->setId($listID)
-                    ->setOptionId($newOptionID)
-                    ->setOptionName($groupRoleName)
-                    ->setOptionSequence($newOptionSequence);
-                $listOption->save();
-
-                $iNewNameError = 0;
+        }
+
+        // Get the group to find its role list ID
+        $group = GroupQuery::create()->findOneById((int)$groupID);
+        if ($group === null) {
+            throw new \Exception('Group not found');
+        }
+        
+        $listID = $group->getRoleListId();
+
+        // Check for duplicate option name using Propel
+        $existingOption = \ChurchCRM\model\ChurchCRM\ListOptionQuery::create()
+            ->filterById($listID)
+            ->filterByOptionName($groupRoleName)
+            ->findOne();
+
+        if ($existingOption !== null) {
+            throw new \Exception('Field ' . $groupRoleName . ' already exists');
+        }
+
+        // Get count of options and max option ID
+        $options = \ChurchCRM\model\ChurchCRM\ListOptionQuery::create()
+            ->filterById($listID)
+            ->find();
+
+        $numRows = count($options);
+        $newOptionSequence = $numRows + 1;
+
+        // Find max OptionID
+        $maxOptionID = 0;
+        foreach ($options as $option) {
+            if ($option->getOptionId() > $maxOptionID) {
+                $maxOptionID = $option->getOptionId();
             }
         }
+        $newOptionID = $maxOptionID + 1;
+
+        // Insert into the appropriate options table
+        $listOption = new ListOption();
+        $listOption
+            ->setId($listID)
+            ->setOptionId($newOptionID)
+            ->setOptionName($groupRoleName)
+            ->setOptionSequence($newOptionSequence);
+        $listOption->save();
 
         return [
             'newRole' => [
@@ -329,36 +336,36 @@ public function enableGroupSpecificProperties(string $groupID): void
         AuthService::requireUserGroupMembership('bManageGroups');
         $sSQL = 'UPDATE group_grp SET grp_hasSpecialProps = true
             WHERE grp_ID = ' . $groupID;
-        RunQuery($sSQL);
+        Functions::runQuery($sSQL);
         $sSQLp = 'CREATE TABLE groupprop_' . $groupID . " (
                         per_ID mediumint(8) unsigned NOT NULL default '0',
                         PRIMARY KEY  (per_ID),
                           UNIQUE KEY per_ID (per_ID)
                         ) ENGINE=InnoDB;";
-        RunQuery($sSQLp);
+        Functions::runQuery($sSQLp);
 
         $groupMembers = $this->getGroupMembers($groupID);
 
         foreach ($groupMembers as $member) {
             $sSQLr = 'INSERT INTO groupprop_' . $groupID . " ( per_ID ) VALUES ( '" . $member['per_ID'] . "' );";
-            RunQuery($sSQLr);
+            Functions::runQuery($sSQLr);
         }
     }
 
     public function disableGroupSpecificProperties(string $groupID): void
     {
         AuthService::requireUserGroupMembership('bManageGroups');
         $sSQLp = 'DROP TABLE groupprop_' . $groupID;
-        RunQuery($sSQLp);
+        Functions::runQuery($sSQLp);
 
         // need to delete the master index stuff
         $sSQLp = 'DELETE FROM groupprop_master WHERE grp_ID = ' . $groupID;
-        RunQuery($sSQLp);
+        Functions::runQuery($sSQLp);
 
         $sSQL = 'UPDATE group_grp SET grp_hasSpecialProps = false
             WHERE grp_ID = ' . $groupID;
 
-        RunQuery($sSQL);
+        Functions::runQuery($sSQL);
     }
 
     /**