[TM-1352] remove unnecessary functions

wri · Nov 15, 2024 · aad3e97 · aad3e97
1 parent b5757a9
commit aad3e97
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 13 deletions.
diff --git a/app/Http/Resources/V2/ProjectReports/ProjectReportResource.php b/app/Http/Resources/V2/ProjectReports/ProjectReportResource.php
@@ -118,8 +118,8 @@ public function toArray($request)
             'people_knowledge_skills_increased' => $this->people_knowledge_skills_increased,
             'indirect_beneficiaries' => $this->indirect_beneficiaries,
             'indirect_beneficiaries_description' => $this->indirect_beneficiaries_description,
-            'workdays_direct_total' => $this->workdays_direct_total,
-            'workdays_convergence_total' => $this->workdays_convergence_total,
+            'workdays_direct_total' => $this->workdays_direct,
+            'workdays_convergence_total' => $this->workdays_convergence,
             'non_tree_total' => $this->non_tree_total,
             'total_community_partners' => $this->total_community_partners,
         ];

diff --git a/app/Models/V2/Projects/ProjectReport.php b/app/Models/V2/Projects/ProjectReport.php
@@ -445,24 +445,14 @@ public function getWorkdaysTotalAttribute(): int
         return $projectReportTotal + $sumTotals('paid') + $sumTotals('volunteer');
     }
 
-    public function getWorkdaysDirectTotalAttribute(): int
-    {
-        return $this->workdays_direct ?? 0;
-    }
-
-    public function getWorkdaysConvergenceTotalAttribute(): int
-    {
-        return $this->workdays_convergence ?? 0;
-    }
-
     public function getNonTreeTotalAttribute(): int
     {
         if (empty($this->task_id)) {
             return 0;
         }
 
         return TreeSpecies::where('speciesable_type', SiteReport::class)
-            ->whereIn('speciesable_id', $this->task->siteReports()->select('id'))
+            ->whereIn('speciesable_id', $this->task->siteReports()->hasBeenSubmitted()->select('id'))
             ->where('collection', TreeSpecies::COLLECTION_NON_TREE)
             ->visible()
             ->sum('amount');