أُنشئ من Tokal/Test
feat: improve backend storage for landing page messages
فشلت بعض الفحوصات
Deploy Backend / deploy (push) Has been cancelled
فشلت بعض الفحوصات
Deploy Backend / deploy (push) Has been cancelled
هذا الالتزام موجود في:
@@ -17,6 +17,9 @@ class FeedbackController extends Controller
|
|||||||
|
|
||||||
$feedback = UserFeedback::create([
|
$feedback = UserFeedback::create([
|
||||||
'user_id' => $request->user()->id,
|
'user_id' => $request->user()->id,
|
||||||
|
'sender_name' => trim(($request->user()->first_name ?? '') . ' ' . ($request->user()->last_name ?? '')) ?: null,
|
||||||
|
'sender_email' => $request->user()->email,
|
||||||
|
'source' => 'mobile_app',
|
||||||
'message' => $validated['message'],
|
'message' => $validated['message'],
|
||||||
]);
|
]);
|
||||||
|
|
||||||
@@ -34,28 +37,16 @@ class FeedbackController extends Controller
|
|||||||
{
|
{
|
||||||
$validated = $request->validate([
|
$validated = $request->validate([
|
||||||
'message' => 'required|string|min:5|max:2000',
|
'message' => 'required|string|min:5|max:2000',
|
||||||
'name' => 'nullable|string|max:120',
|
'name' => 'required|string|max:120',
|
||||||
'email' => 'nullable|email|max:255',
|
'email' => 'required|email|max:255',
|
||||||
]);
|
]);
|
||||||
|
|
||||||
$details = [];
|
|
||||||
if (! empty($validated['name'])) {
|
|
||||||
$details[] = 'Name: ' . trim($validated['name']);
|
|
||||||
}
|
|
||||||
if (! empty($validated['email'])) {
|
|
||||||
$details[] = 'Email: ' . trim($validated['email']);
|
|
||||||
}
|
|
||||||
|
|
||||||
$message = trim($validated['message']);
|
|
||||||
if (! empty($details)) {
|
|
||||||
$message .= "\n\n[Landing Page]\n" . implode("\n", $details);
|
|
||||||
} else {
|
|
||||||
$message .= "\n\n[Landing Page]";
|
|
||||||
}
|
|
||||||
|
|
||||||
$feedback = UserFeedback::create([
|
$feedback = UserFeedback::create([
|
||||||
'user_id' => null,
|
'user_id' => null,
|
||||||
'message' => $message,
|
'sender_name' => trim($validated['name']),
|
||||||
|
'sender_email' => trim($validated['email']),
|
||||||
|
'source' => 'landing_page',
|
||||||
|
'message' => trim($validated['message']),
|
||||||
]);
|
]);
|
||||||
|
|
||||||
return response()->json([
|
return response()->json([
|
||||||
@@ -85,6 +76,9 @@ class FeedbackController extends Controller
|
|||||||
$data = collect($paginator->items())->map(function (UserFeedback $item) {
|
$data = collect($paginator->items())->map(function (UserFeedback $item) {
|
||||||
return [
|
return [
|
||||||
'id' => $item->id,
|
'id' => $item->id,
|
||||||
|
'sender_name' => $item->sender_name,
|
||||||
|
'sender_email' => $item->sender_email,
|
||||||
|
'source' => $item->source,
|
||||||
'message' => $item->message,
|
'message' => $item->message,
|
||||||
'created_at' => $item->created_at,
|
'created_at' => $item->created_at,
|
||||||
'user' => [
|
'user' => [
|
||||||
|
|||||||
@@ -14,6 +14,9 @@ class UserFeedback extends Model
|
|||||||
|
|
||||||
protected $fillable = [
|
protected $fillable = [
|
||||||
'user_id',
|
'user_id',
|
||||||
|
'sender_name',
|
||||||
|
'sender_email',
|
||||||
|
'source',
|
||||||
'message',
|
'message',
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,56 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
use Illuminate\Database\Migrations\Migration;
|
||||||
|
use Illuminate\Database\Schema\Blueprint;
|
||||||
|
use Illuminate\Support\Facades\Schema;
|
||||||
|
|
||||||
|
return new class extends Migration
|
||||||
|
{
|
||||||
|
public function up(): void
|
||||||
|
{
|
||||||
|
if (! Schema::hasTable('user_feedback')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Schema::table('user_feedback', function (Blueprint $table) {
|
||||||
|
if (! Schema::hasColumn('user_feedback', 'sender_name')) {
|
||||||
|
$table->string('sender_name', 120)->nullable()->after('user_id');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! Schema::hasColumn('user_feedback', 'sender_email')) {
|
||||||
|
$table->string('sender_email')->nullable()->after('sender_name');
|
||||||
|
}
|
||||||
|
|
||||||
|
if (! Schema::hasColumn('user_feedback', 'source')) {
|
||||||
|
$table->string('source', 40)->nullable()->after('sender_email');
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
|
||||||
|
public function down(): void
|
||||||
|
{
|
||||||
|
if (! Schema::hasTable('user_feedback')) {
|
||||||
|
return;
|
||||||
|
}
|
||||||
|
|
||||||
|
Schema::table('user_feedback', function (Blueprint $table) {
|
||||||
|
$drops = [];
|
||||||
|
|
||||||
|
if (Schema::hasColumn('user_feedback', 'source')) {
|
||||||
|
$drops[] = 'source';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Schema::hasColumn('user_feedback', 'sender_email')) {
|
||||||
|
$drops[] = 'sender_email';
|
||||||
|
}
|
||||||
|
|
||||||
|
if (Schema::hasColumn('user_feedback', 'sender_name')) {
|
||||||
|
$drops[] = 'sender_name';
|
||||||
|
}
|
||||||
|
|
||||||
|
if ($drops !== []) {
|
||||||
|
$table->dropColumn($drops);
|
||||||
|
}
|
||||||
|
});
|
||||||
|
}
|
||||||
|
};
|
||||||
المرجع في مشكلة جديدة
حظر مستخدم