esoko/mapguesser
esoko/mapguesser
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 18 Wiki Activity

feature/update-soko-web-to-0.7 #62

Merged
bence merged 2 commits from feature/update-soko-web-to-0.7 into develop 2023-04-30 21:07:08 +02:00
Conversation 0 Commits 2 Files Changed 6 +15 -15
6 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
composer.json
View File

@ -10,7 +10,7 @@
} }
], ],
"require": { "require": {
"esoko/soko-web": "0.6.1", "esoko/soko-web": "0.7",
"fzaninotto/faker": "^1.9" "fzaninotto/faker": "^1.9"
}, },
"require-dev": { "require-dev": {

8
composer.lock generated
View File

@ -4,15 +4,15 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies", "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically" "This file is @generated automatically"
], ],
"content-hash": "8b291ef6518a20a7cdd71ac2c19763d8", "content-hash": "cadf44c9030f1d63cb602a2ddb77db7e",
"packages": [ "packages": [
{ {
"name": "esoko/soko-web", "name": "esoko/soko-web",
"version": "0.6.1", "version": "v0.7",
"source": { "source": {
"type": "git", "type": "git",
"url": "https://git.esoko.eu/esoko/soko-web.git", "url": "https://git.esoko.eu/esoko/soko-web.git",
"reference": "445774e59a4891b2e67d151b0cf7b7b880c40e48" "reference": "88a2a99527b51dfb240ec78ac7070dc36a1022b6"
}, },
"require": { "require": {
"phpmailer/phpmailer": "^6.8", "phpmailer/phpmailer": "^6.8",
@ -33,7 +33,7 @@
"GNU GPL 3.0" "GNU GPL 3.0"
], ],
"description": "Lightweight web framework", "description": "Lightweight web framework",
"time": "2023-04-19T22:24:31+00:00" "time": "2023-04-30T18:20:27+00:00"
}, },
{ {
"name": "fzaninotto/faker", "name": "fzaninotto/faker",

10
src/Controller/GameFlowController.php
View File

@ -138,7 +138,7 @@ class GameFlowController implements IAuthenticationRequired
// if the last round was played ($currentPlace == null) or history is explicitly requested (for initializing) // if the last round was played ($currentPlace == null) or history is explicitly requested (for initializing)
if (!isset($currentPlace) || $withHistory) { if (!isset($currentPlace) || $withHistory) {
$withRelations = [User::class, PlaceInChallenge::class, Place::class]; $withRelations = ['user', 'place_in_challange', 'place'];
foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) { foreach ($this->guessRepository->getAllInChallenge($challenge, $withRelations) as $guess) {
$round = $guess->getPlaceInChallenge()->getRound(); $round = $guess->getPlaceInChallenge()->getRound();
@ -187,7 +187,7 @@ class GameFlowController implements IAuthenticationRequired
$prevRound = $currentRound - 1; $prevRound = $currentRound - 1;
if ($prevRound >= 0) { if ($prevRound >= 0) {
foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, [User::class]) as $guess) { foreach ($this->guessRepository->getAllInChallengeByRound($prevRound, $challenge, ['user']) as $guess) {
if ($guess->getUser()->getId() != $userId) { if ($guess->getUser()->getId() != $userId) {
$response['allResults'][] = [ $response['allResults'][] = [
'userName' => $guess->getUser()->getDisplayName(), 'userName' => $guess->getUser()->getDisplayName(),
@ -216,7 +216,7 @@ class GameFlowController implements IAuthenticationRequired
$session = \Container::$request->session(); $session = \Container::$request->session();
$userId = $session->get('userId'); $userId = $session->get('userId');
$challengeToken_str = \Container::$request->query('challengeToken'); $challengeToken_str = \Container::$request->query('challengeToken');
$userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]); $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
if (!isset($userInChallenge)) { if (!isset($userInChallenge)) {
return new JsonContent(['error' => 'game_not_found']); return new JsonContent(['error' => 'game_not_found']);
@ -337,7 +337,7 @@ class GameFlowController implements IAuthenticationRequired
$session = \Container::$request->session(); $session = \Container::$request->session();
$userId = $session->get('userId'); $userId = $session->get('userId');
$challengeToken_str = \Container::$request->query('challengeToken'); $challengeToken_str = \Container::$request->query('challengeToken');
$userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, [Challenge::class]); $userInChallenge = $this->userInChallengeRepository->getByUserIdAndToken($userId, $challengeToken_str, ['challenge']);
if (!isset($userInChallenge)) { if (!isset($userInChallenge)) {
return new JsonContent(['error' => 'game_not_found']); return new JsonContent(['error' => 'game_not_found']);
@ -345,7 +345,7 @@ class GameFlowController implements IAuthenticationRequired
$challenge = $userInChallenge->getChallenge(); $challenge = $userInChallenge->getChallenge();
$currentRound = $userInChallenge->getCurrentRound(); $currentRound = $userInChallenge->getCurrentRound();
$currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, [Place::class, Map::class]); $currentPlaceInChallenge = $this->placeInChallengeRepository->getByRoundInChallenge($currentRound, $challenge, ['place', 'map']);
$currentPlace = $currentPlaceInChallenge->getPlace(); $currentPlace = $currentPlaceInChallenge->getPlace();
$map = $currentPlace->getMap(); $map = $currentPlace->getMap();

2
src/Controller/MapAdminController.php
View File

@ -218,7 +218,7 @@ class MapAdminController implements IAuthenticationRequired, ISecured
\Container::$persistentDataManager->deleteFromDb($userInChallenge); \Container::$persistentDataManager->deleteFromDb($userInChallenge);
} }
foreach ($this->guessRepository->getAllInChallenge($challenge, [PlaceInChallenge::class]) as $guess) { foreach ($this->guessRepository->getAllInChallenge($challenge, ['place_in_challange']) as $guess) {
\Container::$persistentDataManager->deleteFromDb($guess); \Container::$persistentDataManager->deleteFromDb($guess);
} }

4
src/Repository/GuessRepository.php
View File

@ -53,7 +53,7 @@ class GuessRepository
public function getAllInChallenge(Challenge $challenge, array $withRelations = []): Generator public function getAllInChallenge(Challenge $challenge, array $withRelations = []): Generator
{ {
if (count($withRelations)) { if (count($withRelations)) {
$necessaryRelations = [PlaceInChallenge::class]; $necessaryRelations = ['place_in_challenge'];
$withRelations = array_unique(array_merge($withRelations, $necessaryRelations)); $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
} }
@ -67,7 +67,7 @@ class GuessRepository
public function getAllInChallengeByRound(int $round, Challenge $challenge, array $withRelations = []): Generator public function getAllInChallengeByRound(int $round, Challenge $challenge, array $withRelations = []): Generator
{ {
if (count($withRelations)) { if (count($withRelations)) {
$necessaryRelations = [PlaceInChallenge::class]; $necessaryRelations = ['place_in_challenge'];
$withRelations = array_unique(array_merge($withRelations, $necessaryRelations)); $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
} }

4
src/Repository/UserInChallengeRepository.php
View File

@ -29,7 +29,7 @@ class UserInChallengeRepository
$select = new Select(\Container::$dbConnection); $select = new Select(\Container::$dbConnection);
$select->where('challenge_id', '=', $challenge->getId()); $select->where('challenge_id', '=', $challenge->getId());
yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class, true, [User::class]); yield from \Container::$persistentDataManager->selectMultipleFromDb($select, UserInChallenge::class, true, ['user']);
} }
public function getByUserIdAndChallenge(int $userId, Challenge $challenge): ?UserInChallenge public function getByUserIdAndChallenge(int $userId, Challenge $challenge): ?UserInChallenge
@ -44,7 +44,7 @@ class UserInChallengeRepository
public function getByUserIdAndToken(int $userId, string $token_str, array $withRelations = []): ?UserInChallenge public function getByUserIdAndToken(int $userId, string $token_str, array $withRelations = []): ?UserInChallenge
{ {
if (count($withRelations)) { if (count($withRelations)) {
$necessaryRelations = [Challenge::class]; $necessaryRelations = ['challange'];
$withRelations = array_unique(array_merge($withRelations, $necessaryRelations)); $withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
} }