upgrade laravel 12, rename {*}_prices.price and addresses.address to value, rename stripe_id and stripe_one_time_type_id of price tables to type for one time, redefind is active member and membership qualification

* change admission_test_prices table stripe_id and synced_to_stripe columns to stripe_one_time_type_id and synced_one_time_type_to_stripe

* change addresses.address to addresses.value

* change (*)_prices.price to (*)_prices.value

* change recurring parameter from hand code on price model to product model can be hand code or column value

* fix missing update create custom_web_pages table migration file name

* change members table to members and member_orders tables

* install flag-icons js library

* fix missing git ignore bootstrap ssr files

* install laravel boost for ide ai support

* add membership_transors table for member model definition is_active method and extend User models hasQualificationOfMembership method definition

* fix member table user_id missing set user_id to unique

* fix admission_test_order and membership_order missing gateway_payment_fee column

* fix add membership_transors table for member model definition is_active method and extend User models hasQualificationOfMembership method definition missing save User medol

* fix add membership_transors table for member model definition is_active method and extend User models hasQualificationOfMembership method definition missing save NationalMensaSeeder

* add other-mensa-websites page

* fix wrong type more 'create' on file name

* rename ModuleSeeder to ModulePermissionSeeder

* change member_id to user_id

* rename membership_transfers table verified_at column to is_accepted

* add qualifying_tests table for member model definition is_active method and extend User models hasQualificationOfMembership method definition and add user model hasQualificationOfMembership method tests

* add more todo list items

* fix database docs members table wrong type

* fix Get active members with addresses detail code not up to date

* fix missing remove type column from national_mensas table

* fix wrong type membership_end_in column type

* fix missing update user model hasSamePassportAlreadyQualificationOfMembership method

* update datebase readme

* fix coding style

* fix change php verision missing update mac unlink old version and link new version code and upgrade laravel to 12 and mysql upgrade to 8.4

* fix update php version missing update github workflow

* fix update github workflow missing update for lint parts

* fix missing upload mi logo

* fix test_id wrong type object

* fix year column type wrong use tiny int

* fix wrong type percent_of_group decimal total lenght

* fix upgrade laravel 12 missing update npm library and clean usund library

* fix upgrade laravel 12 missing update other files

* fix unit test wrong using sqlLite

Author: tszyuloveyou

.github/workflows/laravel.yml

@@ -12,7 +12,7 @@ jobs:
     runs-on: ubuntu-latest
     services:
       mysql:
-        image: mysql:8.0.31
+        image: mysql:8.4
         env:
           MYSQL_ROOT_PASSWORD: "password"
           MYSQL_DATABASE: "mensa"
@@ -26,6 +26,12 @@ jobs:
           --health-timeout=5s
           --health-retries=3
     steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4' # Specify your desired PHP version
+          coverage: none
+
       - uses: actions/checkout@v4
 
       - uses: actions/cache@v4
@@ -69,6 +75,12 @@ jobs:
   lint:
     runs-on: ubuntu-latest
     steps:
+      - name: Setup PHP
+        uses: shivammathur/setup-php@v2
+        with:
+          php-version: '8.4' # Specify your desired PHP version
+          coverage: none
+
       - uses: actions/checkout@v4
 
       - uses: actions/cache@v4

.gitignore

@@ -1,5 +1,8 @@
+*.log
+.DS_Store
 /.phpunit.cache
 /node_modules
+/bootstrap/ssr
 /public/build
 /public/hot
 /public/storage
@@ -13,11 +16,15 @@
 .phpunit.result.cache
 Homestead.json
 Homestead.yaml
-auth.json
+Thumbs.db
+/auth.json
 npm-debug.log
 yarn-error.log
 /.fleet
 /.idea
 /.nova
 /.vscode
 /.zed
+boost.json
+/.github/copilot-instructions.md
+

README.md

@@ -51,13 +51,30 @@ Please read database/README.md for database setup and details.
 ### Payment cards for Stripe UAT
 https://docs.stripe.com/testing
 
+
+### A.I. Helper
+
+This installed laravel prompts mcp and boost
+
+Please read laravel official documents:
+
+- Laravel Prompts: https://laravel.com/docs/11.x/prompts
+- Laravel MCP: https://laravel.com/docs/11.x/mcp#main-content
+- Laravel Boost: https://laravel.com/docs/11.x/installation#installing-laravel-boost
+
+
 ### Todo
 
 #### stage 1 permission system, nav, custom web page and admission test
 
-- change admission_test_prices table stripe_id and synced_to_stripe columns to stripe_one_time_type_id and synced_one_time_type_to_stripe
-- change (*)_prices.price to (*)_prices.value and addresses.address to addresses.value
-- change members table to members and member_orders tables
+- change address_id from members table to users 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
@@ -185,4 +202,4 @@ https://docs.stripe.com/testing
 
 #### unimportant
 
-- takeout Strip Library from app folder to make a standalone composer package on standalone repo. 
+- takeout Strip Library from app folder to make a standalone composer package on standalone repo. 

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

@@ -108,8 +108,8 @@ public function create()
             )->with('districts', $districts)
             ->with(
                 'addresses', Address::distinct()
-                    ->get('address')
-                    ->pluck('address')
+                    ->get('value')
+                    ->pluck('value')
                     ->toArray()
             );
     }
@@ -122,7 +122,7 @@ public function store(TestRequest $request)
         ]);
         $address = Address::firstOrCreate([
             'district_id' => $request->district_id,
-            'address' => $request->address,
+            'value' => $request->address,
         ]);
         $test = AdmissionTest::create([
             'type_id' => $request->type_id,
@@ -219,46 +219,46 @@ public function show(AdmissionTest $admissionTest)
             ->with(
                 'addresses', Address::distinct()
                     ->has('admissionTests')
-                    ->get(['id', 'address'])
-                    ->pluck('address', 'id')
+                    ->get(['id', 'value'])
+                    ->pluck('value', 'id')
                     ->toArray()
             );
     }
 
-    private function updateAddress(Address $address, string $newAddress, int $newDistrictID)
+    private function updateAddress(Address $address, string $newAddress, int $newDistrictID): Address
     {
         $addressModel = $address;
         if (
-            $newAddress != $address->address ||
+            $newAddress != $address->value ||
             $newDistrictID != $address->district_id
         ) {
             $addressModel = Address::firstWhere([
                 'district_id' => $newDistrictID,
-                'address' => $newAddress,
+                'value' => $newAddress,
             ]);
             if ($address->admissionTests()->count() == 1) {
                 if ($addressModel) {
                     $address->delete();
                 } else {
                     $address->update([
                         'district_id' => $newDistrictID,
-                        'address' => $newAddress,
+                        'value' => $newAddress,
                     ]);
                     $addressModel = $address;
                 }
             }
             if (! $addressModel) {
                 $addressModel = Address::create([
                     'district_id' => $newDistrictID,
-                    'address' => $newAddress,
+                    'value' => $newAddress,
                 ]);
             }
         }
 
         return $addressModel;
     }
 
-    private function updateLocation(Location $location, string $newLocationName)
+    private function updateLocation(Location $location, string $newLocationName): Location
     {
         $newLocation = $location;
         if ($location->name != $newLocationName) {
@@ -293,7 +293,7 @@ public function update(TestRequest $request, AdmissionTest $admissionTest)
             'testing_time' => $admissionTest->testing_at->format('H:i:s'),
             'expect_end_time' => $admissionTest->expect_end_at->format('H:i:s'),
             'location' => $admissionTest->location->name,
-            'address' => "{$admissionTest->address->address}, {$admissionTest->address->district->name}, {$admissionTest->address->district->area->name}",
+            'address' => "{$admissionTest->address->value}, {$admissionTest->address->district->name}, {$admissionTest->address->district->area->name}",
         ];
         $address = $this->updateAddress($admissionTest->address, $request->address, $request->district_id);
         $location = $this->updateLocation($admissionTest->location, $request->location);
@@ -312,7 +312,7 @@ public function update(TestRequest $request, AdmissionTest $admissionTest)
             'testing_time' => $admissionTest->testing_at->format('H:i:s'),
             'expect_end_time' => $admissionTest->expect_end_at->format('H:i:s'),
             'location' => $admissionTest->location->name,
-            'address' => "{$admissionTest->address->address}, {$admissionTest->address->district->name}, {$admissionTest->address->district->area->name}",
+            'address' => "{$admissionTest->address->value}, {$admissionTest->address->district->name}, {$admissionTest->address->district->area->name}",
         ];
         if (
             $from['testing_date'] != $to['testing_date'] ||
@@ -336,7 +336,7 @@ public function update(TestRequest $request, AdmissionTest $admissionTest)
             'location' => $admissionTest->location->name,
             'district_id' => $admissionTest->address->district_id,
             'address_id' => $admissionTest->address_id,
-            'address' => $admissionTest->address->address,
+            'address' => $admissionTest->address->value,
             'maximum_candidates' => $admissionTest->maximum_candidates,
             'is_public' => $admissionTest->is_public,
         ];

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

@@ -74,7 +74,7 @@ public function create()
                     $products = AdmissionTestProduct::select(['id', 'name', 'minimum_age', 'maximum_age', 'quota'])
                         ->with([
                             'price' => function ($query) {
-                                $query->select(['id', 'product_id', 'name', 'price']);
+                                $query->select(['id', 'product_id', 'name', 'value']);
                             },
                         ])->whereInDateRange(now())
                         ->get();

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

@@ -35,15 +35,15 @@ public function store(PriceRequest $request, AdmissionTestProduct $product)
         $price = AdmissionTestPrice::create([
             'product_id' => $product->id,
             'name' => $request->name,
-            'price' => $request->price,
+            'value' => $request->price,
             'start_at' => $request->start_at,
         ]);
 
         return [
             'success' => 'The admission test product price create success.',
             'id' => $price->id,
             'name' => $price->name,
-            'price' => $price->price,
+            'price' => $price->value,
             'start_at' => $price->start_at,
             'updated_at' => $price->updated_at,
         ];

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

@@ -48,7 +48,7 @@ public function store(ProductRequest $request)
         AdmissionTestPrice::create([
             'product_id' => $product->id,
             'name' => $request->price_name,
-            'price' => $request->price,
+            'value' => $request->price,
         ]);
         DB::commit();
 
@@ -62,13 +62,8 @@ public function show(AdmissionTestProduct $product)
     {
         $product->load([
             'prices' => function ($query) {
-                $query->select([
-                    'id',
-                    'product_id',
-                    'name',
-                    'price',
-                    'start_at',
-                ])->orderByDesc('start_at')
+                $query->select(['id', 'product_id', 'name', 'value', 'start_at'])
+                    ->orderByDesc('start_at')
                     ->orderByDesc('updated_at');
             },
         ])->makeHidden([

app/Http/Controllers/CandidateController.php

@@ -42,7 +42,7 @@ function (Request $request, Closure $next) {
                             ['admission_test' => $admissionTest]
                         )->withErrors(['message' => 'You has already schedule this admission test.']);
                     }
-                    if ($user->isActiveMember) {
+                    if ($user->member?->is_active) {
                         return $errorReturn->withErrors(['message' => 'You has already been member.']);
                     }
                     if ($user->hasQualificationOfMembership) {
@@ -117,7 +117,7 @@ function (Request $request, Closure $next) {
                                     ->find($request->price_id);
                                 if (! $price) {
                                     $request->merge(['error' => 'The selected product is invalid.']);
-                                } elseif ($price->price != $price->product->price->price) {
+                                } elseif ($price->value != $price->product->price->value) {
                                     $request->merge(['error' => 'The price of selected product is not up to date, please try again on this up to date version.']);
                                 } elseif ($price->product->start_at && $price->product->start_at > now()) {
                                     $request->merge(['error' => 'The selected product is not yet released, please try again later or select other product.']);
@@ -128,7 +128,7 @@ function (Request $request, Closure $next) {
                                 } elseif ($price->product->maximum_age && $price->product->maximum_age < floor($request->user()->age)) {
                                     $request->merge(['error' => 'Your age greater than product maximum age limit.']);
                                 } else {
-                                    $price->makeHidden(['product_id', 'name', 'start_at', 'stripe_id', 'synced_to_stripe']);
+                                    $price->makeHidden(['product_id', 'name', 'start_at', 'stripe_one_time_type_id', 'synced_one_time_type_to_stripe']);
                                     $price->product->makeHidden(['id', 'name', 'option_name', 'minimum_age', 'maximum_age', 'start_at', 'end_at', 'stripe_id', 'synced_to_stripe', 'created_at', 'updated_at', 'price']);
                                     $request->merge(['price' => $price]);
                                 }
@@ -144,7 +144,7 @@ function (Request $request, Closure $next) {
                             ]);
                             foreach ($request->products as $product) {
                                 $product->makeHidden(['id']);
-                                $product->price->makeHidden(['product_id', 'name', 'stripe_id', 'synced_to_stripe', 'created_at', 'updated_at']);
+                                $product->price->makeHidden(['product_id', 'name', 'stripe_one_time_type_id', 'synced_one_time_type_to_stripe', 'created_at', 'updated_at']);
                             }
                             if (! $request->products->count()) {
                                 return redirect()->route('admission-tests.index')
@@ -167,7 +167,7 @@ function (Request $request, Closure $next) {
                             if (! $admissionTest->is_public) {
                                 return $redirect->withErrors(['message' => 'You have no register this admission test and this test is private, please register other admission test.']);
                             }
-                            if ($user->isActiveMember) {
+                            if ($user->member?->is_active) {
                                 return $redirect->withErrors(['message' => 'You have no register this admission test and you has already been member.']);
                             }
                             if ($user->hasQualificationOfMembership) {

app/Http/Controllers/PageController.php

@@ -4,6 +4,7 @@
 
 use App\Models\AdmissionTest;
 use App\Models\CustomWebPage;
+use App\Models\NationalMensa;
 use App\Models\SiteContent;
 use Illuminate\Http\Request;
 use Illuminate\Support\Facades\DB;
@@ -32,23 +33,23 @@ public function customWebPage($pathname)
     public function admissionTests(Request $request)
     {
         $user = [
-            'has_qualification_of_membership' => $request->user()->hasQualificationOfMembership ?? null,
-            'last_attended_admission_test' => $request->user()->lastAttendedAdmissionTest ?? false ? [
-                'id' => $request->user()->hasQualificationOfMembership->id,
-                'testing_at' => $request->user()->hasQualificationOfMembership->testing_at,
+            'has_qualification_of_membership' => $request->user()?->hasQualificationOfMembership,
+            'last_attended_admission_test' => $request->user()?->lastAttendedAdmissionTest ? [
+                'id' => $request->user()->lastAttendedAdmissionTest->id,
+                'testing_at' => $request->user()->lastAttendedAdmissionTest->testing_at,
                 'type' => [
-                    'interval_month' => $request->user()->hasQualificationOfMembership->type->interval_month,
+                    'interval_month' => $request->user()->lastAttendedAdmissionTest->type->interval_month,
                 ],
             ] : null,
-            'future_admission_test' => $request->user()->futureAdmissionTest ?? false ? [
+            'future_admission_test' => $request->user()?->futureAdmissionTest ? [
                 'id' => $request->user()->futureAdmissionTest->id,
                 'is_free' => $request->user()->futureAdmissionTest->is_free,
             ] : null,
             'created_stripe_customer' => $request->user()->stripe ?? null,
-            'default_email' => $request->user()->defaultEmail ?? false ? [
+            'default_email' => $request->user()?->defaultEmail ? [
                 'contact' => $request->user()->defaultEmail->contact,
             ] : null,
-            'has_unused_quota_admission_test_order' => (bool) $request->user()?->hasUnusedQuotaAdmissionTestOrder()->exists(),
+            'has_unused_quota_admission_test_order' => $request->user()?->hasUnusedQuotaAdmissionTestOrder()->exists(),
         ];
         $tests = AdmissionTest::joinRelation('type as type')
             ->withCount('candidates')
@@ -112,4 +113,18 @@ function ($query) use ($request) {
                     ->toArray()
             )->with('tests', $tests);
     }
+
+    public function otherMensaWebsites()
+    {
+        return Inertia::render(
+            'Pages/OtherMensaWebsites',
+            [
+                'nations' => function () {
+                    return NationalMensa::orderBy('name')
+                        ->where('is_active', true)
+                        ->get(['id', 'type', 'name', 'url']);
+                },
+            ]
+        );
+    }
 }

app/Http/Requests/Admin/AdmissionTest/Candidate/StoreRequest.php

@@ -25,7 +25,7 @@ function (string $attribute, mixed $value, Closure $fail) use ($request) {
                     $test = $request->route('admission_test');
                     if (! $request->user) {
                         $fail('The selected user id is invalid.');
-                    } elseif ($request->user->isActiveMember) {
+                    } elseif ($request->user->member?->is_active) {
                         $fail('The selected user id has already member.');
                     } elseif ($request->user->hasQualificationOfMembership) {
                         $fail('The selected user id has already qualification for membership.');