Merge branch 'dev' into features/phoneValidation

# Conflicts:
#	composer.json
#	composer.lock
This commit is contained in:
T'JAMPENS QUENTIN p2406187
2025-12-09 12:27:19 +01:00
5 changed files with 118 additions and 1 deletions
+83
View File
@@ -0,0 +1,83 @@
<?php
namespace App\Http\Controllers;
use Illuminate\Http\Request;
use Typesense\Client;
use Exception;
use App\Models\Events;
class SearchController extends Controller
{
protected Client $client;
public function __construct()
{
$this->client = new Client([
'api_key' => '',
'nodes' => [
[
'host' => env('TYPESENSE_CONNECTION'),
'port' => '8108',
'protocol' => 'http',
],
],
]);
}
private function createEventsCollection()
{
try {
$collections = $this->client->collections->retrieve();
if (!in_array('events', array_column($collections, 'name'))) {
$this->client->collections->create([
'name' => 'events',
'fields' => [
['name' => 'name', 'type' => 'string'],
['name' => 'description', 'type' => 'string'],
],
]);
}
} catch (Exception $e) {
throw new Exception("Error while creating the events collection : " . $e->getMessage());
}
}
private function indexEvents()
{
try {
$events = Events::all();
foreach ($events as $event) {
$this->client->collections['events']->documents->upsert([
'id' => (string) $event->id,
'name' => $event->name,
'description' => $event->description,
]);
}
} catch (Exception $e) {
throw new Exception("Error while indexing events : " . $e->getMessage());
}
}
public function searchEvents(Request $request)
{
try {
$this->createEventsCollection();
$this->indexEvents();
$query = $request->input('query', '');
$searchResults = $this->client->collections['events']->documents->search([
'q' => $query,
'query_by' => 'name,description',
]);
return response()->json($searchResults);
} catch (Exception $e) {
return response()->json(['error' => $e->getMessage()], 500);
}
}
}
+1
View File
@@ -13,6 +13,7 @@
"laravel/framework": "^12.0", "laravel/framework": "^12.0",
"laravel/sanctum": "^4.0", "laravel/sanctum": "^4.0",
"laravel/tinker": "^2.10.1", "laravel/tinker": "^2.10.1",
"typesense/typesense-php": "*",
"propaganistas/laravel-phone": "^6.0" "propaganistas/laravel-phone": "^6.0"
}, },
"require-dev": { "require-dev": {
+11
View File
@@ -36,8 +36,19 @@ services:
volumes: volumes:
- dbdata:/var/lib/mysql - dbdata:/var/lib/mysql
typesense:
image: typesense/typesense:29.0
restart: on-failure
ports:
- "8108:8108"
volumes:
- typesense-data:/data
command: '--data-dir /data --api-key= --enable-cors'
volumes: volumes:
dbdata: dbdata:
typesense-data:
networks: networks:
default: default:
+4 -1
View File
@@ -1,6 +1,7 @@
<?php <?php
use App\Http\Controllers\EventsController; use App\Http\Controllers\EventsController;
use App\Http\Controllers\SearchController;
use Illuminate\Support\Facades\Route; use Illuminate\Support\Facades\Route;
use App\Http\Controllers\TasksController; use App\Http\Controllers\TasksController;
@@ -24,4 +25,6 @@ Route::middleware(['web', 'auth:sanctum'])->get('/events', [EventsController::cl
Route::middleware(['web', 'auth:sanctum'])->delete('/events/{id}', [EventsController::class, "delete"]); Route::middleware(['web', 'auth:sanctum'])->delete('/events/{id}', [EventsController::class, "delete"]);
Route::middleware(['web', 'auth:sanctum'])->get('/events/{id}', [EventsController::class, "getEvent"]); Route::middleware(['web', 'auth:sanctum'])->get('/events/search', [SearchController::class, "searchEvents"]);
Route::middleware(['web', 'auth:sanctum'])->get('/events/{id}', [EventsController::class, "getEvent"]);
+19
View File
@@ -0,0 +1,19 @@
meta {
name: Search events
type: http
seq: 7
}
get {
url: {{url}}/api/events/search?query=vile
body: none
auth: inherit
}
params:query {
query: vile
}
settings {
encodeUrl: true
}