Merge pull request #53 from andrewdwallo/development-3.x

Refactor app and reporting
andrewdwallo · Jun 21, 2024 · 339300e · 339300e
2 parents 943cd98 + 5756649
commit 339300e
Show file tree

Hide file tree

Showing 80 changed files with 3,067 additions and 1,727 deletions.
diff --git a/app/Contracts/AccountHandler.php b/app/Contracts/AccountHandler.php
@@ -2,9 +2,6 @@
 
 namespace App\Contracts;
 
-use App\DTO\AccountBalanceDTO;
-use App\DTO\AccountBalanceReportDTO;
-use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\ValueObjects\Money;
 
@@ -20,14 +17,8 @@ public function getStartingBalance(Account $account, string $startDate): ?Money;
 
     public function getEndingBalance(Account $account, string $startDate, string $endDate): ?Money;
 
-    public function calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance): int;
-
     public function getBalances(Account $account, string $startDate, string $endDate): array;
 
-    public function formatBalances(array $balances): AccountBalanceDTO;
-
-    public function buildAccountBalanceReport(string $startDate, string $endDate): AccountBalanceReportDTO;
-
     public function getTotalBalanceForAllBankAccounts(string $startDate, string $endDate): Money;
 
     public function getAccountCategoryOrder(): array;

diff --git a/app/Contracts/ExportableReport.php b/app/Contracts/ExportableReport.php
@@ -0,0 +1,21 @@
+<?php
+
+namespace App\Contracts;
+
+use App\DTO\ReportCategoryDTO;
+
+interface ExportableReport
+{
+    public function getTitle(): string;
+
+    public function getHeaders(): array;
+
+    /**
+     * @return ReportCategoryDTO[]
+     */
+    public function getCategories(): array;
+
+    public function getOverallTotals(): array;
+
+    public function getColumns(): array;
+}
diff --git a/app/DTO/AccountBalanceDTO.php b/app/DTO/AccountBalanceDTO.php
@@ -12,8 +12,7 @@ public function __construct(
         public string $creditBalance,
         public ?string $netMovement,
         public ?string $endingBalance,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

diff --git a/app/DTO/AccountCategoryDTO.php b/app/DTO/AccountCategoryDTO.php
@@ -12,8 +12,7 @@ class AccountCategoryDTO implements Wireable
     public function __construct(
         public array $accounts,
         public AccountBalanceDTO $summary,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

diff --git a/app/DTO/AccountDTO.php b/app/DTO/AccountDTO.php
@@ -10,8 +10,7 @@ public function __construct(
         public string $accountName,
         public string $accountCode,
         public AccountBalanceDTO $balance,
-    ) {
-    }
+    ) {}
 
     public function toLivewire(): array
     {

diff --git a/app/DTO/ReportCategoryDTO.php b/app/DTO/ReportCategoryDTO.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\DTO;
+
+class ReportCategoryDTO
+{
+    /**
+     * @param  string[]  $header
+     * @param  string[][]  $data
+     * @param  string[]  $summary
+     */
+    public function __construct(
+        public array $header,
+        public array $data,
+        public array $summary,
+    ) {}
+}
diff --git a/app/DTO/AccountBalanceReportDTO.php → app/DTO/ReportDTO.php b/app/DTO/AccountBalanceReportDTO.php → app/DTO/ReportDTO.php
@@ -4,22 +4,23 @@
 
 use Livewire\Wireable;
 
-class AccountBalanceReportDTO implements Wireable
+class ReportDTO implements Wireable
 {
     public function __construct(
         /**
          * @var AccountCategoryDTO[]
          */
         public array $categories,
         public AccountBalanceDTO $overallTotal,
-    ) {
-    }
+        public array $fields,
+    ) {}
 
     public function toLivewire(): array
     {
         return [
             'categories' => $this->categories,
             'overallTotal' => $this->overallTotal->toLivewire(),
+            'fields' => $this->fields,
         ];
     }
 
@@ -28,6 +29,7 @@ public static function fromLivewire($value): static
         return new static(
             $value['categories'],
             AccountBalanceDTO::fromLivewire($value['overallTotal']),
+            $value['fields'],
         );
     }
 }
diff --git a/app/Events/CompanyConfigured.php b/app/Events/CompanyConfigured.php
@@ -13,13 +13,7 @@ class CompanyConfigured
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Company $company;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(Company $company)
-    {
-        $this->company = $company;
-    }
+    public function __construct(
+        public Company $company
+    ) {}
 }
diff --git a/app/Events/CompanyDefaultEvent.php b/app/Events/CompanyDefaultEvent.php
@@ -13,13 +13,10 @@ class CompanyDefaultEvent
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Model $model;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Model $model)
-    {
-        $this->model = $model;
-    }
+    public function __construct(
+        public Model $model
+    ) {}
 }
diff --git a/app/Events/CompanyDefaultUpdated.php b/app/Events/CompanyDefaultUpdated.php
@@ -13,16 +13,11 @@ class CompanyDefaultUpdated
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Model $record;
-
-    public array $data;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Model $record, array $data)
-    {
-        $this->record = $record;
-        $this->data = $data;
-    }
+    public function __construct(
+        public Model $record,
+        public array $data
+    ) {}
 }
diff --git a/app/Events/CompanyGenerated.php b/app/Events/CompanyGenerated.php
@@ -12,25 +12,14 @@ class CompanyGenerated
     use Dispatchable;
     use SerializesModels;
 
-    public User $user;
-
-    public Company $company;
-
-    public string $country;
-
-    public string $language;
-
-    public string $currency;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(User $user, Company $company, string $country, string $language = 'en', string $currency = 'USD')
-    {
-        $this->user = $user;
-        $this->company = $company;
-        $this->country = $country;
-        $this->language = $language;
-        $this->currency = $currency;
-    }
+    public function __construct(
+        public User $user,
+        public Company $company,
+        public string $country,
+        public string $language = 'en',
+        public string $currency = 'USD'
+    ) {}
 }
diff --git a/app/Events/CurrencyRateChanged.php b/app/Events/CurrencyRateChanged.php
@@ -13,19 +13,9 @@ class CurrencyRateChanged
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Currency $currency;
-
-    public float $oldRate;
-
-    public float $newRate;
-
-    /**
-     * Create a new event instance.
-     */
-    public function __construct(Currency $currency, float $oldRate, float $newRate)
-    {
-        $this->currency = $currency;
-        $this->oldRate = $oldRate;
-        $this->newRate = $newRate;
-    }
+    public function __construct(
+        public Currency $currency,
+        public float $oldRate,
+        public float $newRate
+    ) {}
 }
diff --git a/app/Events/DefaultCurrencyChanged.php b/app/Events/DefaultCurrencyChanged.php
@@ -13,13 +13,10 @@ class DefaultCurrencyChanged
     use InteractsWithSockets;
     use SerializesModels;
 
-    public Currency $currency;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Currency $currency)
-    {
-        $this->currency = $currency;
-    }
+    public function __construct(
+        public Currency $currency
+    ) {}
 }
diff --git a/app/Events/PlaidSuccess.php b/app/Events/PlaidSuccess.php
@@ -11,19 +11,12 @@ class PlaidSuccess
     use Dispatchable;
     use SerializesModels;
 
-    public string $publicToken;
-
-    public string $accessToken;
-
-    public Company $company;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(string $publicToken, string $accessToken, Company $company)
-    {
-        $this->publicToken = $publicToken;
-        $this->accessToken = $accessToken;
-        $this->company = $company;
-    }
+    public function __construct(
+        public string $publicToken,
+        public string $accessToken,
+        public Company $company
+    ) {}
 }
diff --git a/app/Events/StartTransactionImport.php b/app/Events/StartTransactionImport.php
@@ -12,22 +12,13 @@ class StartTransactionImport
     use Dispatchable;
     use SerializesModels;
 
-    public Company $company;
-
-    public ConnectedBankAccount $connectedBankAccount;
-
-    public int | string $selectedBankAccountId;
-
-    public string $startDate;
-
     /**
      * Create a new event instance.
      */
-    public function __construct(Company $company, ConnectedBankAccount $connectedBankAccount, int | string $selectedBankAccountId, string $startDate)
-    {
-        $this->company = $company;
-        $this->connectedBankAccount = $connectedBankAccount;
-        $this->selectedBankAccountId = $selectedBankAccountId;
-        $this->startDate = $startDate;
-    }
+    public function __construct(
+        public Company $company,
+        public ConnectedBankAccount $connectedBankAccount,
+        public int | string $selectedBankAccountId,
+        public string $startDate
+    ) {}
 }
diff --git a/app/Facades/Accounting.php b/app/Facades/Accounting.php
@@ -3,9 +3,6 @@
 namespace App\Facades;
 
 use App\Contracts\AccountHandler;
-use App\DTO\AccountBalanceDTO;
-use App\DTO\AccountBalanceReportDTO;
-use App\Enums\Accounting\AccountCategory;
 use App\Models\Accounting\Account;
 use App\ValueObjects\Money;
 use Illuminate\Support\Facades\Facade;
@@ -16,10 +13,7 @@
  * @method static Money getNetMovement(Account $account, string $startDate, string $endDate)
  * @method static Money|null getStartingBalance(Account $account, string $startDate)
  * @method static Money|null getEndingBalance(Account $account, string $startDate, string $endDate)
- * @method static int calculateNetMovementByCategory(AccountCategory $category, int $debitBalance, int $creditBalance)
  * @method static array getBalances(Account $account, string $startDate, string $endDate)
- * @method static AccountBalanceDTO formatBalances(array $balances)
- * @method static AccountBalanceReportDTO buildAccountBalanceReport(string $startDate, string $endDate)
  * @method static Money getTotalBalanceForAllBankAccounts(string $startDate, string $endDate)
  * @method static array getAccountCategoryOrder()
  * @method static string getEarliestTransactionDate()

diff --git a/app/Filament/Company/Clusters/Settings/Pages/Invoice.php b/app/Filament/Company/Clusters/Settings/Pages/Invoice.php
@@ -15,7 +15,6 @@
 use Filament\Forms\Components\Component;
 use Filament\Forms\Components\FileUpload;
 use Filament\Forms\Components\Grid;
-use Filament\Forms\Components\MarkdownEditor;
 use Filament\Forms\Components\Section;
 use Filament\Forms\Components\Select;
 use Filament\Forms\Components\Textarea;
@@ -163,7 +162,8 @@ protected function getContentSection(): Component
                 TextInput::make('subheader')
                     ->localizeLabel()
                     ->nullable(),
-                MarkdownEditor::make('terms')
+                Textarea::make('terms')
+                    ->localizeLabel()
                     ->nullable(),
                 Textarea::make('footer')
                     ->localizeLabel('Footer / Notes')

diff --git a/app/Filament/Company/Clusters/Settings/Pages/Localization.php b/app/Filament/Company/Clusters/Settings/Pages/Localization.php
@@ -127,10 +127,10 @@ protected function getGeneralSection(): Component
                     ->options(LocalizationModel::getAllLanguages())
                     ->searchable(),
                 Select::make('timezone')
+                    ->softRequired()
                     ->localizeLabel()
                     ->options(Timezone::getTimezoneOptions(CompanyProfileModel::first()->country))
-                    ->searchable()
-                    ->nullable(),
+                    ->searchable(),
             ])->columns();
     }
 

diff --git a/app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php b/app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/CreateCurrency.php
@@ -18,7 +18,7 @@ class CreateCurrency extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array

diff --git a/app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php b/app/Filament/Company/Clusters/Settings/Resources/CurrencyResource/Pages/EditCurrency.php
@@ -24,9 +24,9 @@ protected function getHeaderActions(): array
         ];
     }
 
-    protected function getRedirectUrl(): ?string
+    protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeSave(array $data): array

diff --git a/app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php b/app/Filament/Company/Clusters/Settings/Resources/DiscountResource/Pages/CreateDiscount.php
@@ -18,7 +18,7 @@ class CreateDiscount extends CreateRecord
 
     protected function getRedirectUrl(): string
     {
-        return $this->previousUrl;
+        return $this->getResource()::getUrl('index');
     }
 
     protected function mutateFormDataBeforeCreate(array $data): array