Merge pull request 'fix trasnfer' (#12) from feauter/fix-transfer into master

Reviewed-on: https://git.willaspace.com/external-projects/cssd-back/pulls/12

app/Http/Controllers/ItemController.php

@@ -134,6 +134,9 @@ class ItemController extends Controller
                     } ,
                     'user.medical_center' => function ( $query ) {
                         $query->select( 'id' , 'name' , 'address' , 'phone_number' );
+                    },
+                    'userTransfer' => function ($query) {
+                        $query->select('id','name','cell_number');
                     }
                 ] );
             }

app/Http/Controllers/PackageController.php

@@ -98,10 +98,14 @@ class PackageController extends Controller
                     },
                     'user.medical_center' => function ($query) {
                         $query->select('id', 'name', 'address', 'phone_number');
+                    },
+                    'userTransfer' => function ($query) {
+                        $query->select('id','name','cell_number');
                     }
                 ]);
             }
         ]);
+
         return PackageResource::make($Package);
     }
 

app/Http/Controllers/TransferItemController.php

@@ -63,6 +63,7 @@ class TransferItemController extends Controller
         }
         if ( $Item->user_id != $request->user_id ) {
             $Item->transfers()->create( [
+                "user_transfer_id" => auth()->user()->id,
                 "user_id" => $request->user_id ,
                 "from_date" => Carbon::now() ,
                 "status" => StatusTypeEnum::APPROVED

app/Http/Controllers/TransferPackageController.php

@@ -70,6 +70,7 @@ class TransferPackageController extends Controller
 
             //create transfer for the Package
             $Package->transfers()->create( [
+                "user_transfer_id" => auth()->user()->id,
                 "user_id" => $request->user_id ,
                 "from_date" => Carbon::now() ,
                 "status" => StatusTypeEnum::APPROVED

app/Http/Resources/TransferResource.php

@@ -22,6 +22,8 @@ class TransferResource extends JsonResource
             'status' => $this->status,
             'user_id' => $this->user_id,
             'user' => UserResource::make($this->whenLoaded('user')),
+            'user_transfer_id' => $this->user_transfer_id,
+            'userTransfer' => UserResource::make($this->whenLoaded('userTransfer')),
             'transferable' => $this->resourceFinder(),
             'created_at' => $this->created_at,
             'updated_at' => $this->updated_at

app/Transfer.php

@@ -9,13 +9,18 @@ class Transfer extends Model
 {
     use SoftDeletes;
 
-    public $fillable = [ 'user_id' , 'to_date' , 'from_date' , 'status' ];
+    public $fillable = [ 'user_id' , 'to_date' , 'from_date' , 'status' , 'user_transfer_id' ];
 
     public function user()
     {
         return $this->belongsTo( 'App\User' );
     }
 
+    public function userTransfer()
+    {
+        return $this->belongsTo( 'App\User', 'user_transfer_id' );
+    }
+
     public function transferable()
     {
         return $this->morphTo();

database/migrations/2024_05_05_105944_add_user_transfer_id_to_transfers_table.php

@@ -0,0 +1,32 @@
+<?php
+
+use back\vendor\laravel\framework\src\Illuminate\Support\Facades\Schema;
+use back\vendor\laravel\framework\src\Illuminate\Database\Schema\Blueprint;
+use back\vendor\laravel\framework\src\Illuminate\Database\Migrations\Migration;
+
+class AddUserTransferIdToTransfersTable extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('transfers', function (Blueprint $table) {
+            $table->unsignedBigInteger('user_transfer_id')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('transfers', function (Blueprint $table) {
+            $table->dropColumn('user_transfer_id');
+        });
+    }
+}