kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-18 03:25:50 +00:00
Code Issues Projects Releases Wiki Activity

Also return the next_execution_assigned_user for the /chores API endpoint (closes #1493)

Browse Source 
Include the user and category object for the /tasks API endpoint (closes #1494)
This commit is contained in:
Bernd Bestel
2021-07-06 18:40:55 +02:00
parent 54bf7ed659
commit aaa054e0a5
3 changed files with 44 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
changelog/62_UNRELEASED_xxxx-xx-xx.md
View File

@@ -75,6 +75,8 @@
### API improvements/fixes ### API improvements/fixes
- Added a new API endpoint `/system/localization-strings` to get the localization strings (gettext JSON representation; in the by the user desired language) - Added a new API endpoint `/system/localization-strings` to get the localization strings (gettext JSON representation; in the by the user desired language)
- The `GET /chores` endpoint now also returns the `next_execution_assigned_user` per chore (like the endpoint `GET /chores​/{choreId}` already did for a single chore)
- The `GET /tasks` endpoint now also returns the assigned user and category object per task
- Fixed that due soon products with `due_type` = "Expiration date" were missing in `due_products` of the `/stock/volatile` endpoint - Fixed that due soon products with `due_type` = "Expiration date" were missing in `due_products` of the `/stock/volatile` endpoint
- Fixed that `PUT/DELETE /objects/{entity}/{objectId}` produced an internal server error when the given object id was invalid (now returns `400 Bad Request`) - Fixed that `PUT/DELETE /objects/{entity}/{objectId}` produced an internal server error when the given object id was invalid (now returns `400 Bad Request`)
- Fixed that hyphens in filter values did not work - Fixed that hyphens in filter values did not work

17
services/ChoresService.php
View File

@@ -140,7 +140,22 @@ class ChoresService extends BaseService
public function GetCurrent() public function GetCurrent()
{ {
return $this->getDatabase()->chores_current(); $users = $this->getUsersService()->GetUsersAsDto();
$chores = $this->getDatabase()->chores_current();
foreach ($chores as $chore)
{
if (!empty($chore->next_execution_assigned_to_user_id))
{
$chore->next_execution_assigned_user = FindObjectInArrayByPropertyValue($users, 'id', $chore->next_execution_assigned_to_user_id);
}
else
{
$chore->next_execution_assigned_user = null;
}
}
return $chores;
} }
public function TrackChore(int $choreId, string $trackedTime, $doneBy = GROCY_USER_ID) public function TrackChore(int $choreId, string $trackedTime, $doneBy = GROCY_USER_ID)

27
services/TasksService.php
View File

@@ -6,7 +6,32 @@ class TasksService extends BaseService
{ {
public function GetCurrent(): \LessQL\Result public function GetCurrent(): \LessQL\Result
{ {
return $this->getDatabase()->tasks_current(); $users = $this->getUsersService()->GetUsersAsDto();
$categories = $this->getDatabase()->task_categories();
$tasks = $this->getDatabase()->tasks_current();
foreach ($tasks as $task)
{
if (!empty($task->assigned_to_user_id))
{
$task->assigned_to_user = FindObjectInArrayByPropertyValue($users, 'id', $task->assigned_to_user_id);
}
else
{
$task->assigned_to_user = null;
}
if (!empty($task->category_id))
{
$task->category = FindObjectInArrayByPropertyValue($categories, 'id', $task->category_id);
}
else
{
$task->category = null;
}
}
return $tasks;
} }
public function MarkTaskAsCompleted($taskId, $doneTime) public function MarkTaskAsCompleted($taskId, $doneTime)