Merge branch 'main' of bitbucket.org:studiotem/jandl-taskmanager-app

be/app/Console/Commands/SyncOffice365.php

@@ -53,7 +53,7 @@ class SyncOffice365 extends Command
             return ! Project::where('code', $projectCode)->exists();
         });
 
-        $subtasks = array_filter($events, function ($event) {
+        $subtasks_from_office365 = array_filter($events, function ($event) {
             $projectCode = explode(' ', $event['subject'])[0];
 
             // if project code exist in database, then it is subtask
@@ -66,7 +66,7 @@ class SyncOffice365 extends Command
             return ! Blocker::where('office365_id', $event['id'])->exists() && ! $event['isCancelled'];
         });
 
-        $newSubtasks = array_filter($subtasks, function ($event) {
+        $newSubtasks = array_filter($subtasks_from_office365, function ($event) {
             return ! SubTask::where('office365_id', $event['id'])->exists() && ! $event['isCancelled'];
         });
 
@@ -81,7 +81,15 @@ class SyncOffice365 extends Command
             return $blocker && $blocker->office365_change_key !== $event['changeKey'];
         });
 
+        // get edited subtasks - the ones, that has different changeKey from our database
+        $editedSubtasks = array_filter($subtasks_from_office365, function ($event) {
+            $subtask = SubTask::where('office365_id', $event['id'])->first();
+
+            return $subtask && $subtask->office365_change_key !== $event['changeKey'];
+        });
+
         Office365Service::editBlockers($editedBlockers);
+        Office365Service::editSubtasks($editedSubtasks);
 
         // get all canceled blockers - the ones, that are in our database and in the response they have isCancelled => true
         $removedBlockers = Blocker::whereNotNull('office365_id')->get()->filter(function ($blocker) use (
@@ -97,6 +105,34 @@ class SyncOffice365 extends Command
             $blocker->delete();
         });
 
+        // get all canceled subtasks - the ones, that are in our database and in the response they have isCancelled => true
+
+        $removedSubtasks = SubTask::where('is_finished', 0)->whereNotNull('office365_id')->get()->filter(function (
+            $subtask
+        ) use (
+            $subtasks_from_office365
+        ) {
+            $event = collect($subtasks_from_office365)->firstWhere('id', $subtask->office365_id);
+
+            return $event && $event['isCancelled'];
+        });
+
+        //dd($removedSubtasks);
+
+        foreach ($removedSubtasks as $subtaskToDelete) {
+            // vymazanie timeblockov
+            foreach ($subtaskToDelete->timeblocks as $timeblock) {
+                $timeblock->delete();
+            }
+
+            // vymazanie timesheetov
+            foreach ($subtaskToDelete->timesheets as $timesheet) {
+                $timesheet->delete();
+            }
+
+            $subtaskToDelete->delete();
+        }
+
         dd('he');
     }
 }

be/app/Http/Controllers/MasterTaskController.php

@@ -90,6 +90,7 @@ class MasterTaskController extends Controller
             'data.deadline'           => 'required',
             'data.project_id'         => 'required',
             'data.employees'          => 'required',
+            'data.estimated_duration' => 'required',
         ]);
 
         if ($validator->fails()) {
@@ -107,11 +108,21 @@ class MasterTaskController extends Controller
             }
         }
 
+        // validaci na to, ci uz neexistuje master task pod tymto projektom
+        $existingMasterTask = MasterTask::where('project_id', $request->all()['data']['project_id'])->first();
+
+        if ($existingMasterTask) {
+            return response()->json([
+                'message' => 'Master task already exists for this project',
+            ], 400);
+        }
+
 
         // upratanie requestu, pretoze frontend pouziva inu nomenklaturu fieldov ako appka
         $data['data']                    = $request->all()['data'];
         $data['data']['title']           = $request->all()['data']['name'];
         $data['data']['estimated_time']  = $request->all()['data']['duration'];
+        $data['data']['priceqoute_time'] = $request->all()['data']['estimated_duration'];
         $data['data']['created_by']      = $created_by;
 
         foreach ($data['data']['employees'] as $key => $employee) {

be/app/Listeners/SendTrackedTimeReachingPriceQouteTimeNotification.php

@@ -0,0 +1,54 @@
+<?php
+
+namespace App\Listeners;
+
+use App\Events\MasterTaskEdited;
+use App\Models\User;
+use Illuminate\Support\Facades\Mail;
+
+class SendTrackedTimeReachingPriceQouteTimeNotification
+{
+    /**
+     * Create the event listener.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        //
+    }
+
+    /**
+     * Handle the event.
+     *
+     * @param  object  $event
+     *
+     * @return void
+     */
+    public function handle(MasterTaskEdited $event)
+    {
+        // neposiela sa, pokial tracked time neprekrocil 80% estimated time alebo bola uz notifikacia v minulosti poslana
+        if ($event->mastertask->tracked_time < $event->mastertask->pricequote_time * 0.8 || $event->mastertask->pricequote_time_notification_sent) {
+            return;
+        }
+
+        $receiver = User::find($event->mastertask->created_by);
+
+        // pripad ked bol user soft deletnuty
+        if ( ! $receiver) {
+            return;
+        }
+
+        // only send if email wasnt sent before
+        if ($event->mastertask->pricequote_time_email_sent) {
+            return;
+        }
+
+        Mail::to($receiver->email)->send(new \App\Mail\MasterTaskTrackedTimeReachingPricQouteTime($event->mastertask));
+
+        // updatnem tak, aby mi to nespustilo dalsi event - dostal by som email loop
+        $event->mastertask->withoutEvents(function () use ($event) {
+            $event->mastertask->update(['pricequote_time_notification_sent' => 1]);
+        });;
+    }
+}

be/app/Mail/MasterTaskTrackedTimeReachingPricQouteTime.php

@@ -0,0 +1,65 @@
+<?php
+
+namespace App\Mail;
+
+use App\Models\MasterTask;
+use Illuminate\Bus\Queueable;
+use Illuminate\Mail\Mailable;
+use Illuminate\Mail\Mailables\Content;
+use Illuminate\Mail\Mailables\Envelope;
+use Illuminate\Queue\SerializesModels;
+
+class MasterTaskTrackedTimeReachingPricQouteTime extends Mailable
+{
+    use Queueable, SerializesModels;
+
+    public $mastertask;
+    public $creator;
+
+    /**
+     * Create a new message instance.
+     *
+     * @return void
+     */
+    public function __construct(MasterTask $mastertask)
+    {
+        $creator = \App\Models\User::find($mastertask->created_by);
+
+        $this->mastertask = $mastertask;
+        $this->creator    = ($creator) ? $creator->firstname . ' ' . $creator->lastname : '';
+    }
+
+    /**
+     * Get the message envelope.
+     *
+     * @return \Illuminate\Mail\Mailables\Envelope
+     */
+    public function envelope()
+    {
+        return new Envelope(
+            subject: 'Master Task ' . $this->mastertask->project->code . ' - ' . $this->mastertask->title . ' ma natrackovaných viac ako 80% odhadovaných hodín',
+        );
+    }
+
+    /**
+     * Get the message content definition.
+     *
+     * @return \Illuminate\Mail\Mailables\Content
+     */
+    public function content()
+    {
+        return new Content(
+            view: 'emails.task.master_task_reaching_pricequote_time',
+        );
+    }
+
+    /**
+     * Get the attachments for the message.
+     *
+     * @return array
+     */
+    public function attachments()
+    {
+        return [];
+    }
+}

be/app/Models/MasterTask.php

@@ -12,6 +12,12 @@ class MasterTask extends Model
     public $timestamps = true;
     public $guarded = ['id'];
 
+    public static function generateMasterTaskColor()
+    {
+        // return random value from array
+        return collect(['#E9FFE5', '#F6ECD3', '#FDE1FF', '#FFC9C9', '#DADEF8', '#EDFFFE', '#FFDED7'])->random();
+    }
+
     public function subtasks()
     {
         return $this->hasMany(SubTask::class);
@@ -22,11 +28,6 @@ class MasterTask extends Model
         return $this->belongsTo(Project::class);
     }
 
-    public function attachments()
-    {
-        return $this->hasMany(Attachment::class);
-    }
-
     public function team()
     {
         return $this->belongsTo(Team::class);
@@ -53,12 +54,6 @@ class MasterTask extends Model
         return $this->subtasks->pluck('user')->unique();
     }
 
-    public static function generateMasterTaskColor()
-    {
-        // return random value from array
-        return collect(['#E9FFE5', '#F6ECD3', '#FDE1FF', '#FFC9C9', '#DADEF8', '#EDFFFE', '#FFDED7'])->random();
-    }
-
     public function deleteAttachments()
     {
         foreach ($this->attachments as $attachment) {
@@ -70,6 +65,11 @@ class MasterTask extends Model
         return true;
     }
 
+    public function attachments()
+    {
+        return $this->hasMany(Attachment::class);
+    }
+
     public function recalculateEstimatedTime()
     {
         $this->estimated_time = $this->subtasks->sum('estimated_time');
@@ -86,6 +86,5 @@ class MasterTask extends Model
 
         $this->tracked_time = $trackedTime;
         $this->save();
-
     }
 }

be/app/Providers/EventServiceProvider.php

@@ -12,6 +12,7 @@ use App\Listeners\SendEditedMasterTaskNotification;
 use App\Listeners\SendEditedSubTaskNotification;
 use App\Listeners\SendFinishedTimeBlockNotification;
 use App\Listeners\SendNewSubTaskEmailNotification;
+use App\Listeners\SendTrackedTimeReachingPriceQouteTimeNotification;
 use App\Models\MasterTask;
 use App\Models\SubTask;
 use App\Models\Timeblock;
@@ -21,7 +22,6 @@ use App\Observers\TimeBlockObserver;
 use Illuminate\Auth\Events\Registered;
 use Illuminate\Auth\Listeners\SendEmailVerificationNotification;
 use Illuminate\Foundation\Support\Providers\EventServiceProvider as ServiceProvider;
-use Illuminate\Support\Facades\Event;
 
 class EventServiceProvider extends ServiceProvider
 {
@@ -45,7 +45,8 @@ class EventServiceProvider extends ServiceProvider
             SendEditedSubTaskNotification::class
         ],
         MasterTaskEdited::class  => [
-            SendEditedMasterTaskNotification::class
+            SendEditedMasterTaskNotification::class,
+            SendTrackedTimeReachingPriceQouteTimeNotification::class
         ],
         TimeBlockFinished::class => [
             SendFinishedTimeBlockNotification::class

be/app/Services/Office365/Office365Service.php

@@ -5,6 +5,7 @@ namespace App\Services\Office365;
 use App\Models\Blocker;
 use App\Models\MasterTask;
 use App\Models\Project;
+use App\Models\SubTask;
 use App\Models\User;
 use Carbon\Carbon;
 use Illuminate\Support\Facades\Http;
@@ -125,11 +126,11 @@ class Office365Service
                 continue;
             }
 
-            self::addSubtask($newSubtask, $mastertask);
+            self::addSubtaskToAllInvited($newSubtask, $mastertask);
         }
     }
 
-    private static function addSubtask(mixed $newSubtask, mixed $mastertask)
+    private static function addSubtaskToAllInvited(mixed $newSubtask, mixed $mastertask)
     {
         $attendees = $newSubtask['attendees'];
 
@@ -211,4 +212,113 @@ class Office365Service
         // manualne musim trignernut tuto operaciu, lebo cez Observer sa to nespusti - ten je nastaveny len na update subtasku
         $subtasks->first()->mastertask->recalculateTrackedTime();
     }
+
+    public static function editSubtasks(mixed $editedSubtasks)
+    {
+        foreach ($editedSubtasks as $editedSubtask) {
+            self::editSubtask($editedSubtask);
+        }
+    }
+
+    private static function editSubtask(mixed $editedSubtask)
+    {
+        $attendees = $editedSubtask['attendees'];
+
+        // vrati subtasky pre userov, ktori sa uz nenachadzaju v evente, ale v nasej databaze tento subtask maju. ale iba v pripade, ak ich subtasky este nie su ukoncene (is_finished != 1)
+
+        // TODO - zvlast do funkcie
+        $subtasksToDelete = SubTask::where('is_finished', 0)->where('office365_id',
+            $editedSubtask['id'])->get()->filter(function ($subtask) use (
+            $attendees
+        ) {
+            $event = collect($attendees)->firstWhere('emailAddress.address', $subtask->user->email);
+
+            return ! $event;
+        });
+
+        foreach ($subtasksToDelete as $subtaskToDelete) {
+            // vymazanie timeblockov
+            foreach ($subtaskToDelete->timeblocks as $timeblock) {
+                $timeblock->delete();
+            }
+
+            // vymazanie timesheetov
+            foreach ($subtaskToDelete->timesheets as $timesheet) {
+                $timesheet->delete();
+            }
+
+            $subtaskToDelete->delete();
+        }
+
+        // novym ucastnikom sa klasicky vytvori subtask ako v pripade noveho subtasku. pre 1 subtask existuje iba 1 user.
+        // TODO - zvlast do funkcie
+        $newAttendees = array_filter($attendees, function ($attendee) use ($editedSubtask) {
+            $idsOfAttendees = SubTask::where('office365_id', $editedSubtask['id'])->get()->pluck('user_id')->toArray();
+
+            $idOfUserFromOffice365 = User::where('email', $attendee['emailAddress']['address'])->first();
+
+            // if user doesnt exist in our database, we skip it
+            if ( ! $idOfUserFromOffice365) {
+                return false;
+            }
+
+            return ! in_array($idOfUserFromOffice365->id, $idsOfAttendees);
+        });
+
+        // nakopiruj subtask tak, ze bude obsahovat iba newAttendees
+        $editedSubtaskWithOnlyNewAttendees = $editedSubtask;
+
+        $editedSubtaskWithOnlyNewAttendees['attendees'] = $newAttendees;
+
+        $project = Project::where('code', explode(' ', $editedSubtask['subject'])[0])->first();
+
+        // ak existuje viac master taskov, pouzijeme posledny
+        $mastertask = MasterTask::where('project_id', $project->id)->latest()->first();
+
+        self::addSubtaskToAllInvited($editedSubtaskWithOnlyNewAttendees, $mastertask);
+
+        // existujucim ucastnikom sa updatne subtask
+        foreach ($attendees as $attendee) {
+            $idOfUserFromOffice365 = User::where('email', $attendee['emailAddress']['address'])->first();
+
+            // if user doesnt exist in our database, we skip it
+            if ( ! $idOfUserFromOffice365) {
+                continue;
+            }
+
+            $subtask = SubTask::where('office365_id', $editedSubtask['id'])->where('user_id',
+                $idOfUserFromOffice365->id)->first();
+
+            if ( ! $subtask) {
+                continue;
+            }
+
+            $subtask->update([
+                'office365_change_key' => $editedSubtask['changeKey'],
+                'title'                => substr($editedSubtask['subject'], strpos($editedSubtask['subject'], ' ') + 1),
+                'estimated_time'       => round((strtotime($editedSubtask['end']['dateTime']) - strtotime($editedSubtask['start']['dateTime'])) / 3600,
+                    1),
+                'description'          => $editedSubtask['body']['content'],
+                'deadline'             => $editedSubtask['end']['dateTime'],
+                'office365_location'   => $editedSubtask['location']['displayName'],
+            ]);
+
+            $oldTimeblock = $subtask->timeblocks->first();
+
+            // ak sa zmenilo trvanie alebo casy subtasku, tak sa updatne aj timeblock
+            if ($oldTimeblock['start'] != $editedSubtask['start']['dateTime'] || $oldTimeblock['end'] != $editedSubtask['end']['dateTime']) {
+                $subtask->syncTimeblocks([
+                    [
+                        'sub_task_id' => $subtask->id,
+                        'start'       => $editedSubtask['start']['dateTime'],
+                        'end'         => $editedSubtask['end']['dateTime'],
+                        'is_finished' => 0,
+                    ]
+                ]);
+            }
+        }
+
+        // manualne musim trignernut tuto operaciu, lebo cez Observer sa to nespusti - ten je nastaveny len na update subtasku
+        Subtask::where('office365_id', $editedSubtask['id'])->first()->mastertask->recalculateEstimatedTime();
+    }
 }

be/database/migrations/2025_03_18_101925_add_price_qoute_notification_info.php

@@ -0,0 +1,29 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration {
+    /**
+     * Run the migrations.
+     *
+     * @return void
+     */
+    public function up()
+    {
+        Schema::table('master_tasks', function (Blueprint $table) {
+            $table->tinyInteger('pricequote_time_notification_sent')->after('color')->default(0);
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        //
+    }
+};

be/resources/views/emails/task/master_task_reaching_pricequote_time.blade.php

@@ -0,0 +1,10 @@
+Task založil: {{$creator}} <br>
+Job number: {{$mastertask->project->code}} <br>
+Názov Tasku: {{$mastertask->title}} <br>
+Deadline do: {{$mastertask->deadline}} <br>
+Pôvodný odhad:  {{$mastertask->pricequote_time}} <br>
+Natrackované hodiny:  {{$mastertask->tracked_time}} <br>
+Odkaz na Task: {{ url( env( 'APP_URL_FE' ) . '/#/app/dashboard/projects?mastertask=' . $mastertask->id) }} <br>
+
+
+