From 0269f24ac482dee953107ba2d3bcd109aaf7c898 Mon Sep 17 00:00:00 2001
From: mahdi purHosseini <mahdip9811@gmail.com>
Date: Thu, 9 Nov 2023 13:27:03 +0330
Subject: [PATCH] fix pachage fields

---
 app/Http/Controllers/PackageController.php    |  5 ---
 .../Controllers/TransferPackageController.php |  6 ----
 app/Http/Requests/StorePackageRequest.php     |  4 ---
 app/Package.php                               |  2 +-
 ...23_10_26_124700_update_packages_table2.php | 34 +++++++++++++++++++
 5 files changed, 35 insertions(+), 16 deletions(-)
 create mode 100644 database/migrations/2023_10_26_124700_update_packages_table2.php

diff --git a/app/Http/Controllers/PackageController.php b/app/Http/Controllers/PackageController.php
index d724b114..5f7caa25 100644
--- a/app/Http/Controllers/PackageController.php
+++ b/app/Http/Controllers/PackageController.php
@@ -26,9 +26,6 @@ class PackageController extends Controller
             ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
                 $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
             } )
-            ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
-                $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
-            } )
             ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
                 $query->where( 'id' , $request->package_id );
             } )
@@ -66,9 +63,7 @@ class PackageController extends Controller
     {
         $PackageData = [
             'name' => $request->name ,
-            'unique_id' => $request->unique_id ,
             'note' => $request->note ,
-            'udi' => $request->udi ,
             'user_id' => auth( 'api' )->user()->id ,
             'verified' => 'NotVerified' ,
         ];
diff --git a/app/Http/Controllers/TransferPackageController.php b/app/Http/Controllers/TransferPackageController.php
index b5ab8d54..1e839bff 100644
--- a/app/Http/Controllers/TransferPackageController.php
+++ b/app/Http/Controllers/TransferPackageController.php
@@ -80,9 +80,6 @@ class TransferPackageController extends Controller
             ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
                 $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
             } )
-            ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
-                $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
-            } )
             ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
                 $query->where( 'id' , $request->package_id );
             } )
@@ -108,9 +105,6 @@ class TransferPackageController extends Controller
             ->when( $request->has( 'name' ) && $request->name != '' , function ( $query ) use ( $request ) {
                 $query->where( 'name' , 'LIKE' , '%' . $request->name . '%' );
             } )
-            ->when( $request->has( 'udi' ) && $request->udi != '' , function ( $query ) use ( $request ) {
-                $query->where( 'udi' , 'LIKE' , '%' . $request->udi . '%' );
-            } )
             ->when( $request->has( 'package_id' ) && $request->package_id != '' , function ( $query ) use ( $request ) {
                 $query->where( 'id' , $request->package_id );
             } )
diff --git a/app/Http/Requests/StorePackageRequest.php b/app/Http/Requests/StorePackageRequest.php
index 5caacd6d..beff3517 100644
--- a/app/Http/Requests/StorePackageRequest.php
+++ b/app/Http/Requests/StorePackageRequest.php
@@ -23,10 +23,8 @@ class StorePackageRequest extends FormRequest
             case 'POST': {
                 return [
                     'name' => 'required|max:250|unique:packages',
-                    'unique_id' => 'nullable|max:250|unique:packages',
                     'note' => 'nullable',
                     'items' => 'required',
-                    'udi' => 'required|max:100|unique:packages',
                 ];
                 break;
             }
@@ -35,10 +33,8 @@ class StorePackageRequest extends FormRequest
                 $Package =  $this->route('Package');
                 return [
                     'name' => 'required|max:250|unique:packages,name,'.$Package->id,
-                    'unique_id' => 'nullable|max:250|unique:packages,unique_id,'.$Package->id,
                     'note' => 'nullable',
                     'items' => 'required',
-                    'udi' => 'required|max:100|unique:packages,udi,'.$Package->id,
                 ];
                 break;
 
diff --git a/app/Package.php b/app/Package.php
index 991505d9..d42b9dcc 100644
--- a/app/Package.php
+++ b/app/Package.php
@@ -6,7 +6,7 @@
 
     class Package extends Model
     {
-        public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' , 'udi' ];
+        public $fillable = [ 'name' , 'unique_id' , 'user_id' , 'note' , 'verified' ];
 
         public function user()
         {
diff --git a/database/migrations/2023_10_26_124700_update_packages_table2.php b/database/migrations/2023_10_26_124700_update_packages_table2.php
new file mode 100644
index 00000000..72fa4c74
--- /dev/null
+++ b/database/migrations/2023_10_26_124700_update_packages_table2.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Support\Facades\Schema;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Database\Migrations\Migration;
+
+class UpdatePackagesTable2 extends Migration
+{
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('packages', function (Blueprint $table) {
+            $table->dropColumn('uid');
+            $table->dropColumn('unique_id');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('packages', function (Blueprint $table) {
+            $table->string('uid')->nullable();
+            $table->string('unique_id')->nullable();
+        });
+    }
+}