remove unwanted changes

Author: kdmnk

.env.example

@@ -88,9 +88,15 @@ PDFLATEX_COMMAND=/usr/bin/pdflatex
 WORKSHOP_BALANCE_EXTERN=0.45
 WORKSHOP_BALANCE_RESIDENT=0.6
 
+APPLICATION_DEADLINE=
+APPLICATION_EXTENDED=false
+
 GITHUB_AUTH_TOKEN=
 GITHUB_REPO=EotvosCollegium/mars
 
+MR_AND_MISS_DEADLINE="2020-03-15 00:00:00"
+SEMESTER_EVALUATION_DEADLINE="2020-06-15 23:59:00"
+
 BACKUP_PATH=
 RADIUS_LOG_PATH=/var/log/freeradius/radius.log.1 #yesterday's log
 DHCP_LEASES_PATH=/var/lib/dhcp/dhcpd.leases

app/Http/Controllers/Auth/ApplicationController.php

@@ -6,58 +6,30 @@
 use App\Http\Controllers\Controller;
 use App\Models\ApplicationForm;
 use App\Models\Faculty;
-use App\Models\File;
-use App\Models\Role;
-use App\Models\RoleUser;
 use App\Models\User;
 use App\Models\Workshop;
-use App\Utils\HasPeriodicEvent;
+use App\Models\RoleUser;
+use App\Models\File;
+use App\Models\Role;
 use Carbon\Carbon;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Http\RedirectResponse;
 use Illuminate\Http\Request;
+use Illuminate\View\View;
+use Illuminate\Support\Facades\Storage;
 use Illuminate\Support\Facades\Cache;
 use Illuminate\Support\Facades\DB;
-use Illuminate\Support\Facades\Storage;
-use Illuminate\View\View;
 use Maatwebsite\Excel\Facades\Excel;
 
 class ApplicationController extends Controller
 {
-    //TODO attach application forms to semesters (from the periodicEvent)
-    use HasPeriodicEvent;
-
     private const EDUCATIONAL_ROUTE = 'educational';
     private const QUESTIONS_ROUTE = 'questions';
     private const FILES_ROUTE = 'files';
     private const DELETE_FILE_ROUTE = 'files.delete';
     private const ADD_PROFILE_PIC_ROUTE = 'files.profile';
     private const SUBMIT_ROUTE = 'submit';
 
-    /**
-     * Update the PeriodicEvent connected to the applications.
-     * @throws AuthorizationException
-     */
-    public function updateApplicationPeriod(Request $request): RedirectResponse
-    {
-        $this->authorize('finalize', ApplicationForm::class);
-
-        $request->validate([
-            'semester_id' => 'required|exists:semesters,id',
-            'start_date' => 'required|date',
-            'end_date' => 'required|date|after:now|after:start_date',
-            'extended_end_date' => 'nullable|date|after:end_date',
-        ]);
-        $show_until = Carbon::parse($request->input('end_date'))->addMonths(2);
-
-        $this->updatePeriodicEvent(array_merge(
-            $request->only(['semester_id', 'start_date', 'end_date', 'extended_end_date']),
-            ['show_until' => $show_until]
-        ));
-
-        return back()->with('message', __('general.successful_modification'));
-    }
-
     /**
      * Return the view based on the request's page parameter.
      * @param Request $request
@@ -76,8 +48,8 @@ public function showApplicationForm(Request $request): View|RedirectResponse
         $data = [
             'workshops' => Workshop::all(),
             'faculties' => Faculty::all(),
-            'deadline' => $this->getDeadline(),
-            'deadline_extended' => $this->isExtended(),
+            'deadline' => self::getApplicationDeadline(),
+            'deadline_extended' => self::isDeadlineExtended(),
             'user' => user(),
         ];
         switch ($request->input('page')) {
@@ -102,7 +74,7 @@ public function storeApplicationForm(Request $request)
     {
         $user = $request->user();
 
-        if (now() > $this->getDeadline()) {
+        if (now() > self::getApplicationDeadline()) {
             return redirect()->route('application')->with('error', 'A jelentkezési határidő lejárt');
         }
 
@@ -141,13 +113,13 @@ public function showApplications(Request $request): View
         if ($request->has('id')) { // return one application in detail
             $user = User::withoutGlobalScope('verified')
                 ->with('application')->findOrFail($request->input('id'));
-            $this->authorize('view', $user->application);
+            $this->authorize('viewApplication', $user);
             return view('auth.application.applications_details', [
                 'user' => $user,
             ]);
         } else { //return all applications that can be visible
-            $this->authorize('viewSome', ApplicationForm::class);
-            if($authUser->can('viewAll', ApplicationForm::class)) {
+            $this->authorize('viewSomeApplication', User::class);
+            if($authUser->can('viewAllApplications', User::class)) {
                 $workshops = Workshop::all();
             } else {
                 $workshops = $authUser->roleWorkshops->concat($authUser->applicationCommitteWorkshops);
@@ -178,8 +150,7 @@ public function showApplications(Request $request): View
                 'workshop' => $request->input('workshop'), //filtered workshop
                 'workshops' => $workshops, //workshops that can be chosen to filter
                 'status' => $request->input('status'), //filtered status
-                'applicationDeadline' => $this->getDeadline(),
-                'periodicEvent' => $this->periodicEvent()
+                'applicationDeadline' => self::getApplicationDeadline(),
             ]);
         }
     }
@@ -192,7 +163,7 @@ public function showApplications(Request $request): View
      */
     public function editApplication(Request $request): RedirectResponse
     {
-        $this->authorize('viewSome', ApplicationForm::class);
+        $this->authorize('viewSomeApplication', User::class);
         $application = ApplicationForm::findOrFail($request->input('application'));
         $newStatus = $request->input('status_'.$application->user->id);
         if ($request->has('note')) {
@@ -210,7 +181,7 @@ public function editApplication(Request $request): RedirectResponse
      */
     public function finalizeApplicationProcess()
     {
-        $this->authorize('finalize', ApplicationForm::class);
+        $this->authorize('finalizeApplicationProcess', User::class);
         Cache::forget('collegists');
         $not_handled_applicants = User::query()->withoutGlobalScope('verified')
             ->where('verified', 0)
@@ -252,6 +223,22 @@ public function finalizeApplicationProcess()
         return back()->with('message', 'Sikeresen jóváhagyta az elfogadott jelentkezőket');
     }
 
+    /**
+     * @return Carbon the application deadline set in .env
+     */
+    public static function getApplicationDeadline(): Carbon
+    {
+        return Carbon::parse(config('custom.application_deadline'));
+    }
+
+    /**
+     * @return bool if the deadline has been extended or not
+     */
+    public static function isDeadlineExtended(): bool
+    {
+        return config('custom.application_extended');
+    }
+
 
     /**
      * @param Request $request
@@ -327,7 +314,7 @@ public function submitApplication(User $user)
         if ($user->application->missingData() == []) {
             $user->application->update(['status' => ApplicationForm::STATUS_SUBMITTED]);
             $user->internetAccess->setWifiCredentials($user->educationalInformation->neptun);
-            $user->internetAccess()->update(['has_internet_until' => $this->getDeadline()?->addMonth()]);
+            $user->internetAccess()->update(['has_internet_until' => $this::getApplicationDeadline()->addMonth(1)]);
             return back()->with('message', 'Sikeresen véglegesítette a jelentkezését!');
         } else {
             return back()->with('error', 'Hiányzó adatok!');
@@ -339,7 +326,7 @@ public function submitApplication(User $user)
      */
     public function exportApplications()
     {
-        $this->authorize('viewAll', ApplicationForm::class);
+        $this->authorize('viewAllApplications', User::class);
 
         $applications = ApplicationForm::with('user')
                 ->where('status', ApplicationForm::STATUS_SUBMITTED)

app/Http/Controllers/Secretariat/SemesterEvaluationController.php

@@ -3,11 +3,9 @@
 namespace App\Http\Controllers\Secretariat;
 
 use App\Http\Controllers\Controller;
-use App\Mail\EvaluationFormAvailable;
-use App\Mail\EvaluationFormAvailableDetails;
 use App\Mail\EvaluationFormClosed;
-use App\Mail\EvaluationFormReminder;
 use App\Mail\StatusDeactivated;
+use App\Models\EventTrigger;
 use App\Models\Faculty;
 use App\Models\GeneralAssemblies\GeneralAssembly;
 use App\Models\Role;
@@ -17,7 +15,7 @@
 use App\Models\SemesterStatus;
 use App\Models\User;
 use App\Models\Workshop;
-use App\Utils\HasPeriodicEvent;
+use Carbon\Carbon;
 use Illuminate\Auth\Access\AuthorizationException;
 use Illuminate\Auth\AuthenticationException;
 use Illuminate\Http\Request;
@@ -27,42 +25,31 @@
 
 class SemesterEvaluationController extends Controller
 {
-    use HasPeriodicEvent;
-
-    public function updateEvaluationPeriod(Request $request)
+    /**
+     * Check if the evaluation is available.
+     */
+    public static function isEvaluationAvailable(): bool
     {
-        $this->authorize('manage', SemesterEvaluation::class);
-
-        $request->validate([
-            'semester_id' => 'required|exists:semesters,id',
-            'start_date' => 'required|date',
-            'end_date' => 'required|date|after:now',
-        ]);
-
-        $this->updatePeriodicEvent(
-            $request->only(['semester_id', 'start_date', 'end_date'])
-        );
-
-        return back()->with('message', __('general.successful_modification'));
-
-    }
+        $available = EventTrigger::find(EventTrigger::SEMESTER_EVALUATION_AVAILABLE)->date;
+        $deadline = self::deadline();
 
-    public function handlePeriodicEventStart(): void
-    {
-        Mail::to(config('contacts.mail_membra'))->queue(new EvaluationFormAvailable($this->getDeadline()));
-        if (User::secretary()) {
-            Mail::to(User::secretary())->queue(new EvaluationFormAvailableDetails(User::secretary()->name, $this->getDeadline()));
-        }
-        if (User::president()) {
-            Mail::to(User::president())->queue(new EvaluationFormAvailableDetails(User::president()->name, $this->getDeadline()));
-        }
+        return now() <= $deadline && $available >= Semester::next()->getStartDate();
     }
 
-    public function handlePeriodicEventReminder(int $daysBeforeEnd): void
+    public static function deadline(): Carbon
     {
-        if($daysBeforeEnd < 3) {
-            $userCount = self::usersHaventFilledOutTheForm()->count();
-            Mail::to(config('contacts.mail_membra'))->queue(new EvaluationFormReminder($userCount, $this->getDeadline()));
+        $custom_deadline = config('custom.semester_evaluation_deadline');
+        $system_deadline = EventTrigger::find(EventTrigger::DEACTIVATE_STATUS_SIGNAL)->date;
+        if (!isset($custom_deadline)) {
+            return $system_deadline;
+        } else {
+            $custom_deadline = Carbon::parse($custom_deadline);
+            //if the deadline has not been updated, use the system_deadline
+            if ($custom_deadline < Semester::current()->getStartDate()) {
+                return $system_deadline;
+            } else {
+                return $custom_deadline;
+            }
         }
     }
 
@@ -72,7 +59,10 @@ public function handlePeriodicEventReminder(int $daysBeforeEnd): void
      */
     public function show()
     {
-        $this->authorize('fillOrManage', SemesterEvaluation::class);
+        $this->authorize('is-collegist');
+        if (!self::isEvaluationAvailable()) {
+            return redirect('home')->with('error', 'Lejárt a határidő a kérdőív kitöltésére. Keresd fel a titkárságot.');
+        }
 
         return view('secretariat.evaluation-form.app', [
             'phd' => user()->educationalInformation->studyLines()->currentlyEnrolled()->where('type', 'phd')->exists(),
@@ -83,17 +73,19 @@ public function show()
             'general_assemblies' => GeneralAssembly::all()->sortByDesc('closed_at')->take(2),
             'community_services' => user()->communityServiceRequests()->where('semester_id', Semester::current()->id)->get(),
             'position_roles' => user()->roles()->whereIn('name', Role::STUDENT_POSTION_ROLES)->get(),
-            'periodicEvent' => $this->periodicEvent(),
+            'deadline' => self::deadline(),
         ]);
     }
 
     /**
      * Update form information.
-     * @throws \Exception
      */
     public function store(Request $request)
     {
-        $this->authorize('fill', SemesterEvaluation::class);
+        $this->authorize('is-collegist');
+        if (!self::isEvaluationAvailable()) {
+            return redirect('home')->with('error', 'Lejárt a határidő a kérdőív kitöltésére. Keresd fel a titkárságot.');
+        }
 
         $validator = Validator::make($request->all(), [
             'section' => 'required|in:alfonso,courses,avg,general_assembly,feedback,other,status',
@@ -124,13 +116,9 @@ public function store(Request $request)
         $validator->validate();
 
         $user = user();
-        $semester = self::semester();
-        if(!$semester) {
-            throw new \Exception('No semester found for the event');
-        }
-        $evaluation = $user->semesterEvaluations()->where('semester_id', $semester->id)->first();
+        $evaluation = $user->semesterEvaluations()->where('semester_id', Semester::current()->id)->first();
         if (!$evaluation) {
-            $evaluation = SemesterEvaluation::create(['semester_id' => $semester->id, 'user_id' => $user->id]);
+            $evaluation = SemesterEvaluation::create(['semester_id' => Semester::current()->id, 'user_id' => $user->id]);
         }
         switch ($request->section) {
             case 'alfonso':
@@ -176,7 +164,7 @@ public function store(Request $request)
                     if (!isset($request->next_status)) {
                         return back()->with('error', "A státusz megadása kötelező!")->with('section', $request->section);
                     }
-                    $user->setStatusFor(self::semester()->succ(), $request->next_status, $request->next_status_note);
+                    $user->setStatusFor(Semester::next(), $request->next_status, $request->next_status_note);
                     if ($request->has('resign_residency') && $user->isResident()) {
                         $user->setExtern();
                     }
@@ -189,6 +177,30 @@ public function store(Request $request)
         return back()->with('message', __('general.successful_modification'))->with('section', $request->section);
     }
 
+    /**
+     * Send out the request to fill out the form.
+     */
+    public static function sendEvaluationAvailableMail()
+    {
+        Mail::to(config('contacts.mail_membra'))->queue(new \App\Mail\EvaluationFormAvailable());
+        if (User::secretary()) {
+            Mail::to(User::secretary())->queue(new \App\Mail\EvaluationFormAvailableDetails(User::secretary()->name));
+        }
+        if (User::president()) {
+            Mail::to(User::president())->queue(new \App\Mail\EvaluationFormAvailableDetails(User::president()->name));
+        }
+    }
+
+    /**
+     * Send out a reminder.
+     */
+    public static function sendEvaluationReminder()
+    {
+        $userCount = self::usersHaventFilledOutTheForm()->count();
+
+        Mail::to(config('contacts.mail_membra'))->queue(new \App\Mail\EvaluationFormReminder($userCount));
+    }
+
     /**
      * @return User[]|\Illuminate\Database\Eloquent\Collection|\Illuminate\Support\Collection
      */