Change address id from members table to users table and update profile edit and update logic

README.md

@@ -67,14 +67,10 @@ Please read laravel official documents:
 
 #### stage 1 permission system, nav, custom web page and admission test
 
-- change address_id from members table to users table
+- add can_join_admission_test column to passport_types table
 - change module to support submodule
 - add edit candidate and edit candidate result permission and update admin admission test candidate permission checking
 - change SEO from page to layout export props title, desc. and ogImage and change ogImage from public to storage
-- add admin nation index
-- add admin nation store
-- add admin nation update
-- add admin nation update status
 - update candidate store method to support select product and contact stripe
 - add stripe checkout web hock handle
 - change quota validity months to inside product and order table
@@ -93,10 +89,17 @@ Please read laravel official documents:
 - admin user add admission test orders list and create order button
 - Add assign roles function to admin user show
 - Admin team show page add team member list and relation role
-- change whatsapp from twilio to whatsapp cloud api (coming soon)
+- add whatsapp_templates table, add seeder and add admin whatsapp templates index 
+- add admin whatsapp templates index edit and update
+- change qr code to from quickchart.io gen image link to use twilio assets
+- add user delete function
 
 #### stage 2 third party iq test result
 
+- add admin nation index
+- add admin nation store
+- add admin nation update
+- add admin nation update status
 - Add admin third party iq test accept list store
 - Add admin third party iq test accept list index
 - Add admin third party iq test accept list update name
@@ -123,7 +126,7 @@ Please read laravel official documents:
 - Add membership products edit
 - Add membership products price store
 - Add membership products price update
-- Add membership orders create
+- Add membership orders create (require user address)
 - Add membership orders index
 - Add membership orders show
 - Add membership orders update payment status
@@ -135,6 +138,8 @@ Please read laravel official documents:
 - add user public option on user show
 - Add member index
 - Add member show
+- Add upload image to profile when user is member
+- Add remove image to profile when user is member
 - Add edit forwarding email function
 - Add admin forwarding email changing index and approve or reject function
 
@@ -200,6 +205,10 @@ Please read laravel official documents:
 
 #### stage 8 contest (coming soon)
 
+#### stage 9 CalDAV (coming soon)
+
+#### stage 10 project management (coming soon)
+
 #### unimportant
 
 - takeout Strip Library from app folder to make a standalone composer package on standalone repo. 

app/Http/Controllers/Admin/AdmissionTest/Controller.php

@@ -225,39 +225,6 @@ public function show(AdmissionTest $admissionTest)
             );
     }
 
-    private function updateAddress(Address $address, string $newAddress, int $newDistrictID): Address
-    {
-        $addressModel = $address;
-        if (
-            $newAddress != $address->value ||
-            $newDistrictID != $address->district_id
-        ) {
-            $addressModel = Address::firstWhere([
-                'district_id' => $newDistrictID,
-                'value' => $newAddress,
-            ]);
-            if ($address->admissionTests()->count() == 1) {
-                if ($addressModel) {
-                    $address->delete();
-                } else {
-                    $address->update([
-                        'district_id' => $newDistrictID,
-                        'value' => $newAddress,
-                    ]);
-                    $addressModel = $address;
-                }
-            }
-            if (! $addressModel) {
-                $addressModel = Address::create([
-                    'district_id' => $newDistrictID,
-                    'value' => $newAddress,
-                ]);
-            }
-        }
-
-        return $addressModel;
-    }
-
     private function updateLocation(Location $location, string $newLocationName): Location
     {
         $newLocation = $location;
@@ -295,7 +262,7 @@ public function update(TestRequest $request, AdmissionTest $admissionTest)
             'location' => $admissionTest->location->name,
             'address' => "{$admissionTest->address->value}, {$admissionTest->address->district->name}, {$admissionTest->address->district->area->name}",
         ];
-        $address = $this->updateAddress($admissionTest->address, $request->address, $request->district_id);
+        $address = $admissionTest->address->updateAddress($request->district_id, $request->address);
         $location = $this->updateLocation($admissionTest->location, $request->location);
         $admissionTest->update([
             'type_id' => $request->type_id,

app/Http/Controllers/Admin/UserController.php

@@ -5,6 +5,8 @@
 use App\Http\Controllers\Controller;
 use App\Http\Requests\Admin\User\ResetPasswordRequest;
 use App\Http\Requests\Admin\User\UpdateRequest;
+use App\Models\Address;
+use App\Models\Area;
 use App\Models\Gender;
 use App\Models\PassportType;
 use App\Models\ResetPasswordLog;
@@ -124,16 +126,19 @@ public function index(Request $request)
     public function show(User $user)
     {
         $user->load([
-            'emails.lastVerification' => function ($query) {
+            'member', 'emails.lastVerification' => function ($query) {
                 $query->select(['contact_id', 'verified_at', 'expired_at']);
             }, 'mobiles.lastVerification' => function ($query) {
                 $query->select(['contact_id', 'verified_at', 'expired_at']);
-            },
+            }, 'address',
         ]);
+        $user->member?->makeHidden(['user_id', 'created_at', 'updated_at']);
+        $user->member?->append('is_active');
         $user->emails->append('is_verified');
         $user->emails->makeHidden(['user_id', 'type', 'created_at', 'lastVerification']);
         $user->mobiles->append('is_verified');
         $user->mobiles->makeHidden(['user_id', 'type', 'created_at', 'lastVerification']);
+        $user->address?->makeHidden(['id', 'created_at', 'updated_at']);
 
         return Inertia::render('Admin/Users/Show')
             ->with('user', $user)
@@ -149,6 +154,24 @@ public function show(User $user)
                 'maxBirthday', now()
                     ->subYears(2)
                     ->format('Y-m-d')
+            )->with(
+                'districts', function () {
+                    $areas = Area::with([
+                        'districts' => function ($query) {
+                            $query->orderBy('display_order');
+                        },
+                    ])->orderBy('display_order')
+                        ->get();
+                    $districts = [];
+                    foreach ($areas as $area) {
+                        $districts[$area->name] = [];
+                        foreach ($area->districts as $district) {
+                            $districts[$area->name][$district->id] = $district->name;
+                        }
+                    }
+
+                    return $districts;
+                }
             );
     }
 
@@ -166,10 +189,38 @@ public function update(UpdateRequest $request, User $user)
             'gender_id' => $gender->id,
             'birthday' => $request->birthday,
         ];
+        if ($user->address) {
+            if ($request->district_id) {
+                $return['address_id'] = $user->address->updateAddress(
+                    $request->district_id,
+                    $request->address
+                )->id;
+            } else {
+                $user->address->delete();
+                $return['address_id'] = null;
+            }
+        } elseif ($request->district_id) {
+            $return['address_id'] = Address::firstOrCreate([
+                'district_id' => $request->district_id,
+                'value' => $request->address,
+            ])->id;
+        }
         $user->update($return);
-        unset($return['gender_id']);
+        unset($return['address_id']);
+        $return['district_id'] = $request->district_id;
+        $return['address'] = $request->address;
         $return['gender'] = $gender->name;
         $return['success'] = 'The user data update success!';
+        if ($user->member) {
+            $user->member->update([
+                'prefix_name' => $request->prefix_name,
+                'nickname' => $request->nickname,
+                'suffix_name' => $request->suffix_name,
+            ]);
+            $return['prefix_name'] = $user->member->prefix_name;
+            $return['nickname'] = $user->member->nickname;
+            $return['suffix_name'] = $user->member->suffix_name;
+        }
         DB::commit();
 
         return $return;