Merge pull request #56 from saleem-hadad/feat/move-search-to-interface

implement search as interface and added to transactions #feature

app/Contracts/Searchable.php

@@ -0,0 +1,10 @@
+<?php
+
+namespace App\Contracts;
+
+use Illuminate\Database\Eloquent\Builder;
+
+interface Searchable
+{
+    public function search($query): Builder;
+}

app/GraphQL/Directives/SearchDirective.php

@@ -2,7 +2,7 @@
 
 namespace App\GraphQL\Directives;
 
-use App\Models\Transaction;
+use App\Contracts\Searchable;
 use Illuminate\Database\Eloquent\Builder;
 use Nuwave\Lighthouse\Schema\Directives\BaseDirective;
 use Nuwave\Lighthouse\Support\Contracts\ArgBuilderDirective;
@@ -29,11 +29,8 @@ public static function definition(): string
      */
     public function handleBuilder($builder, $value): Builder
     {
-        if($builder->getModel() instanceof Transaction) {
-            return $builder->where('amount', 'LIKE', "%$value%")
-                ->orWhereHas('brand', function($builder) use($value) {
-                    return $builder->where('name', 'LIKE', "%$value%");
-                })->orWhere('note', 'LIKE', "%$value%");
+        if($builder->getModel() instanceof Searchable) {
+            return $builder->getModel()->search($value);
         }
 
         return $builder;

app/Models/Transaction.php

@@ -3,10 +3,12 @@
 namespace App\Models;
 
 use Carbon\Carbon;
+use App\Contracts\Searchable;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Builder;
 use Illuminate\Database\Eloquent\Factories\HasFactory;
 
-class Transaction extends Model
+class Transaction extends Model implements Searchable
 {
     use HasFactory;
 
@@ -15,52 +17,52 @@ class Transaction extends Model
     protected $casts = [
         'meta' => 'array',
     ];
-    
+
     public function brand()
     {
         return $this->belongsTo(Brand::class);
     }
 
-    public function scopeExpenses($query) 
+    public function scopeExpenses($query)
     {
         return $query->whereHas('brand.category', function ($query) {
             return $query->where('type', Category::EXPENSES);
         });
     }
 
-    public function scopeIncome($query) 
+    public function scopeIncome($query)
     {
         return $query->whereHas('brand.category', function ($query) {
             return $query->where('type', Category::INCOME);
         });
     }
 
-    public function scopeSavings($query) 
+    public function scopeSavings($query)
     {
         return $query->whereHas('brand.category', function ($query) {
             return $query->where('type', Category::SAVINGS);
         });
     }
 
-    public function scopeInvestment($query) 
+    public function scopeInvestment($query)
     {
         return $query->whereHas('brand.category', function ($query) {
             return $query->where('type', Category::INVESTMENT);
         });
     }
 
-    public static function tryCreateFromSms($sms) 
+    public static function tryCreateFromSms($sms)
     {
         $brandFromSms = $sms->meta['data']['brand'] ?? null;
         $amountFromSms = $sms->meta['data']['amount'] ?? null;
         $transactionDatetimeFromSMS = $sms->meta['data']['datetime'] ?? null;
-        
+
         if(! $brandFromSms || ! $amountFromSms) {
             return;
         }
 
         $brand = Brand::findOrCreateNew($brandFromSms);
-        
+
         $amount = (float) filter_var($amountFromSms, FILTER_SANITIZE_NUMBER_FLOAT, FILTER_FLAG_ALLOW_FRACTION);
         $transactionDatetime = $transactionDatetimeFromSMS ? Carbon::parse($transactionDatetimeFromSMS) : now();
 
@@ -70,4 +72,18 @@ public static function tryCreateFromSms($sms)
             'created_at' => $transactionDatetime
         ]);
     }
+
+    /**
+     * @param $query
+     * @return Builder
+     */
+    public function search($query): Builder
+    {
+        return $this->newQuery()
+            ->where('amount', 'LIKE', "%$query%")
+            ->orWhere('note', 'LIKE', "%$query%")
+            ->orWhereHas('brand', function($builder) use($query) {
+                return $builder->where('name', 'LIKE', "%$query%");
+            });
+    }
 }

tests/Feature/AuthenticationTest.php → tests/Feature/Auth/AuthenticationTest.php

@@ -1,6 +1,6 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Auth;
 
 use App\Models\User;
 use App\Providers\RouteServiceProvider;

tests/Feature/AllBrandsTest.php → tests/Feature/Brands/AllBrandsTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Brands;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class AllBrandsTest extends TestCase
 {

tests/Feature/BrandsTest.php → tests/Feature/Brands/BrandsTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Brands;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class BrandsTest extends TestCase
 {

tests/Feature/CreateBrandTest.php → tests/Feature/Brands/CreateBrandTest.php

@@ -1,11 +1,11 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Brands;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class CreateBrandTest extends TestCase
 {

tests/Feature/DeleteBrandTest.php → tests/Feature/Brands/DeleteBrandTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Brands;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class DeleteBrandTest extends TestCase
 {

tests/Feature/UpdateBrandTest.php → tests/Feature/Brands/UpdateBrandTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Brands;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class UpdateBrandTest extends TestCase
 {

tests/Feature/AllCategoriesTest.php → tests/Feature/Categories/AllCategoriesTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Categories;
 
-use Tests\TestCase;
 use App\Models\Category;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class AllCategoriesTest extends TestCase
 {
@@ -17,8 +17,8 @@ public function it_returns_correct_data()
 
         $this->graphQL(/** @lang GraphQL */ '
             {
-                allCategories { 
-                    id 
+                allCategories {
+                    id
                     name
                 }
             }

tests/Feature/CategoriesTest.php → tests/Feature/Categories/CategoriesTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Categories;
 
 use App\Models\Category;
-use Tests\TestCase;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class CategoriesTest extends TestCase
 {

tests/Feature/CreateCategoryTest.php → tests/Feature/Categories/CreateCategoryTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Categories;
 
-use Tests\TestCase;
 use App\Models\Category;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class CreateCategoryTest extends TestCase
 {

tests/Feature/DeleteCategoryTest.php → tests/Feature/Categories/DeleteCategoryTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Categories;
 
-use Tests\TestCase;
 use App\Models\Category;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class DeleteCategoryTest extends TestCase
 {

tests/Feature/UpdateCategoryTest.php → tests/Feature/Categories/UpdateCategoryTest.php

@@ -1,10 +1,10 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\Categories;
 
-use Tests\TestCase;
 use App\Models\Category;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class UpdateCategoryTest extends TestCase
 {

tests/Feature/ExpensesPerCategoryTest.php → tests/Feature/GraphQL/Queries/ExpensesPerCategoryTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class ExpensesPerCategoryTest extends TestCase
 {

tests/Feature/HighestValueTransactionTest.php → tests/Feature/GraphQL/Queries/HighestValueTransactionTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class HighestValueTransactionTest extends TestCase
 {

tests/Feature/IncomePerCategoryTest.php → tests/Feature/GraphQL/Queries/IncomePerCategoryTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class IncomePerCategoryTest extends TestCase
 {

tests/Feature/LowestValueTransactionTest.php → tests/Feature/GraphQL/Queries/LowestValueTransactionTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class LowestValueTransactionTest extends TestCase
 {

tests/Feature/NumberOfTransactionsPerBrandTest.php → tests/Feature/GraphQL/Queries/NumberOfTransactionsPerBrandTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class NumberOfTransactionsPerBrandTest extends TestCase
 {

tests/Feature/NumberOfTransactionsPerCategoryTest.php → tests/Feature/GraphQL/Queries/NumberOfTransactionsPerCategoryTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class NumberOfTransactionsPerCategoryTest extends TestCase
 {

tests/Feature/NumberOfTransactionsTest.php → tests/Feature/GraphQL/Queries/NumberOfTransactionsTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class NumberOfTransactionsTest extends TestCase
 {

tests/Feature/TotalCashTest.php → tests/Feature/GraphQL/Queries/TotalCashTest.php

@@ -1,12 +1,12 @@
 <?php
 
-namespace Tests\Feature;
+namespace Tests\Feature\GraphQL\Queries;
 
-use Tests\TestCase;
 use App\Models\Brand;
 use App\Models\Category;
 use App\Models\Transaction;
 use Illuminate\Foundation\Testing\RefreshDatabase;
+use Tests\TestCase;
 
 class TotalCashTest extends TestCase
 {