diff --git a/.github/workflows/assigned-issues-inprogress.yml b/.github/workflows/assigned-issues-inprogress.yml deleted file mode 100644 index 67de8d7..0000000 --- a/.github/workflows/assigned-issues-inprogress.yml +++ /dev/null @@ -1,15 +0,0 @@ -name: Run project automation tasks - -on: - issues: - types: [assigned] - -jobs: - issues-inprogress: - runs-on: ubuntu-latest - steps: - - uses: alex-page/github-project-automation-plus@v0.2.4 - with: - project: v1.0 - column: In progress - repo-token: ${{ secrets.GITHUB_TOKEN }} diff --git a/app/includes/app_functions.php b/app/includes/app_functions.php index e6f306f..6b24d39 100644 --- a/app/includes/app_functions.php +++ b/app/includes/app_functions.php @@ -68,26 +68,23 @@ } function get_open_subscribed_requests($db) { - $subbed_reqs_arr = array(); $requests = array(); - $sub_tickets_stmt = "SELECT ticket_uuid FROM ticket_subscribers WHERE user_uuid=:uuid"; - $sub_tickets_sql = $db->prepare($sub_tickets_stmt); - $sub_tickets_sql->bindParam(':uuid', $_SESSION['uuid']); - $sub_tickets_sql->execute(); - $sub_tickets_sql->setFetchMode(PDO::FETCH_ASSOC); - $sub_tickets_result = $sub_tickets_sql->fetchAll(); - foreach ($sub_tickets_result as $tkt) { - array_push($subbed_reqs_arr, $tkt['ticket_uuid']); + $all_subs = get_subscribed_requests($db); + foreach ($all_subs as $sub) { + if ($sub['status'] != 'Closed') { + array_push($requests, $sub); + } } - $subbed_reqs = implode(",", $subbed_reqs_arr); - $stmt = "SELECT * FROM tickets WHERE uuid IN :uuid"; - $sql = $db->prepare($stmt); - $sql->bindParam(':uuid', $subbed_reqs); - $sql->execute(); - $sql->setFetchMode(PDO::FETCH_ASSOC); - $result = $sql->fetchAll(); - foreach ($result as $sub) { - array_push($requests, $sub) + return $requests; + } + + function get_closed_subscribed_requests($db) { + $requests = array(); + $all_subs = get_subscribed_requests($db); + foreach ($all_subs as $sub) { + if ($sub['status'] == 'Closed') { + array_push($requests, $sub); + } } return $requests; }