Merge commit '10c2f829d59ab1f9a0337c81ea13e7256e7a4db8' into dev

app/Http/Resources/API/NotificationCollection.php

@@ -34,7 +34,6 @@ class NotificationCollection extends ResourceCollection
                     'created_by' => new UserProfileResource($action->createdBy),
                     'comment' => $action->commtent,
                     'object_type' => $action->object_type,
-                    'display_id'=>$action->display_id,
                     'object' => [
                         'id' => $action->object_id,
                         'name' => data_get($actionGroupObjects, sprintf("%s.%s", $action->object_type, $action->object_id)),
@@ -48,6 +47,7 @@ class NotificationCollection extends ResourceCollection
                 'content' => $item->content,
                 'read_at' => (string)$item->read_at,
                 'read_status' => (bool)$item->read_at,
+                'display_id'=>$item->display_id,
                 'object' => $object,
             ];
             $items[] = $row;

app/Http/Resources/API/RoleResource.php

@@ -12,13 +12,16 @@ class RoleResource extends JsonResource
      *
      * @return array<string, mixed>
      */
+    private static $index = 1;
     public function toArray(Request $request): array
     {
+        $displayId = self::$index++;
         return [
             'id' => $this->id,
             'name' => $this->name,
             'description' => $this->description,
             'permissions' => PermissionResource::collection($this->permissions),
+            'display_id'=>(string)$displayId,
         ];
     }
 }