Add graphs and draggable ui (#10)

* Add a query page so people can discover their own query url. And add some base things for the graph. * Add a working metrics system, and failed jobs viewer. * Remove code that caused a bug * Address PR feedback * Refactor the tests, and clean up the filiters so they use Arrayable * Refactor the ugly chart controller some by adding a repository method for getting the transactions by dates... * Add transaction repositorycontract * Add metric and value changes. And update the ugly chart controller some more. * Update the graph/metrics * Update ugly controller more, and update the settings with toasted * Fix the bugon the metrics
austinkregel · Jun 29, 2020 · 52ac0d3 · 52ac0d3
1 parent 625815d
commit 52ac0d3
Show file tree

Hide file tree

Showing 75 changed files with 1,469 additions and 11,975 deletions.
diff --git a/app/Console/Commands/GenerateChannelsAndAlertsFile.php b/app/Console/Commands/GenerateChannelsAndAlertsFile.php
@@ -123,8 +123,8 @@ public function handle()
                 'name' => 'transaction.category.name'
             ],
             [
-                'value' => 'tag.name',
-                'name' => 'transaction.tag.name'
+                'value' => 'tag.name.en',
+                'name' => 'transaction.tag.name.en'
             ],
         ]);
 

diff --git a/app/Contracts/ConditionContract.php b/app/Contracts/ConditionContract.php
@@ -2,7 +2,9 @@
 
 namespace App\Contracts\Models;
 
+use Illuminate\Contracts\Support\Arrayable;
+
 interface ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool;
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool;
 }
diff --git a/app/Contracts/Repositories/TransactionRepository.php b/app/Contracts/Repositories/TransactionRepository.php
diff --git a/app/Contracts/Repositories/TransactionRepositoryContract.php b/app/Contracts/Repositories/TransactionRepositoryContract.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace App\Contracts\Repositories;
+
+use App\User;
+use Carbon\Carbon;
+use Illuminate\Support\Collection;
+
+/**
+ * Interface TransactionRepository.
+ *
+ * @package namespace App\Contracts\Repositories;
+ */
+interface TransactionRepositoryContract extends AbstractRepositoryInterface
+{
+    public function findAllBetweenDateForUserInScope(User $user, Carbon $startDate, Carbon $endDate, string $scope): Collection;
+}
diff --git a/app/Filters/Conditions/EndsWith.php b/app/Filters/Conditions/EndsWith.php
@@ -4,12 +4,14 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class EndsWith implements ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return Str::endsWith($item[$condition->getComparatorField()], $condition->getComparatorValue()) ;
+        return Str::endsWith(Arr::get($item->toArray(), $condition->getComparatorField()), $condition->getComparatorValue()) ;
     }
 }
diff --git a/app/Filters/Conditions/EqualFilter.php b/app/Filters/Conditions/EqualFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class EqualFilter implements ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return $condition->getComparatorValue() == $item[$condition->getComparatorField()];
+        return $condition->getComparatorValue() == Arr::get($item->toArray(), $condition->getComparatorField());
     }
 }
diff --git a/app/Filters/Conditions/GreaterThan.php b/app/Filters/Conditions/GreaterThan.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class GreaterThan implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return $items[$condition->getComparatorField()] > $condition->getComparatorValue();
+        return Arr::get($item->toArray(), $condition->getComparatorField()) > $condition->getComparatorValue();
     }
 }
diff --git a/app/Filters/Conditions/GreaterThanEqual.php b/app/Filters/Conditions/GreaterThanEqual.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class GreaterThanEqual implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return $items[$condition->getComparatorField()] >= $condition->getComparatorValue();
+        return Arr::get($item->toArray(), $condition->getComparatorField()) >= $condition->getComparatorValue();
     }
 }
diff --git a/app/Filters/Conditions/InFilter.php b/app/Filters/Conditions/InFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class InFilter implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return in_array($condition->getComparatorValue(), $items[$condition->getComparatorField()]);
+        return in_array($condition->getComparatorValue(), Arr::get($item->toArray(), $condition->getComparatorField()));
     }
 }
diff --git a/app/Filters/Conditions/InLikeFilter.php b/app/Filters/Conditions/InLikeFilter.php
@@ -4,12 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
 
 class InLikeFilter implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $items, ConditionalsContract $condition): bool
     {
-        foreach ($items as $value) {
+        foreach ($items->toArray() as $value) {
             if (stripos($value[$condition->getComparatorField()], $condition->getComparatorValue()) !== false) {
                 return true;
             }

diff --git a/app/Filters/Conditions/LessThanEqualFilter.php b/app/Filters/Conditions/LessThanEqualFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class LessThanEqualFilter implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return $items[$condition->getComparatorField()] <= $condition->getComparatorValue();
+        return Arr::get($item->toArray(), $condition->getComparatorField()) <= $condition->getComparatorValue();
     }
 }
diff --git a/app/Filters/Conditions/LessThanFilter.php b/app/Filters/Conditions/LessThanFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class LessThanFilter implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return $items[$condition->getComparatorField()] < $condition->getComparatorValue();
+        return Arr::get($item->toArray(), $condition->getComparatorField()) < $condition->getComparatorValue();
     }
 }
diff --git a/app/Filters/Conditions/LikeFilter.php b/app/Filters/Conditions/LikeFilter.php
@@ -4,14 +4,15 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
 use Illuminate\Support\Arr;
 
 class LikeFilter implements ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
         return stripos(
-            Arr::get($item, $condition->getComparatorField()),
+            Arr::get($item->toArray(), $condition->getComparatorField()),
             $condition->getComparatorValue()
         ) !== false;
     }

diff --git a/app/Filters/Conditions/NotEqualFilter.php b/app/Filters/Conditions/NotEqualFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class NotEqualFilter implements ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return $condition->getComparatorValue() != $item[$condition->getComparatorField()];
+        return $condition->getComparatorValue() != Arr::get($item->toArray(), $condition->getComparatorField());
     }
 }
diff --git a/app/Filters/Conditions/NotInFilter.php b/app/Filters/Conditions/NotInFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class NotInFilter implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return !in_array($condition->getComparatorValue(), $items[$condition->getComparatorField()]);
+        return !in_array($condition->getComparatorValue(), Arr::get($item->toArray(), $condition->getComparatorField()));
     }
 }
diff --git a/app/Filters/Conditions/NotInLikeFilter.php b/app/Filters/Conditions/NotInLikeFilter.php
@@ -4,12 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
 
 class NotInLikeFilter implements ConditionContract
 {
-    public function __invoke($items, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        foreach ($items as $value) {
+        foreach ($item->toArray() as $value) {
             if (stripos($value[$condition->getComparatorField()], $condition->getComparatorValue()) === false) {
                 return false;
             }

diff --git a/app/Filters/Conditions/NotLikeFilter.php b/app/Filters/Conditions/NotLikeFilter.php
@@ -4,11 +4,13 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 
 class NotLikeFilter implements ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return stripos($item[$condition->getComparatorField()], $condition->getComparatorValue()) === false;
+        return stripos(Arr::get($item->toArray(), $condition->getComparatorField()), $condition->getComparatorValue()) === false;
     }
 }
diff --git a/app/Filters/Conditions/StartsWith.php b/app/Filters/Conditions/StartsWith.php
@@ -4,12 +4,14 @@
 
 use App\Contracts\Models\ConditionalsContract;
 use App\Contracts\Models\ConditionContract;
+use Illuminate\Contracts\Support\Arrayable;
+use Illuminate\Support\Arr;
 use Illuminate\Support\Str;
 
 class StartsWith implements ConditionContract
 {
-    public function __invoke($item, ConditionalsContract $condition): bool
+    public function __invoke(Arrayable $item, ConditionalsContract $condition): bool
     {
-        return Str::startsWith($item[$condition->getComparatorField()], $condition->getComparatorValue()) ;
+        return Str::startsWith(Arr::get($item->toArray(), $condition->getComparatorField()), $condition->getComparatorValue()) ;
     }
 }
diff --git a/app/Filters/Metrics/TrendFilter.php b/app/Filters/Metrics/TrendFilter.php
@@ -0,0 +1,35 @@
+<?php
+
+namespace App\Filters\Metrics;
+
+use App\Models\Transaction;
+use Illuminate\Support\Collection;
+
+class TrendFilter
+{
+    public function handle(array $duration, Collection $data): array
+    {
+        [$durationStart, $durationEnd] = $duration;
+
+        $numericalDuration = $durationStart->diffInDays($durationEnd);
+
+        if ($numericalDuration > 31) {
+            $numericalDuration = $durationStart->diffInMonths($durationEnd);
+        }
+        $returnedData = [];
+
+        for ($i = 0; $i < $numericalDuration; $i++) {
+            $returnedData[$durationStart->copy()->addDay($i)->format('m/d')] = 0;
+        }
+
+        $data->each(function (Transaction $transaction) use (&$returnedData) {
+            if (!array_key_exists($transaction->date->format('m/d'), $returnedData)) {
+                $returnedData[$transaction->date->format('m/d')] = 0;
+            }
+
+            $returnedData[$transaction->date->format('m/d')] += $transaction->amount;
+        });
+
+        return $returnedData;
+    }
+}
diff --git a/app/Http/Controllers/Api/CacheController.php b/app/Http/Controllers/Api/CacheController.php
@@ -0,0 +1,14 @@
+<?php
+
+namespace App\Http\Controllers\Api;
+
+use Illuminate\Http\Request;
+
+class CacheController
+{
+    public function __invoke(Request $request)
+    {
+        cache()->tags([$request->user()->email])->flush();
+        return response('', 200);
+    }
+}
diff --git a/app/Http/Controllers/Api/TagController.php b/app/Http/Controllers/Api/TagController.php
@@ -92,8 +92,8 @@ public function conditionals(ConditionalsRequest $request, Tag $tag)
     {
         try {
             $tag->transactions()->sync([]);
-            $response = $this->json(
-                $tag->conditionals()->create($request->json()->all() + ['type' => 'automatic'])
+            return $this->json(
+                $tag->conditionals()->create($request->json()->all())
             );
         } finally {
             $this->dispatch(new SyncTagsWithTransactionsInDatabase($request->user()));