fix: fix Carbon::now() calls in loops (#555)

officelifehq · Feb 14, 2021 · 905de65 · 905de65
1 parent fc4ef0e
commit 905de65
Show file tree

Hide file tree

Showing 12 changed files with 60 additions and 42 deletions.
diff --git a/app/Helpers/BirthdayHelper.php b/app/Helpers/BirthdayHelper.php
@@ -15,7 +15,7 @@ class BirthdayHelper
      */
     public static function isBirthdayInXDays(Carbon $startDate, Carbon $birthdate, int $numberOfDays): bool
     {
-        $future = $startDate->addDays($numberOfDays);
+        $future = $startDate->copy()->addDays($numberOfDays);
         $birthdate->year = $startDate->year;
 
         if ($birthdate->isPast()) {

diff --git a/app/Helpers/DateHelper.php b/app/Helpers/DateHelper.php
@@ -159,12 +159,13 @@ public static function determineDateStatus(Carbon $date): string
      */
     public static function hoursOrDaysLeft(Carbon $date): string
     {
-        $hoursLeft = Carbon::now()->diffInHours($date);
+        $now = Carbon::now();
+        $hoursLeft = $now->diffInHours($date);
 
         if ($hoursLeft < 24) {
             $timeLeft = trans_choice('app.hours_left', $hoursLeft);
         } else {
-            $timeLeft = trans_choice('app.days_left', Carbon::now()->diffInDays($date));
+            $timeLeft = trans_choice('app.days_left', $now->diffInDays($date));
         }
 
         return $timeLeft;

diff --git a/app/Http/ViewHelpers/Company/CompanyViewHelper.php b/app/Http/ViewHelpers/Company/CompanyViewHelper.php
@@ -96,20 +96,21 @@ public static function birthdaysThisWeek(Company $company): array
             ->select('id', 'first_name', 'last_name', 'avatar', 'birthdate')
             ->get();
 
+        $now = Carbon::now();
+        $minDate = $now->copy()->startOfWeek(Carbon::MONDAY);
+        $maxDate = $now->copy()->endOfWeek(Carbon::SUNDAY);
+
         $birthdaysCollection = collect([]);
         foreach ($employees as $employee) {
-            $birthdateWithCurrentYear = $employee->birthdate->copy()->year(Carbon::now()->year);
-
-            $minDate = Carbon::now()->startOfWeek(Carbon::MONDAY);
-            $maxDate = Carbon::now()->endOfWeek(Carbon::SUNDAY);
+            $birthdateWithCurrentYear = $employee->birthdate->copy()->year($now->year);
 
             if (BirthdayHelper::isBirthdayInRange($birthdateWithCurrentYear, $minDate, $maxDate)) {
                 $birthdaysCollection->push([
                     'id' => $employee->id,
                     'name' => $employee->name,
                     'avatar' => $employee->avatar,
                     'birthdate' => DateHelper::formatMonthAndDay($birthdateWithCurrentYear),
-                    'sort_key' => Carbon::createFromDate(Carbon::now()->year, $birthdateWithCurrentYear->month, $birthdateWithCurrentYear->day)->format('Y-m-d'),
+                    'sort_key' => Carbon::createFromDate($now->year, $birthdateWithCurrentYear->month, $birthdateWithCurrentYear->day)->format('Y-m-d'),
                     'url' => route('employees.show', [
                         'company' => $company,
                         'employee' => $employee->id,
@@ -133,12 +134,13 @@ public static function birthdaysThisWeek(Company $company): array
      */
     public static function newHiresThisWeek(Company $company): Collection
     {
+        $now = Carbon::now();
         $employees = $company->employees()
             ->select('id', 'first_name', 'last_name', 'avatar', 'hired_at', 'position_id')
             ->where('locked', false)
             ->whereNotNull('hired_at')
-            ->whereDate('hired_at', '>=', Carbon::now()->startOfWeek(Carbon::MONDAY))
-            ->whereDate('hired_at', '<=', Carbon::now()->endOfWeek(Carbon::SUNDAY))
+            ->whereDate('hired_at', '>=', $now->copy()->startOfWeek(Carbon::MONDAY))
+            ->whereDate('hired_at', '<=', $now->copy()->endOfWeek(Carbon::SUNDAY))
             ->with('position')
             ->orderBy('hired_at', 'asc')
             ->get();

diff --git a/app/Http/ViewHelpers/Dashboard/DashboardHRViewHelper.php b/app/Http/ViewHelpers/Dashboard/DashboardHRViewHelper.php
@@ -66,9 +66,10 @@ public static function employeesWithoutManagersWithPendingTimesheets(Company $co
 
     public static function statisticsAboutTimesheets(Company $company)
     {
+        $now = Carbon::now();
         $totals = DB::table('timesheets')
-            ->whereDate('started_at', '>=', Carbon::now()->startOfWeek(Carbon::MONDAY)->subDays(30))
-            ->whereDate('started_at', '<', Carbon::now()->startOfWeek(Carbon::MONDAY))
+            ->whereDate('started_at', '>=', $now->copy()->startOfWeek(Carbon::MONDAY)->subDays(30))
+            ->whereDate('started_at', '<', $now->copy()->startOfWeek(Carbon::MONDAY))
             ->selectRaw('count(*) as total')
             ->selectRaw("count(case when status = '".Timesheet::REJECTED."' then 1 end) as rejected")
             ->first();

diff --git a/app/Http/ViewHelpers/Dashboard/DashboardManagerViewHelper.php b/app/Http/ViewHelpers/Dashboard/DashboardManagerViewHelper.php
@@ -115,6 +115,7 @@ public static function oneOnOnes(Employee $manager, Collection $directReports):
     {
         $oneOnOnesCollection = collect([]);
         $company = $manager->company;
+        $now = Carbon::now();
 
         foreach ($directReports as $directReport) {
             $employee = $directReport->directReport;
@@ -132,7 +133,7 @@ public static function oneOnOnes(Employee $manager, Collection $directReports):
                     'author_id' => $employee->id,
                     'manager_id' => $manager->id,
                     'employee_id' => $employee->id,
-                    'date' => Carbon::now()->format('Y-m-d'),
+                    'date' => $now->format('Y-m-d'),
                 ]);
             }
 
@@ -171,6 +172,7 @@ public static function contractRenewals(Employee $manager, Collection $directRep
     {
         $collection = collect([]);
         $company = $manager->company;
+        $now = Carbon::now();
 
         foreach ($directReports as $directReport) {
             $employee = $directReport->directReport;
@@ -187,7 +189,7 @@ public static function contractRenewals(Employee $manager, Collection $directRep
                 continue;
             }
 
-            $dateInOneMonth = Carbon::now()->addMonths(1);
+            $dateInOneMonth = $now->copy()->addMonths(1);
 
             if ($employee->contract_renewed_at->isAfter($dateInOneMonth)) {
                 continue;
@@ -204,8 +206,8 @@ public static function contractRenewals(Employee $manager, Collection $directRep
                 ]),
                 'contract_information' => [
                     'contract_renewed_at' => DateHelper::formatDate($employee->contract_renewed_at),
-                    'number_of_days' => $employee->contract_renewed_at->diffInDays(Carbon::now()),
-                    'late' => $employee->contract_renewed_at->isBefore(Carbon::now()),
+                    'number_of_days' => $employee->contract_renewed_at->diffInDays($now),
+                    'late' => $employee->contract_renewed_at->isBefore($now),
                 ],
             ]);
         }

diff --git a/app/Http/ViewHelpers/Dashboard/DashboardMeViewHelper.php b/app/Http/ViewHelpers/Dashboard/DashboardMeViewHelper.php
@@ -210,6 +210,7 @@ public static function oneOnOnes(Employee $employee): Collection
         $managers = $employee->getListOfManagers();
         $company = $employee->company;
         $managersCollection = collect([]);
+        $now = Carbon::now();
 
         foreach ($managers as $manager) {
             // for each manager, we need to check if there is an active one on
@@ -227,7 +228,7 @@ public static function oneOnOnes(Employee $employee): Collection
                     'author_id' => $employee->id,
                     'manager_id' => $manager->id,
                     'employee_id' => $employee->id,
-                    'date' => Carbon::now()->format('Y-m-d'),
+                    'date' => $now->format('Y-m-d'),
                 ]);
             }
 
@@ -274,23 +275,24 @@ public static function contractRenewal(Employee $employee): ?array
             return null;
         }
 
-        $dateInOneMonth = Carbon::now()->addMonths(1);
+        $now = Carbon::now();
+        $dateInOneMonth = $now->copy()->addMonths(1);
 
         if ($employee->contract_renewed_at->isAfter($dateInOneMonth)) {
             return null;
         }
 
-        if ($employee->contract_renewed_at->isBefore(Carbon::now())) {
+        if ($employee->contract_renewed_at->isBefore($now)) {
             return [
                 'contract_renewed_at' => DateHelper::formatDate($employee->contract_renewed_at),
-                'number_of_days' => $employee->contract_renewed_at->diffInDays(Carbon::now()),
+                'number_of_days' => $employee->contract_renewed_at->diffInDays($now),
                 'late' => true,
             ];
         }
 
         return [
             'contract_renewed_at' => DateHelper::formatDate($employee->contract_renewed_at),
-            'number_of_days' => $employee->contract_renewed_at->diffInDays(Carbon::now()),
+            'number_of_days' => $employee->contract_renewed_at->diffInDays($now),
             'late' => false,
         ];
     }

diff --git a/app/Http/ViewHelpers/Dashboard/DashboardTeamViewHelper.php b/app/Http/ViewHelpers/Dashboard/DashboardTeamViewHelper.php
@@ -36,12 +36,14 @@ public static function birthdays(Team $team): array
 
         // build the collection of data
         $birthdaysCollection = collect([]);
+        $now = Carbon::now();
+
         foreach ($employees as $employee) {
             if (! $employee->birthdate) {
                 continue;
             }
 
-            if (BirthdayHelper::isBirthdayInXDays(Carbon::now(), $employee->birthdate, 30)) {
+            if (BirthdayHelper::isBirthdayInXDays($now, $employee->birthdate, 30)) {
                 $birthdaysCollection->push([
                     'id' => $employee->id,
                     'url' => route('employees.show', [
@@ -51,7 +53,7 @@ public static function birthdays(Team $team): array
                     'name' => $employee->name,
                     'avatar' => $employee->avatar,
                     'birthdate' => DateHelper::formatMonthAndDay($employee->birthdate),
-                    'sort_key' => Carbon::createFromDate(Carbon::now()->year, $employee->birthdate->month, $employee->birthdate->day)->format('Y-m-d'),
+                    'sort_key' => Carbon::createFromDate($now->year, $employee->birthdate->month, $employee->birthdate->day)->format('Y-m-d'),
                 ]);
             }
         }
@@ -80,8 +82,10 @@ public static function workFromHome(Team $team): Collection
         });
 
         $workFromHomeCollection = collect([]);
+        $now = Carbon::now();
+
         foreach ($employees as $employee) {
-            if (! WorkFromHomeHelper::hasWorkedFromHomeOnDate($employee, Carbon::now())) {
+            if (! WorkFromHomeHelper::hasWorkedFromHomeOnDate($employee, $now)) {
                 continue;
             }
 
@@ -227,8 +231,9 @@ public static function worklogs(Team $team, Carbon $date): array
      */
     public static function upcomingNewHires(Team $team): Collection
     {
-        $currentDay = Carbon::now()->format('Y-m-d');
-        $nextSunday = Carbon::now()->addWeek()->endOfWeek(Carbon::SUNDAY)->format('Y-m-d');
+        $now = Carbon::now();
+        $currentDay = $now->format('Y-m-d');
+        $nextSunday = $now->copy()->addWeek()->endOfWeek(Carbon::SUNDAY)->format('Y-m-d');
 
         $employees = $team->employees()
             ->where('locked', false)
@@ -282,12 +287,13 @@ public static function upcomingHiredDateAnniversaries(Team $team): Collection
             return ! $employee->hired_at->isCurrentYear();
         });
 
-        $nextMonday = Carbon::now()->format('Y-m-d');
-        $nextSunday = Carbon::now()->addWeek()->endOfWeek(Carbon::SUNDAY)->format('Y-m-d');
+        $now = Carbon::now();
+        $nextMonday = $now->format('Y-m-d');
+        $nextSunday = $now->copy()->addWeek()->endOfWeek(Carbon::SUNDAY)->format('Y-m-d');
         $upcomingWeek = CarbonPeriod::create($nextMonday, $nextSunday);
 
-        $employees = $employees->filter(function ($employee) use ($upcomingWeek) {
-            return $upcomingWeek->contains($employee->hired_at->setYear(Carbon::now()->year)->format('Y-m-d'));
+        $employees = $employees->filter(function ($employee) use ($upcomingWeek, $now) {
+            return $upcomingWeek->contains($employee->hired_at->setYear($now->year)->format('Y-m-d'));
         });
 
         $employeesCollection = collect([]);
@@ -296,8 +302,8 @@ public static function upcomingHiredDateAnniversaries(Team $team): Collection
                 'id' => $employee->id,
                 'name' => $employee->name,
                 'avatar' => $employee->avatar,
-                'anniversary_date' => DateHelper::formatDayAndMonthInParenthesis($employee->hired_at->setYear(Carbon::now()->year)),
-                'anniversary_age' => Carbon::now()->year - $employee->hired_at->year,
+                'anniversary_date' => DateHelper::formatDayAndMonthInParenthesis($employee->hired_at->setYear($now->year)),
+                'anniversary_age' => $now->year - $employee->hired_at->year,
                 'url' => route('employees.show', [
                     'company' => $employee->company,
                     'employee' => $employee,

diff --git a/app/Http/ViewHelpers/Employee/EmployeeOneOnOneViewHelper.php b/app/Http/ViewHelpers/Employee/EmployeeOneOnOneViewHelper.php
@@ -19,12 +19,13 @@ class EmployeeOneOnOneViewHelper
      */
     public static function stats(Collection $entries): array
     {
-        $entriesLast365Days = $entries->filter(function ($entry) {
-            return $entry->happened_at > Carbon::now()->subYear();
+        $now = Carbon::now();
+        $entriesLast365Days = $entries->filter(function ($entry) use ($now) {
+            return $entry->happened_at > $now->copy()->subYear();
         });
 
         // now calculating the average number of days between one on ones
-        $previousEntry = Carbon::now();
+        $previousEntry = $now;
         $average = collect([]);
         foreach ($entriesLast365Days as $entry) {
             $numberOfDays = $previousEntry->diffInDays($entry->happened_at);

diff --git a/app/Http/ViewHelpers/Employee/EmployeePerformanceViewHelper.php b/app/Http/ViewHelpers/Employee/EmployeePerformanceViewHelper.php
@@ -34,10 +34,11 @@ public static function latestRateYourManagerSurveys(Employee $employee): ?array
         // the manager the date of the next survey
         $survey = $surveysToDisplay->first();
         if (! $survey->active) {
+            $now = Carbon::now();
             $surveysCollection->push([
                 'id' => null,
-                'month' => Carbon::now()->format('M Y'),
-                'deadline' => DateHelper::hoursOrDaysLeft(Carbon::now()->endOfMonth()),
+                'month' => $now->format('M Y'),
+                'deadline' => DateHelper::hoursOrDaysLeft($now->copy()->endOfMonth()),
             ]);
         }
 

diff --git a/app/Http/ViewHelpers/Employee/EmployeeShowViewHelper.php b/app/Http/ViewHelpers/Employee/EmployeeShowViewHelper.php
@@ -415,11 +415,12 @@ public static function worklogs(Employee $employee): array
      */
     public static function workFromHomeStats(Employee $employee): array
     {
-        $currentYear = Carbon::now()->year;
+        $now = Carbon::now();
+        $currentYear = $now->year;
         $workFromHomes = $employee->workFromHomes()->whereYear('date', (string) $currentYear)->get();
 
         return [
-            'work_from_home_today' => WorkFromHomeHelper::hasWorkedFromHomeOnDate($employee, Carbon::now()),
+            'work_from_home_today' => WorkFromHomeHelper::hasWorkedFromHomeOnDate($employee, $now),
             'number_times_this_year' => $workFromHomes->count(),
             'url' => route('employee.work.workfromhome', [
                 'company' => $employee->company,

diff --git a/app/Http/ViewHelpers/Employee/EmployeeSurveysViewHelper.php b/app/Http/ViewHelpers/Employee/EmployeeSurveysViewHelper.php
@@ -34,10 +34,11 @@ public static function rateYourManagerSurveys(Employee $employee): ?array
         // the manager the date of the next survey
         $survey = $allSurveys->first();
         if (! $survey->active) {
+            $now = Carbon::now();
             $surveysCollection->push([
                 'id' => null,
-                'month' => Carbon::now()->format('M Y'),
-                'deadline' => DateHelper::hoursOrDaysLeft(Carbon::now()->endOfMonth()),
+                'month' => $now->format('M Y'),
+                'deadline' => DateHelper::hoursOrDaysLeft($now->copy()->endOfMonth()),
             ]);
         }
 

diff --git a/app/Models/Company/Employee.php b/app/Models/Company/Employee.php
@@ -745,7 +745,7 @@ public function getHolidaysInformation(): array
         // get the yearly completion rate
         $currentDate = Carbon::now();
         $daysInYear = DateHelper::getNumberOfDaysInYear($currentDate);
-        $yearCompletionRate = Carbon::now()->dayOfYear * 100 / $daysInYear;
+        $yearCompletionRate = $currentDate->dayOfYear * 100 / $daysInYear;
 
         return [
             'current_balance_round' => round($this->holiday_balance, 0, PHP_ROUND_HALF_DOWN),