wip

app/DTO/ReportDTO.php

@@ -7,9 +7,6 @@ use Illuminate\Support\Carbon;
 class ReportDTO
 {
     public function __construct(
-        /**
-         * @var AccountCategoryDTO[]
-         */
         public array $categories,
         public ?AccountBalanceDTO $overallTotal = null,
         public ?AgingBucketDTO $agingSummary = null,

app/Scopes/CurrentCompanyScope.php

@@ -16,12 +16,12 @@ class CurrentCompanyScope implements Scope
      */
     public function apply(Builder $builder, Model $model): void
     {
-        if (app()->runningInConsole()) {
+        $companyId = session('current_company_id');
+
+        if (! $companyId && app()->runningInConsole()) {
             return;
         }
 
-        $companyId = session('current_company_id');
-
         if (! $companyId && ($user = Auth::user()) && ($companyId = $user->current_company_id)) {
             session(['current_company_id' => $companyId]);
         }

app/Services/ReportService.php

@@ -38,9 +38,12 @@ class ReportService
     ) {}
 
     /**
-     * @param  class-string<BalanceFormattable>|null  $dtoClass
+     * @template T of BalanceFormattable
+     *
+     * @param  class-string<T>|null  $dtoClass
+     * @return T
      */
-    public function formatBalances(array $balances, ?string $dtoClass = null, bool $formatZeros = true): BalanceFormattable | array
+    public function formatBalances(array $balances, ?string $dtoClass = null, bool $formatZeros = true)
     {
         $dtoClass ??= AccountBalanceDTO::class;
 
@@ -52,10 +55,6 @@ class ReportService
             return CurrencyConverter::formatCentsToMoney($balance);
         }, $balances);
 
-        if (! $dtoClass) {
-            return $formattedBalances;
-        }
-
         return $dtoClass::fromArray($formattedBalances);
     }
 
@@ -355,7 +354,7 @@ class ReportService
         return new ReportDTO(categories: $accountCategories, overallTotal: $formattedReportTotalBalances, fields: $columns, reportType: $trialBalanceType);
     }
 
-    public function getRetainedEarningsBalances(string $startDate, string $endDate): BalanceFormattable | array
+    public function getRetainedEarningsBalances(string $startDate, string $endDate): AccountBalanceDTO
     {
         $retainedEarningsAmount = $this->calculateRetainedEarnings($startDate, $endDate)->getAmount();
 
@@ -498,7 +497,7 @@ class ReportService
         );
     }
 
-    private function calculateTotalCashFlows(array $sections, string $startDate): BalanceFormattable | array
+    private function calculateTotalCashFlows(array $sections, string $startDate): AccountBalanceDTO
     {
         $totalInflow = 0;
         $totalOutflow = 0;

tests/Feature/Reports/AccountBalancesReportTest.php

@@ -54,8 +54,8 @@ it('correctly builds an account balances report for the current fiscal year', fu
     livewire(AccountBalances::class)
         ->assertFormSet([
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.startDate' => $defaultStartDate->toDateTimeString(),
-            'deferredFilters.endDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.startDate' => $defaultStartDate->toDateString(),
+            'deferredFilters.endDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSet('filters', [
             'dateRange' => $defaultDateRange,
@@ -120,8 +120,8 @@ it('correctly builds an account balances report for the previous fiscal year', f
     livewire(AccountBalances::class)
         ->assertFormSet([
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.startDate' => $defaultStartDate->toDateTimeString(),
-            'deferredFilters.endDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.startDate' => $defaultStartDate->toDateString(),
+            'deferredFilters.endDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSet('filters', [
             'dateRange' => $defaultDateRange,
@@ -129,8 +129,8 @@ it('correctly builds an account balances report for the previous fiscal year', f
             'endDate' => $defaultEndDate->toDateString(),
         ])
         ->set('deferredFilters', [
-            'startDate' => $defaultStartDate->subYear()->startOfYear()->toDateTimeString(),
-            'endDate' => $defaultEndDate->subYear()->endOfYear()->toDateTimeString(),
+            'startDate' => $defaultStartDate->subYear()->startOfYear()->toDateString(),
+            'endDate' => $defaultEndDate->subYear()->endOfYear()->toDateString(),
         ])
         ->call('applyFilters')
         ->assertSeeTextInOrder([

tests/Feature/Reports/TrialBalanceReportTest.php

@@ -60,7 +60,7 @@ it('correctly builds a standard trial balance report', function () {
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->assertSet('filters', [
             'reportType' => $defaultReportType,
@@ -125,7 +125,7 @@ it('correctly builds a post-closing trial balance report', function () {
 
     $formattedExpectedBalances = Reporting::formatBalances($calculatedTrialBalances);
 
-    $formattedRetainedEarningsBalances = Reporting::getRetainedEarningsBalances($earliestTransactionDate->toDateTimeString(), $defaultEndDate->toDateTimeString());
+    $formattedRetainedEarningsBalances = Reporting::getRetainedEarningsBalances($earliestTransactionDate->toDateString(), $defaultEndDate->toDateString());
 
     // Use Livewire to assert the report's filters and displayed data
     livewire(TrialBalance::class)
@@ -133,7 +133,7 @@ it('correctly builds a post-closing trial balance report', function () {
         ->assertFormSet([
             'deferredFilters.reportType' => $defaultReportType,
             'deferredFilters.dateRange' => $defaultDateRange,
-            'deferredFilters.asOfDate' => $defaultEndDate->toDateTimeString(),
+            'deferredFilters.asOfDate' => $defaultEndDate->toDateString(),
         ])
         ->call('applyFilters')
         ->assertSet('filters', [