deploy to newspace2

Author: malisharfer

.github/workflows/php-build-and-deploy.yml

@@ -28,14 +28,14 @@ jobs:
         uses: azure/docker-login@v1
         with:
           login-server: ${{ secrets.REGISTRY_LOGIN_SERVER }}
-          username: ${{ secrets.AZ_USERNAME }}
+          username: ${{ secrets.AZ_USERNAME }10
           password: ${{ secrets.AZ_PASSWORD }}
 
       - name: 📃 Docker metadata
         id: meta
         uses: docker/metadata-action@v5
         with:
-          images: ${{ secrets.REGISTRY_LOGIN_SERVER }}/newspace2_9
+          images: ${{ secrets.REGISTRY_LOGIN_SERVER }}/newspace2_10
           flavor: |
             latest=false
           tags: |

app/Services/Algorithm.php

@@ -19,52 +19,64 @@ public function __construct($date = null)
 
     protected function getShiftWithTasks()
     {
-        // $startOfMonth = max($this->date->copy()->startOfMonth(), Carbon::tomorrow());
         $startOfMonth = $this->date->copy()->startOfMonth();
         $endOfMonth = $this->date->copy()->endOfMonth();
 
-        return Shift::query()
+        $results = collect();
+
+        Shift::query()
             ->with(['task' => fn ($q) => $q->withTrashed()])
             ->whereNull('soldier_id')
             ->whereBetween('start_date', [$startOfMonth, $endOfMonth])
             ->whereHas('task', function ($query) {
                 $query->withTrashed()
                     ->where('kind', '!=', TaskKind::INPARALLEL->value);
             })
-            ->lazy()
-            ->map(fn (Shift $shift): ShiftService => Helpers::buildShift($shift));
+            ->chunk(300, function ($shifts) use (&$results) {
+                $mapped = $shifts->map(fn (Shift $shift): ShiftService => Helpers::buildShift($shift));
+                $results = $results->merge($mapped);
+            });
+
+        return $results;
     }
 
     protected function getSoldiersDetails()
     {
-        $range = new Range($this->date->copy()->startOfMonth(), $this->date->copy()->endOfMonth());
+        $range = new Range(
+            $this->date->copy()->startOfMonth(),
+            $this->date->copy()->endOfMonth()
+        );
+
+        $results = collect();
 
-        return Soldier::where('is_reservist', false)
+        Soldier::where('is_reservist', false)
             ->with([
-                'constraints' => fn ($q) => $q->whereBetween('start_date', [$range->start, $range->end]),
-                'shifts' => fn ($q) => $q->whereBetween('start_date', [$range->start, $range->end])
+                'constraints' => fn($q) => $q->whereBetween('start_date', [$range->start, $range->end]),
+                'shifts' => fn($q) => $q->whereBetween('start_date', [$range->start, $range->end])
                     ->whereHas('task', function ($query) {
                         $query->withTrashed()->where('kind', '!=', TaskKind::INPARALLEL->value);
                     }),
             ])
-            ->lazy()
-            ->map(function (Soldier $soldier) {
-                $constraints = Helpers::buildConstraints($soldier->constraints);
+            ->chunk(100, function ($soldiers) use (&$results) {
+                $mapped = $soldiers
+                    ->map(function (Soldier $soldier) {
+                        $constraints = Helpers::buildConstraints($soldier->constraints);
 
-                $shifts = Helpers::mapSoldierShifts($soldier->shifts, false);
+                        $shifts = Helpers::mapSoldierShifts($soldier->shifts, false);
+                        $shifts->push(...Helpers::addShiftsSpaces($shifts));
+                        $shifts->push(...Helpers::addPrevMonthSpaces($soldier->id, now()));
 
-                $shifts->push(...Helpers::addShiftsSpaces($shifts));
-                $shifts->push(...Helpers::addPrevMonthSpaces($soldier->id, $this->date));
+                        $capacityHold = Helpers::capacityHold($shifts, []);
 
-                $capacityHold = Helpers::capacityHold($shifts, []);
+                        return Helpers::buildSoldier($soldier, $constraints, $shifts, $capacityHold);
+                    })
+                    ->filter(fn($soldier) => $soldier->hasMaxes());
 
-                return Helpers::buildSoldier($soldier, $constraints, $shifts, $capacityHold);
-            })
-            ->filter(fn ($soldier) => $soldier->hasMaxes())
-            ->shuffle();
-    }
+                $results = $results->merge($mapped);
+            });
 
-    public function run()
+        return $results->shuffle();
+    }    public function run()
     {
         $shifts = $this->getShiftWithTasks();
         $soldiers = $this->getSoldiersDetails();

app/Services/ConcurrentTasks.php

@@ -40,11 +40,12 @@ public function run()
 
     protected function getShiftsWithTasks()
     {
-        // $startOfMonth = max($this->date->copy()->startOfMonth(), Carbon::tomorrow());
         $startOfMonth = $this->date->copy()->startOfMonth();
         $endOfMonth = $this->date->copy()->endOfMonth();
 
-        return Shift::whereNull('soldier_id')
+        $results = collect();
+
+        Shift::whereNull('soldier_id')
             ->where(function ($query) use ($startOfMonth, $endOfMonth) {
                 $query->where('start_date', '<=', $endOfMonth)
                     ->where('start_date', '>=', $startOfMonth);
@@ -53,10 +54,13 @@ protected function getShiftsWithTasks()
                 $query->withTrashed()
                     ->where('kind', TaskKind::INPARALLEL->value);
             })
-            ->get()
-            ->map(fn (Shift $shift): ShiftService => Helpers::buildShift($shift));
-    }
+            ->chunk(500, function ($shifts) use (&$results) {
+                $mapped = $shifts->map(fn (Shift $shift): ShiftService => Helpers::buildShift($shift));
+                $results = $results->merge($mapped);
+            });
 
+        return $results;
+    }
     protected function getSoldiersDetails()
     {
         $range = new Range($this->date->copy()->startOfMonth(), $this->date->copy()->endOfMonth());

app/Services/Helpers.php

@@ -132,21 +132,27 @@ public static function addPrevMonthSpaces(int $soldierId, $date)
 
     protected static function getLastDayOfLastMonthShifts($soldierId, $lastDay)
     {
-        return Shift::where('soldier_id', $soldierId)
+        $results = collect();
+
+        Shift::where('soldier_id', $soldierId)
             ->where(function ($query) use ($lastDay) {
                 $query->whereDate('start_date', $lastDay)
                     ->orWhereDate('end_date', $lastDay);
             })
             ->whereHas('task', function ($query) {
                 $query->withTrashed()->where('kind', '!=', TaskKind::INPARALLEL->value);
             })
-            ->lazy()
-            ->map(fn (Shift $shift): ShiftService => self::buildShift($shift));
+            ->chunk(100, function ($shifts) use (&$results) {
+                $mapped = $shifts->map(fn (Shift $shift): ShiftService => self::buildShift($shift));
+                $results = $results->merge($mapped);
+            });
+
+        return $results;
     }
 
     public static function updateShiftTable($assignments)
     {
-        set_time_limit(seconds: 0);
+        // set_time_limit(seconds: 0);
         if (empty($assignments)) {
             return;
         }