Merge branch 'feature/office365' of bitbucket.org:studiotem/jandl-taskmanager-app into feature/office365

be/app/Http/Resources/SubTaskResource.php

@@ -10,12 +10,14 @@ class SubTaskResource extends JsonResource
      * Transform the resource into an array.
      *
      * @param  \Illuminate\Http\Request  $request
+     *
      * @return array|\Illuminate\Contracts\Support\Arrayable|\JsonSerializable
      */
     public function toArray($request)
     {
         return [
             'id'                      => $this->id,
+            'type'                    => $this->type,
             'created_by'              => $this->created_by,
             'master_task'             => $this->mastertask->title,
             'master_task_description' => $this->mastertask->description,
@@ -36,6 +38,5 @@ class SubTaskResource extends JsonResource
             'files'                   => AttachmentResource::collection($this->attachments->isNotEmpty() ? $this->attachments : $this->mastertask->attachments),
             'color'                   => $this->mastertask->color,
         ];
-
     }
 }

be/database/migrations/2024_11_15_133850_add_type_to_subtasks.php

@@ -0,0 +1,31 @@
+<?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('sub_tasks', function (Blueprint $table) {
+            $table->string('type')->after('master_task_id')->default('sub_task');
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     *
+     * @return void
+     */
+    public function down()
+    {
+        Schema::table('subtasks', function (Blueprint $table) {
+            //
+        });
+    }
+};