add fleet missions queue #363 feature

.env.example

@@ -26,8 +26,9 @@ CACHE_DRIVER=file
 SESSION_DRIVER=database
 SESSION_LIFETIME=720
 QUEUE_DRIVER=sync
+QUEUE_CONNECTION=sync
 
-REDIS_HOST=127.0.0.1
+REDIS_HOST=ogamex-redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 

.env.example-prod

@@ -25,9 +25,11 @@ BROADCAST_DRIVER=log
 CACHE_DRIVER=file
 SESSION_DRIVER=database
 SESSION_LIFETIME=720
-QUEUE_DRIVER=sync
+QUEUE_DRIVER=redis
+QUEUE_CONNECTION=redis
 
-REDIS_HOST=127.0.0.1
+
+REDIS_HOST=ogamex-redis
 REDIS_PASSWORD=null
 REDIS_PORT=6379
 

.github/workflows/run-tests-sqlite.yml

@@ -35,6 +35,8 @@ jobs:
     # Laravel setup steps
     - name: Copy .env
       run: php -r "file_exists('.env') || copy('.env.example', '.env');"
+    - name: Set APP_ENV to testing                                                                                                                      │
+      run: sed -i 's/APP_ENV=.*/APP_ENV=testing/' .env
     - name: Composer update
       run: composer update --lock
     - name: Install Dependencies

Dockerfile

@@ -30,7 +30,9 @@ RUN apt-get update && apt-get install -y \
 # Install extensions
 RUN docker-php-ext-install ffi pdo_mysql mbstring zip exif pcntl && \
     docker-php-ext-configure gd --with-freetype=/usr/include/ --with-jpeg=/usr/include/ && \
-    docker-php-ext-install gd
+    docker-php-ext-install gd && \
+    pecl install redis && \
+    docker-php-ext-enable redis
 
 # Enable and configure opcache only if OPCACHE_ENABLE is set to "1"
 ARG OPCACHE_ENABLE=0

app/Console/Commands/TestFleetQueue.php

@@ -0,0 +1,111 @@
+<?php
+
+namespace OGame\Console\Commands;
+
+use Illuminate\Console\Command;
+use OGame\Factories\PlanetServiceFactory;
+use OGame\Factories\PlayerServiceFactory;
+use OGame\GameMissions\AttackMission;
+use OGame\GameObjects\Models\Units\UnitCollection;
+use OGame\Models\Enums\PlanetType;
+use OGame\Models\Planet;
+use OGame\Models\Planet\Coordinate;
+use OGame\Models\Resources;
+use OGame\Services\ObjectService;
+
+class TestFleetQueue extends Command
+{
+    protected $signature = 'fleet:test-queue
+                            {userId : User ID}
+                            {galaxy : Target galaxy}
+                            {system : Target system}
+                            {position : Target position}
+                            {--delay=5 : Arrival delay in seconds}';
+
+    protected $description = 'Test fleet queue system by sending 3 attack missions to specified coordinates';
+
+    public function handle(): int
+    {
+        // Get arguments
+        $user_id = (int) $this->argument('userId');
+        $galaxy = (int) $this->argument('galaxy');
+        $system = (int) $this->argument('system');
+        $position = (int) $this->argument('position');
+        $delay = (int) $this->option('delay');
+
+        // Get planet
+        $planet_model = Planet::where('user_id', $user_id)->first();
+        if (!$planet_model) {
+            return 1;
+        }
+
+        // Setup services
+        $planet_factory = app(PlanetServiceFactory::class);
+        $source_planet = $planet_factory->make($planet_model->id);
+        $player_factory = app(PlayerServiceFactory::class);
+        $player = $player_factory->make($user_id);
+
+        // Setup test data
+        $target_coordinate = new Coordinate($galaxy, $system, $position);
+        $player->setResearchLevel('computer_technology', 10);
+        $source_planet->addUnit('light_fighter', 6000000);
+        $source_planet->addResources(new Resources(1000000000, 1000000000, 1000000000, 0));
+
+        $attack_mission = app(AttackMission::class);
+        $missions = [];
+
+        // Mission 1: 1M light fighters
+        $units1 = new UnitCollection();
+        $units1->addUnit(ObjectService::getUnitObjectByMachineName('light_fighter'), 1000000);
+        try {
+            $mission1 = $attack_mission->start(
+                $source_planet,
+                $target_coordinate,
+                PlanetType::Planet,
+                $units1,
+                new Resources(0, 0, 0, 0),
+                $delay
+            );
+            $missions[] = $mission1->id;
+        } catch (\Exception $e) {
+        }
+
+        // Mission 2: 2M light fighters
+        $units2 = new UnitCollection();
+        $units2->addUnit(ObjectService::getUnitObjectByMachineName('light_fighter'), 2000000);
+        try {
+            $mission2 = $attack_mission->start(
+                $source_planet,
+                $target_coordinate,
+                PlanetType::Planet,
+                $units2,
+                new Resources(0, 0, 0, 0),
+                $delay
+            );
+            $missions[] = $mission2->id;
+        } catch (\Exception $e) {
+        }
+
+        // Mission 3: 3M light fighters
+        $units3 = new UnitCollection();
+        $units3->addUnit(ObjectService::getUnitObjectByMachineName('light_fighter'), 3000000);
+        try {
+            $mission3 = $attack_mission->start(
+                $source_planet,
+                $target_coordinate,
+                PlanetType::Planet,
+                $units3,
+                new Resources(0, 0, 0, 0),
+                $delay
+            );
+            $missions[] = $mission3->id;
+        } catch (\Exception $e) {
+        }
+
+        if (empty($missions)) {
+            return 1;
+        }
+
+        return 0;
+    }
+}

app/Console/Commands/Tests/TestRaceConditionGameMission.php

@@ -43,7 +43,6 @@ public function handle(): int
 
             // Set up the test environment.
             parent::setup();
-
             // Set up parameters for this specific test.
             $this->testSetup();
 
@@ -57,6 +56,8 @@ public function handle(): int
                     'time_arrival' => time() - 1]);
 
             // Run the parallel requests against the overview page which should start the return mission.
+            $this->playerService->updateFleetMissions();
+
             $this->runParallelRequests('overview');
 
             // Assert the database state after the test.

app/GameMissions/Abstracts/GameMission.php

@@ -11,6 +11,7 @@
 use OGame\GameMissions\Models\MissionPossibleStatus;
 use OGame\GameObjects\Models\Units\UnitCollection;
 use OGame\GameMissions\ExpeditionMission;
+use OGame\Jobs\ProcessFleetMissions;
 use OGame\Models\Enums\PlanetType;
 use OGame\Models\FleetMission;
 use OGame\Models\Planet\Coordinate;
@@ -274,6 +275,8 @@ public function start(PlanetService $planet, Coordinate $targetCoordinate, Plane
         if ($mission->time_arrival < Carbon::now()->timestamp) {
             $this->process($mission);
         }
+        $arrival_time_to_carbon = Carbon::parse($mission->time_arrival);
+        ProcessFleetMissions::dispatch($mission, $planet->getPlayer())->delay($arrival_time_to_carbon);
 
         return $mission;
     }
@@ -366,6 +369,11 @@ protected function startReturn(FleetMission $parentMission, Resources $resources
         // If the mission is in the past, process it immediately.
         if ($mission->time_arrival < Carbon::now()->timestamp) {
             $this->process($mission);
+        } else {
+            // Dispatch job for future return mission arrival
+            $player = $this->playerServiceFactory->make($mission->user_id);
+            $arrival_time_to_carbon = Carbon::parse($mission->time_arrival);
+            ProcessFleetMissions::dispatch($mission, $player)->delay($arrival_time_to_carbon);
         }
     }
 

app/Http/Middleware/GlobalGame.php

@@ -45,7 +45,10 @@ public function handle(Request $request, Closure $next): mixed
             $player->planets->current()->update();
 
             // Update all fleet missions of player that are associated with any of the player's planets.
-            $player->updateFleetMissions();
+
+            if (app()->environment('testing')) {
+                $player->updateFleetMissions();
+            }
         }
 
         return $next($request);