Refactor expenses; move finance service classes; add daily/monthly sk…

…eletons #130 #136
nabeelio · Mar 6, 2018 · 9d3953f · 9d3953f
1 parent db10ebf
commit 9d3953f
Show file tree

Hide file tree

Showing 14 changed files with 164 additions and 155 deletions.
diff --git a/app/Database/factories/ExpenseFactory.php b/app/Database/factories/ExpenseFactory.php
@@ -6,9 +6,7 @@
 $factory->define(App\Models\Expense::class, function (Faker $faker) {
     return [
         'id' => null,
-        'airline_id' => function () {
-            return factory(App\Models\Airline::class)->create()->id;
-        },
+        'airline_id' => null,
         'name' => $faker->text(20),
         'amount' => $faker->randomFloat(2, 100, 1000),
         'type' => ExpenseType::FLIGHT,

diff --git a/app/Database/factories/NavdataFactory.php b/app/Database/factories/NavdataFactory.php
@@ -1,7 +1,7 @@
 <?php
 
+use App\Models\Enums\NavaidType;
 use Faker\Generator as Faker;
-use \App\Models\Enums\NavaidType;
 
 $factory->define(App\Models\Navdata::class, function (Faker $faker) {
     return [

diff --git a/app/Database/factories/UserFactory.php b/app/Database/factories/UserFactory.php
@@ -1,7 +1,7 @@
 <?php
 
-use Faker\Generator as Faker;
 use App\Models\Enums\UserState;
+use Faker\Generator as Faker;
 
 $factory->define(App\Models\User::class, function (Faker $faker)
 {

diff --git a/app/Database/migrations/2018_02_26_185121_create_expenses_table.php b/app/Database/migrations/2018_02_26_185121_create_expenses_table.php
@@ -1,8 +1,8 @@
 <?php
 
-use Illuminate\Support\Facades\Schema;
-use Illuminate\Database\Schema\Blueprint;
 use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
 
 class CreateExpensesTable extends Migration
 {

diff --git a/app/Database/seeds/sample.yml b/app/Database/seeds/sample.yml
@@ -251,15 +251,6 @@ subfleets:
     type: 772-36ER-GE90-115B
     ground_handling_multiplier: 150
 
-#subfleet_expenses:
-#  - id: 1
-#    subfleet_id: 1
-#    name: Catering
-#    amount: 1000
-#    type: 0
-#    created_at: now
-#    updated_at: now
-
 # add a few mods to aircraft and fares
 subfleet_fare:
 

diff --git a/app/Http/Controllers/Admin/FinanceController.php b/app/Http/Controllers/Admin/FinanceController.php
@@ -7,7 +7,7 @@
 use App\Models\JournalTransaction;
 use App\Repositories\AirlineRepository;
 use App\Repositories\JournalRepository;
-use App\Services\FinanceService;
+use App\Services\Finance\PirepFinanceService;
 use App\Support\Dates;
 use App\Support\Money;
 use Illuminate\Http\Request;
@@ -23,12 +23,12 @@ class FinanceController extends BaseController
             $journalRepo;
 
     /**
-     * @param FinanceService $financeSvc
+     * @param PirepFinanceService $financeSvc
      * @param JournalRepository $journalRepo
      */
     public function __construct(
         AirlineRepository $airlineRepo,
-        FinanceService $financeSvc,
+        PirepFinanceService $financeSvc,
         JournalRepository $journalRepo
     ) {
         $this->airlineRepo = $airlineRepo;

diff --git a/app/Http/Controllers/Api/PirepController.php b/app/Http/Controllers/Api/PirepController.php
@@ -26,7 +26,7 @@
 use App\Repositories\AcarsRepository;
 use App\Repositories\JournalRepository;
 use App\Repositories\PirepRepository;
-use App\Services\FinanceService;
+use App\Services\Finance\PirepFinanceService;
 use App\Services\GeoService;
 use App\Services\PIREPService;
 use App\Services\UserService;
@@ -47,7 +47,7 @@ class PirepController extends RestController
     /**
      * PirepController constructor.
      * @param AcarsRepository $acarsRepo
-     * @param FinanceService $financeSvc
+     * @param PirepFinanceService $financeSvc
      * @param GeoService $geoSvc
      * @param JournalRepository $journalRepo
      * @param PirepRepository $pirepRepo
@@ -56,7 +56,7 @@ class PirepController extends RestController
      */
     public function __construct(
         AcarsRepository $acarsRepo,
-        FinanceService $financeSvc,
+        PirepFinanceService $financeSvc,
         GeoService $geoSvc,
         JournalRepository $journalRepo,
         PirepRepository $pirepRepo,

diff --git a/app/Listeners/FinanceEvents.php b/app/Listeners/FinanceEvents.php
@@ -4,7 +4,7 @@
 
 use App\Events\PirepAccepted;
 use App\Events\PirepRejected;
-use App\Services\FinanceService;
+use App\Services\Finance\PirepFinanceService;
 
 /**
  * Subscribe for events that we do some financial processing for
@@ -16,7 +16,7 @@ class FinanceEvents
     private $financeSvc;
 
     public function __construct(
-        FinanceService $financeSvc
+        PirepFinanceService $financeSvc
     ) {
         $this->financeSvc = $financeSvc;
     }

diff --git a/app/Repositories/ExpenseRepository.php b/app/Repositories/ExpenseRepository.php
@@ -37,8 +37,6 @@ public function getAllForType($type, $airline_id=null, $ref_class=null)
 
         if($ref_class) {
             $where['ref_class'] = $ref_class;
-        } else {
-            $where[] = ['ref_class', '=', null];
         }
 
         $expenses = $this->findWhere($where);
@@ -52,12 +50,9 @@ public function getAllForType($type, $airline_id=null, $ref_class=null)
 
             if ($ref_class) {
                 $where['ref_class'] = $ref_class;
-            } else {
-                $where[] = ['ref_class', '=', null];
             }
 
             $airline_expenses = $this->findWhere($where);
-
             $expenses = $expenses->concat($airline_expenses);
         }
 

diff --git a/app/Services/Finance/DailyFinanceService.php b/app/Services/Finance/DailyFinanceService.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services\Finance;
+
+use App\Services\BaseService;
+
+/**
+ * Class DailyFinanceService
+ * @package App\Services\Finance
+ */
+class DailyFinanceService extends BaseService
+{
+    /**
+     * Run all of the daily expense/financials
+     */
+    public function processFinances()
+    {
+
+    }
+}
diff --git a/app/Services/Finance/MonthlyFinanceService.php b/app/Services/Finance/MonthlyFinanceService.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace App\Services\Finance;
+
+use App\Services\BaseService;
+
+/**
+ * Class MonthlyFinanceService
+ * @package App\Services\Finance
+ */
+class MonthlyFinanceService extends BaseService
+{
+    /**
+     * Run all of the daily expense/financials
+     */
+    public function processFinances()
+    {
+
+    }
+}