|
@@ -5,7 +5,6 @@ namespace App\Http\Resources\API;
|
|
|
use App\Models\Action;
|
|
|
use App\Models\Enums\ApprovalObjectType;
|
|
|
use App\Models\Enums\NotificationObjectType;
|
|
|
-use function Detection\match;
|
|
|
use Illuminate\Http\Request;
|
|
|
use Illuminate\Http\Resources\Json\ResourceCollection;
|
|
|
|
|
@@ -25,8 +24,7 @@ class NotificationCollection extends ResourceCollection
|
|
|
$object = null;
|
|
|
if ($item->object_type == NotificationObjectType::ACTION->value) {
|
|
|
$action = $actions[$item->object_id];
|
|
|
- $name=data_get($actionGroupObjects, sprintf("%s.%s", $action->object_type, $action->object_id));
|
|
|
- $objectId=$action->object_id;
|
|
|
+
|
|
|
$objectAction = $item->extra_fields['action'] ?? $action->action;
|
|
|
|
|
|
$object = [
|
|
@@ -36,15 +34,10 @@ class NotificationCollection extends ResourceCollection
|
|
|
'created_by' => new UserProfileResource($action->createdBy),
|
|
|
'comment' => $action->commtent,
|
|
|
'object_type' => $action->object_type,
|
|
|
-// [
|
|
|
-// 'id' => $action->object_id,
|
|
|
-// 'name' => data_get($actionGroupObjects, sprintf("%s.%s", $action->object_type, $action->object_id)),
|
|
|
-// ]
|
|
|
- 'object' => match($action->object_type){
|
|
|
- 'task'=>['id' => $objectId,'project_id'=>$action->project_id,'name' =>$name],
|
|
|
- 'container'=>['id' => $objectId,'library_id'=>$action->library_id,'version'=>$action->version,'name' =>$name],
|
|
|
- default =>['id' => $objectId,'name' =>$name]
|
|
|
- },
|
|
|
+ 'object' => [
|
|
|
+ 'id' => $action->object_id,
|
|
|
+ 'name' => data_get($actionGroupObjects, sprintf("%s.%s", $action->object_type, $action->object_id)),
|
|
|
+ ]
|
|
|
];
|
|
|
}
|
|
|
$row = [
|