From fce767b0ad681406857b2ad07b5c10231b66287b Mon Sep 17 00:00:00 2001
From: zebardy <mosesa02@mc-s091959.local>
Date: Sat, 23 Nov 2019 17:48:19 +0000
Subject: [PATCH] fix userservice

---
 controllers/StockController.php |  3 +--
 services/UsersService.php       | 18 +++++++++---------
 2 files changed, 10 insertions(+), 11 deletions(-)

diff --git a/controllers/StockController.php b/controllers/StockController.php
index 7deea999..ba1b0e19 100644
--- a/controllers/StockController.php
+++ b/controllers/StockController.php
@@ -3,7 +3,6 @@
 namespace Grocy\Controllers;
 
 use \Grocy\Services\StockService;
-use \Grocy\Services\UsersService;
 use \Grocy\Services\UserfieldsService;
 
 class StockController extends BaseController
@@ -31,7 +30,7 @@ class StockController extends BaseController
 
 	public function Overview(\Slim\Http\Request $request, \Slim\Http\Response $response, array $args)
 	{
-		$usersService = new UsersService();
+		$usersService = getUsersService();
 		$nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
 
 		return $this->renderPage($response, 'stockoverview', [
diff --git a/services/UsersService.php b/services/UsersService.php
index 2b431cbe..14810db0 100644
--- a/services/UsersService.php
+++ b/services/UsersService.php
@@ -6,7 +6,7 @@ class UsersService extends BaseService
 {
 	public function CreateUser(string $username, string $firstName, string $lastName, string $password)
 	{
-		$newUserRow = $this->Database->users()->createRow(array(
+		$newUserRow = $this->getDatabase()->users()->createRow(array(
 			'username' => $username,
 			'first_name' => $firstName,
 			'last_name' => $lastName,
@@ -22,7 +22,7 @@ class UsersService extends BaseService
 			throw new \Exception('User does not exist');
 		}
 
-		$user = $this->Database->users($userId);
+		$user = $this->getDatabase()->users($userId);
 		$user->update(array(
 			'username' => $username,
 			'first_name' => $firstName,
@@ -33,13 +33,13 @@ class UsersService extends BaseService
 
 	public function DeleteUser($userId)
 	{
-		$row = $this->Database->users($userId);
+		$row = $this->getDatabase()->users($userId);
 		$row->delete();
 	}
 
 	public function GetUsersAsDto()
 	{
-		$users = $this->Database->users();
+		$users = $this->getDatabase()->users();
 		$returnUsers = array();
 		foreach ($users as $user)
 		{
@@ -52,7 +52,7 @@ class UsersService extends BaseService
 
 	public function GetUserSetting($userId, $settingKey)
 	{
-		$settingRow = $this->Database->user_settings()->where('user_id = :1 AND key = :2', $userId, $settingKey)->fetch();
+		$settingRow = $this->getDatabase()->user_settings()->where('user_id = :1 AND key = :2', $userId, $settingKey)->fetch();
 		if ($settingRow !== null)
 		{
 			return $settingRow->value;
@@ -67,7 +67,7 @@ class UsersService extends BaseService
 	{
 		$settings = array();
 
-		$settingRows = $this->Database->user_settings()->where('user_id = :1', $userId)->fetchAll();
+		$settingRows = $this->getDatabase()->user_settings()->where('user_id = :1', $userId)->fetchAll();
 		foreach ($settingRows as $settingRow)
 		{
 			$settings[$settingRow->key] = $settingRow->value;
@@ -80,7 +80,7 @@ class UsersService extends BaseService
 
 	public function SetUserSetting($userId, $settingKey, $settingValue)
 	{
-		$settingRow = $this->Database->user_settings()->where('user_id = :1 AND key = :2', $userId, $settingKey)->fetch();
+		$settingRow = $this->getDatabase()->user_settings()->where('user_id = :1 AND key = :2', $userId, $settingKey)->fetch();
 		if ($settingRow !== null)
 		{
 			$settingRow->update(array(
@@ -90,7 +90,7 @@ class UsersService extends BaseService
 		}
 		else
 		{
-			$settingRow = $this->Database->user_settings()->createRow(array(
+			$settingRow = $this->getDatabase()->user_settings()->createRow(array(
 				'user_id' => $userId,
 				'key' => $settingKey,
 				'value' => $settingValue
@@ -101,7 +101,7 @@ class UsersService extends BaseService
 
 	private function UserExists($userId)
 	{
-		$userRow = $this->Database->users()->where('id = :1', $userId)->fetch();
+		$userRow = $this->getDatabase()->users()->where('id = :1', $userId)->fetch();
 		return $userRow !== null;
 	}
 }