From 7d4a9602abb5f6dc64ba51c50eaef6c1eb13d106 Mon Sep 17 00:00:00 2001
From: Bernd Bestel <bernd@berrnd.de>
Date: Sat, 19 Nov 2022 19:33:50 +0100
Subject: [PATCH] Return the battery object in endpoint `/batteries` (closes
 #2045)

---
 changelog/70_UNRELEASED_xxxx.xx.xx.md | 55 +++++++++++++++++++++++++++
 services/BatteriesService.php         |  9 ++++-
 2 files changed, 63 insertions(+), 1 deletion(-)
 create mode 100644 changelog/70_UNRELEASED_xxxx.xx.xx.md

diff --git a/changelog/70_UNRELEASED_xxxx.xx.xx.md b/changelog/70_UNRELEASED_xxxx.xx.xx.md
new file mode 100644
index 00000000..72167914
--- /dev/null
+++ b/changelog/70_UNRELEASED_xxxx.xx.xx.md
@@ -0,0 +1,55 @@
+> ⚠️ xxxBREAKING CHANGESxxx
+
+> ❗ xxxImportant upgrade informationXXX
+
+### New feature: xxxx
+
+- xxx
+
+### Stock
+
+- xxx
+
+### Shopping list
+
+- xxx
+
+### Recipes
+
+- xxx
+
+### Meal plan
+
+- xxx
+
+### Chores
+
+- xxx
+
+### Calendar
+
+- xxx
+
+### Tasks
+
+- xxx
+
+### Batteries
+
+- xxx
+
+### Equipment
+
+- xxx
+
+### Userfields
+
+- xxx
+
+### General
+
+- xxx
+
+### API
+
+- The Endpoint `/batteries` now also returns the corresponding battery object (as field/property `battery`)
diff --git a/services/BatteriesService.php b/services/BatteriesService.php
index 3340ff95..8d925b9d 100644
--- a/services/BatteriesService.php
+++ b/services/BatteriesService.php
@@ -26,7 +26,14 @@ class BatteriesService extends BaseService
 
 	public function GetCurrent()
 	{
-		return $this->getDatabase()->batteries_current();
+		$batteries = $this->getDatabase()->batteries()->where('active = 1')->orderBy('name', 'COLLATE NOCASE');
+		$currentBatteries = $this->getDatabase()->batteries_current();
+		foreach ($currentBatteries as $currentBattery)
+		{
+			$currentBattery->battery = FindObjectInArrayByPropertyValue($batteries, 'id', $currentBattery->battery_id);
+		}
+
+		return $currentBatteries;
 	}
 
 	public function TrackChargeCycle(int $batteryId, string $trackedTime)