Searching backend

This commit is contained in:
Peter Papp
2021-04-22 09:33:52 +02:00
parent 5b70066900
commit 73861f814c
8 changed files with 166 additions and 27 deletions
@@ -2,10 +2,10 @@
namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Resources\Oasis\OasisClientCollection;
use App\Http\Controllers\Controller;
use App\Models\Oasis\Client;
use Auth;
use Illuminate\Http\Request;
class ClientController extends Controller
{
@@ -18,4 +18,20 @@ class ClientController extends Controller
new OasisClientCollection(Auth::user()->clients), 200
);
}
/**
* @return mixed
*/
public function search()
{
$query = remove_accents(request()->input('query'));
$results = Client::search($query)
->where('user_id', request()->user()->id)
->get();
return response(
new OasisClientCollection($results), 200
);
}
}
@@ -4,6 +4,7 @@ namespace App\Http\Controllers\Oasis;
use App\Http\Controllers\Controller;
use App\Http\Resources\Oasis\OasisInvoiceCollection;
use App\Models\Oasis\Invoice;
use Auth;
use Illuminate\Http\Request;
@@ -28,4 +29,21 @@ class InvoiceController extends Controller
new OasisInvoiceCollection(Auth::user()->advanceInvoices), 200
);
}
/**
* @return mixed
*/
public function search()
{
$query = remove_accents(request()->input('query'));
$results = Invoice::search($query)
->where('user_id', request()->user()->id)
->where('invoice_type', request()->input('type'))
->get();
return response(
new OasisInvoiceCollection($results), 200
);
}
}
+25 -2
View File
@@ -6,10 +6,12 @@ use App\Models\User;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Laravel\Scout\Searchable;
use TeamTNT\TNTSearch\Indexer\TNTIndexer;
class Client extends Model
{
use HasFactory;
use HasFactory, Searchable;
public $guarded = ['id'];
@@ -27,12 +29,33 @@ class Client extends Model
return $this->hasMany(Invoice::class, 'client_id', 'id');
}
/**
* Index file
*
* @return array
*/
public function toSearchableArray()
{
$array = $this->toArray();
$client_name = Str::slug($array['name'], ' ');
$client_email = Str::slug($array['email'], ' ');
return [
'id' => $this->id,
'clientName' => $array['name'],
'clientNameNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_name]))),
'clientEmail' => $array['email'],
'clientEmailNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_email]))),
];
}
protected static function boot()
{
parent::boot();
static::creating(function ($order) {
$order->id = Str::uuid();
$order->id = (string) Str::uuid();
});
}
}
+24 -2
View File
@@ -7,10 +7,12 @@ use Carbon\Carbon;
use Illuminate\Database\Eloquent\Factories\HasFactory;
use Illuminate\Database\Eloquent\Model;
use Illuminate\Support\Str;
use Laravel\Scout\Searchable;
use TeamTNT\TNTSearch\Indexer\TNTIndexer;
class Invoice extends Model
{
use HasFactory;
use HasFactory, Searchable;
protected $casts = [
'items' => 'array',
@@ -34,12 +36,32 @@ class Invoice extends Model
return $this->hasOne(Client::class, 'id', 'user_id');
}
/**
* Index file
*
* @return array
*/
public function toSearchableArray()
{
$array = $this->toArray();
$client_name = Str::slug($array['client']['name'], ' ');
return [
'id' => $this->id,
'clientName' => $array['client']['name'],
'clientNameNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$client_name]))),
'invoiceNumber' => $array['invoice_number'],
'invoiceNumberNgrams' => utf8_encode((new TNTIndexer)->buildTrigrams(implode(', ', [$array['invoice_number']]))),
];
}
protected static function boot()
{
parent::boot();
static::creating(function ($invoice) {
$invoice->id = Str::uuid();
$invoice->id = (string)Str::uuid();
$invoice->delivery_at = $invoice->created_at;
$invoice->due_at = Carbon::parse($invoice->created_at)->addWeeks(2);