github-mirror/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2026-04-08 21:46:16 +02:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix userservice

Browse Source
This commit is contained in:
zebardy 2019-11-23 17:48:19 +00:00
parent a4c9239214
commit fce767b0ad
2 changed files with 10 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
controllers/StockController.php
View File

@ -3,7 +3,6 @@
namespace Grocy\Controllers; namespace Grocy\Controllers;
use \Grocy\Services\StockService; use \Grocy\Services\StockService;
use \Grocy\Services\UsersService;
use \Grocy\Services\UserfieldsService; use \Grocy\Services\UserfieldsService;
class StockController extends BaseController 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) 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']; $nextXDays = $usersService->GetUserSettings(GROCY_USER_ID)['stock_expring_soon_days'];
return $this->renderPage($response, 'stockoverview', [ return $this->renderPage($response, 'stockoverview', [

18
services/UsersService.php
View File

@ -6,7 +6,7 @@ class UsersService extends BaseService
{ {
public function CreateUser(string $username, string $firstName, string $lastName, string $password) 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, 'username' => $username,
'first_name' => $firstName, 'first_name' => $firstName,
'last_name' => $lastName, 'last_name' => $lastName,
@ -22,7 +22,7 @@ class UsersService extends BaseService
throw new \Exception('User does not exist'); throw new \Exception('User does not exist');
} }
$user = $this->Database->users($userId); $user = $this->getDatabase()->users($userId);
$user->update(array( $user->update(array(
'username' => $username, 'username' => $username,
'first_name' => $firstName, 'first_name' => $firstName,
@ -33,13 +33,13 @@ class UsersService extends BaseService
public function DeleteUser($userId) public function DeleteUser($userId)
{ {
$row = $this->Database->users($userId); $row = $this->getDatabase()->users($userId);
$row->delete(); $row->delete();
} }
public function GetUsersAsDto() public function GetUsersAsDto()
{ {
$users = $this->Database->users(); $users = $this->getDatabase()->users();
$returnUsers = array(); $returnUsers = array();
foreach ($users as $user) foreach ($users as $user)
{ {
@ -52,7 +52,7 @@ class UsersService extends BaseService
public function GetUserSetting($userId, $settingKey) 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) if ($settingRow !== null)
{ {
return $settingRow->value; return $settingRow->value;
@ -67,7 +67,7 @@ class UsersService extends BaseService
{ {
$settings = array(); $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) foreach ($settingRows as $settingRow)
{ {
$settings[$settingRow->key] = $settingRow->value; $settings[$settingRow->key] = $settingRow->value;
@ -80,7 +80,7 @@ class UsersService extends BaseService
public function SetUserSetting($userId, $settingKey, $settingValue) 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) if ($settingRow !== null)
{ {
$settingRow->update(array( $settingRow->update(array(
@ -90,7 +90,7 @@ class UsersService extends BaseService
} }
else else
{ {
$settingRow = $this->Database->user_settings()->createRow(array( $settingRow = $this->getDatabase()->user_settings()->createRow(array(
'user_id' => $userId, 'user_id' => $userId,
'key' => $settingKey, 'key' => $settingKey,
'value' => $settingValue 'value' => $settingValue
@ -101,7 +101,7 @@ class UsersService extends BaseService
private function UserExists($userId) 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; return $userRow !== null;
} }
} }