Merge pull request #398 from tulbadex/fix/fix-auth-docs

Fix: fix auth docs

app/Http/Controllers/Api/V1/Auth/AuthController.php

@@ -11,6 +11,8 @@
 use Illuminate\Support\Facades\Hash;
 use Tymon\JWTAuth\Facades\JWTAuth;
 use App\Models\User;
+use App\Models\Organisation;
+use App\Models\OrganisationUser;
 use Illuminate\Support\Facades\Log;
 use App\Models\Validators\AuthValidator;
 use Illuminate\Support\Facades\Validator;
@@ -47,6 +49,7 @@ public function store(Request $request)
             'first_name' => 'required|string|max:255',
             'last_name' => 'required|string|max:255',
             'email' => 'required|string|email:rfc|max:255|unique:users',
+            'admin_secret' => 'nullable|string|max:255',
             'password' => ['required', 'string', Password::min(8)
             ->letters()
             ->mixedCase()
@@ -63,26 +66,45 @@ public function store(Request $request)
         try {
             DB::beginTransaction();
 
+            $role = $request->admin_secret ? 'admin' : 'user';
+
             // Creating the user
             $user = User::create([
                 'name' => $request->name,
                 'email' => $request->email,
                 'password' => Hash::make($request->password),
-                'role' => 'user'
+                'role' => $role
             ]);
 
             $profile = $user->profile()->create([
                 'first_name' => $request->first_name,
                 'last_name' => $request->last_name
             ]);
 
+            $organization = $user->owned_organisations()->create([
+                'name' => $request->first_name."'s Organisation",
+            ]);
+
+            $organization_user = OrganisationUser::create([
+                'user_id' => $user->id,
+                'org_id' => $organization->org_id
+            ]);
+
+            $roles = $user->roles()->create([
+                'name' => $role,
+                'org_id' => $organization->org_id
+            ]);
+            DB::table('users_roles')->insert([
+                'user_id' => $user->id,
+                'role_id' => $roles->id
+            ]);
+
             // Generate JWT token
             $token = JWTAuth::fromUser($user);
 
             DB::commit();
 
             return response()->json([
-
                 'status' => 201,
                 "message" => "User Created Successfully",
                 'access_token' => $token,
@@ -103,6 +125,7 @@ public function store(Request $request)
 
             return $this->apiResponse('Registration unsuccessful', Response::HTTP_BAD_REQUEST);
         }
+
     }
 
     /**

app/Models/Organisation.php

@@ -57,6 +57,12 @@ public function users()
         return $this->belongsToMany(User::class, 'organisation_user', 'org_id', 'user_id')->using(OrganisationUser::class);
     }
 
+    // Define the inverse relationship
+    public function owner()
+    {
+        return $this->belongsTo(User::class, 'user_id', 'id');
+    }
+
     public function getPublicColumns()
     {
         $publicColumns = ['org_id', "user_id", "name", "slug", "description", "email", "industry", "type", "country", "address", "state"];

config/swagger-ui.php

@@ -8,13 +8,15 @@
             /*
              * The path where the swagger file is served.
              */
-            'path' => 'documentation',
+            // 'path' => 'documentation',
+            'path' => 'docs',
 
             /*
              * The versions of the swagger file. The key is the version name and the value is the path to the file.
              */
             'versions' => [
-                'v1' => resource_path('docs/documentation.json'),
+                // 'v1' => resource_path('docs/documentation.json'),
+                'v1' => resource_path('docs/docs.json'),
             ],
 
             /*

database/factories/OrderFactory.php

@@ -5,6 +5,7 @@
 use App\Models\Product;
 use App\Models\User;
 use Illuminate\Database\Eloquent\Factories\Factory;
+use Illuminate\Support\Facades\DB;
 
 /**
  * @extends \Illuminate\Database\Eloquent\Factories\Factory<\App\Models\Order>
@@ -18,12 +19,33 @@ class OrderFactory extends Factory
      */
     public function definition(): array
     {
+        $orderNumber = $this->generateUniqueOrderNumber();
+
         return [
             'user_id' => User::factory(),
             'product_id' => Product::factory(),
             'status' => $this->faker->boolean,
             'quantity' => $this->faker->randomDigit(),
-            'amount' => $this->faker->randomDigit(),
+            'total_amount' => $this->faker->randomDigit(),
+            'order_number' => $orderNumber,
         ];
     }
+
+    protected function generateUniqueOrderNumber()
+    {
+        $unique = false;
+        $orderNumber = null;
+
+        while (!$unique) {
+            // Generate a random order number (e.g., 8 digits)
+            $orderNumber = $this->faker->unique()->regexify('[A-Za-z0-9]{8}');
+
+            // Check if the generated order number is unique in the database
+            if (!DB::table('orders')->where('order_number', $orderNumber)->exists()) {
+                $unique = true;
+            }
+        }
+
+        return $orderNumber;
+    }
 }

database/migrations/2024_07_18_200734_create_organisations_table.php

@@ -15,13 +15,13 @@ public function up(): void
             $table->uuid('org_id')->primary();
             $table->foreignUuid('user_id')->constrained()->onDelete('cascade')->onUpdate('cascade');
             $table->string('name');
-            $table->string('email')->unique();
+            $table->string('email')->nullable()->unique();
             $table->text('description')->nullable();
-            $table->string('industry');
+            $table->string('industry')->nullable();
             $table->string('type')->nullable();
-            $table->string('country');
-            $table->string('address');
-            $table->string('state');
+            $table->string('country')->nullable();
+            $table->string('address')->nullable();
+            $table->string('state')->nullable();
 
             $table->timestamps();
         });

database/migrations/2024_07_21_115606_modify_content_length_in_blogs_table.php

@@ -22,7 +22,7 @@ public function up(): void
     public function down(): void
     {
         Schema::table('blogs', function (Blueprint $table) {
-            $table->string('content')->change();
+            $table->text('content')->change();
         });
     }
 };

database/migrations/2024_07_24_011913_remove_column_from_blogs.php

@@ -12,8 +12,7 @@
     public function up(): void
     {
         Schema::table('blogs', function (Blueprint $table) {
-            $table->dropColumn('tags');
-            $table->dropColumn('imageUrl');
+            $table->dropColumn(['tags', 'imageUrl']);
         });
     }
 
@@ -23,8 +22,8 @@ public function up(): void
     public function down(): void
     {
         Schema::table('blogs', function (Blueprint $table) {
-            $table->string('tags');
-            $table->string('imageUrl');
+            $table->string('tags')->default('default_value');
+            $table->string('imageUrl')->default('default_value');
         });
     }
 };

database/migrations/2024_08_01_094152_modify_columns_on_blogs_table.php

@@ -14,11 +14,8 @@ public function up(): void
         Schema::table('blogs', function (Blueprint $table) {
             $table->string('category')->nullable();
             $table->text('image_url')->nullable();
-            $table->dropForeign(['blog_category_id']);
-            $table->dropColumn('blog_category_id');
             $table->foreignUuid('author_id')->nullable()->constrained('users', 'id')->cascadeOnDelete()->cascadeOnUpdate();
         });
-        Schema::dropIfExists('blog_categories');
         Schema::dropIfExists('blog_images');
     }
 
@@ -29,7 +26,6 @@ public function down(): void
     {
         Schema::table('blogs', function (Blueprint $table) {
             $table->dropColumn('category');
-            $table->uuid('blog_category_id');
         });
 
         Schema::create('blog_images', function (Blueprint $table) {
@@ -39,12 +35,5 @@ public function down(): void
             $table->timestamps();
         });
 
-
-        Schema::create('blog_categories', function (Blueprint $table) {
-            $table->uuid('id')->primary();
-            $table->string('name');
-            $table->string('description')->nullable();
-            $table->timestamps();
-        });
     }
 };

database/migrations/2024_08_02_114218_add_soft_delete_to_users_table.php

@@ -22,7 +22,7 @@ public function up(): void
     public function down(): void
     {
         Schema::table('users', function (Blueprint $table) {
-            //
+            $table->dropSoftDeletes();
         });
     }
 };

database/migrations/2024_08_06_182021_create_orders_table.php

@@ -21,7 +21,9 @@ public function up(): void
             $table->string('payment_method')->nullable();
             $table->string('shipping_address')->nullable();
             $table->string('billing_address')->nullable();
+            $table->unsignedInteger('quantity')->nullable();
             $table->text('notes')->nullable();
+            $table->foreignUuid('product_id')->nullable()->references('product_id')->on('products')->onDelete('cascade');
             $table->timestamps();
             $table->softDeletes();
 

database/seeders/CategoriesTableSeeder.php

@@ -15,8 +15,9 @@ class CategoriesTableSeeder extends Seeder
     public function run()
     {
         // Truncate the table to remove existing records
-        // Category::truncate();
+        Category::truncate();
 
+        // Define categories
         $categories = [
             [
                 'name' => 'Electronics',

database/seeders/DatabaseSeeder.php

@@ -79,10 +79,7 @@ public function run(): void
             OrderSeeder::class,
             SqueezePageSeeder::class,
             TimezoneSeeder::class,
-        ]);
-
-        $this->call([
-            QuestsSeeder::class,
+            QuestSeeder::class,
             QuestMessageSeeder::class,
         ]);
 

database/seeders/QuestsSeeder.php → database/seeders/QuestSeeder.php

@@ -7,7 +7,7 @@
 use Illuminate\Support\Facades\DB;
 use Illuminate\Support\Str;
 
-class QuestsSeeder extends Seeder
+class QuestSeeder extends Seeder
 {
     public function run()
     {