MAPG-243 replace and adapt to soko-web

This commit is contained in:
bence committed 2023-04-07 21:10:14 +02:00
1 parent 0bfebec8ca
commit c565fc2b65
40 files changed
+146 -129

No files matched your search

+4 -4
View File
@@ -1,11 +1,11 @@
<?php namespace MapGuesser\Repository;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Challenge;
use MapGuesser\PersistentData\Model\Place;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class ChallengeRepository
{
@@ -25,7 +25,7 @@ class ChallengeRepository
{
$select = new Select(\Container::$dbConnection);
$select->where('token', '=', $token);
return $this->pdm->selectFromDb($select, Challenge::class);
}
@@ -72,4 +72,4 @@ class ChallengeRepository
yield from $this->pdm->selectMultipleFromDb($select, Challenge::class);
}
}
}
+3 -4
View File
@@ -1,14 +1,13 @@
<?php namespace MapGuesser\Repository;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Challenge;
use MapGuesser\PersistentData\Model\Guess;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\Model\UserInChallenge;
use MapGuesser\PersistentData\Model\Place;
use MapGuesser\PersistentData\Model\PlaceInChallenge;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class GuessRepository
{
@@ -79,7 +78,7 @@ class GuessRepository
$necessaryRelations = [PlaceInChallenge::class];
$withRelations = array_unique(array_merge($withRelations, $necessaryRelations));
}
$select = new Select(\Container::$dbConnection);
$select->where('challenge_id', '=', $challenge->getId());
$select->where('round', '=', $round);
+2 -2
View File
@@ -1,10 +1,10 @@
<?php namespace MapGuesser\Repository;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Challenge;
use MapGuesser\PersistentData\Model\Map;
use MapGuesser\PersistentData\Model\Place;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class MapRepository
{
+2 -2
View File
@@ -2,9 +2,9 @@
use DateTime;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\MultiRoom;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class MultiRoomRepository
{
@@ -1,12 +1,11 @@
<?php namespace MapGuesser\Repository;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Challenge;
use MapGuesser\PersistentData\Model\Map;
use MapGuesser\PersistentData\Model\Place;
use MapGuesser\PersistentData\Model\PlaceInChallenge;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class PlaceInChallengeRepository
{
+4 -4
View File
@@ -1,11 +1,11 @@
<?php namespace MapGuesser\Repository;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Challenge;
use MapGuesser\PersistentData\Model\Map;
use MapGuesser\PersistentData\Model\Place;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class PlaceRepository
{
@@ -41,7 +41,7 @@ class PlaceRepository
}
$oldPlaces = $this->getRandomOldNForMapWithValidPano($mapId, $n - count($unvisitedPlaces), $userId);
return array_merge($unvisitedPlaces, $oldPlaces);
}
}
@@ -198,5 +198,5 @@ class PlaceRepository
yield from $this->pdm->selectMultipleFromDb($select, Place::class);
}
}
@@ -1,9 +1,9 @@
<?php namespace MapGuesser\Repository;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\Model\UserConfirmation;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class UserConfirmationRepository
{
+2 -2
View File
@@ -1,11 +1,11 @@
<?php namespace MapGuesser\Repository;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Challenge;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\Model\UserInChallenge;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class UserInChallengeRepository
{
@@ -2,10 +2,10 @@
use DateTime;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\Model\UserPasswordResetter;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class UserPasswordResetterRepository
{
+2 -3
View File
@@ -1,12 +1,11 @@
<?php namespace MapGuesser\Repository;
use DateTime;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\Model\Place;
use MapGuesser\PersistentData\Model\UserPlayedPlace;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class UserPlayedPlaceRepository
{
+4 -3
View File
@@ -2,12 +2,13 @@
use DateTime;
use Generator;
use MapGuesser\Database\Query\Select;
use SokoWeb\Interfaces\Repository\IUserRepository;
use SokoWeb\Database\Query\Select;
use MapGuesser\PersistentData\Model\Guess;
use MapGuesser\PersistentData\Model\User;
use MapGuesser\PersistentData\PersistentDataManager;
use SokoWeb\PersistentData\PersistentDataManager;
class UserRepository
class UserRepository implements IUserRepository
{
private PersistentDataManager $pdm;