Re-correction
continuous-integration/drone/push Build is passing Details

issue_a
Paul LEVRAULT 1 year ago
parent 1739f38ce4
commit ace879472c

@ -136,21 +136,21 @@ function addFriend(DataManager $model){
$nom = trim(fgets(STDIN));
$userList = searchUsersByName($name);
$i=1;
for $u in $userList{
echo "$i->getNom()." ".$i->getPrenom." : ".$i++\n"
foreach($u as $userList){
echo $u->getNom()." ".$u->getPrenom()." : ".$i++."<br>";
}
echo "\nEntrez le numéro de la personne que vous voulez ajouter ou 0 pour annuler"
echo "\nEntrez le numéro de la personne que vous voulez ajouter ou 0 pour annuler";
$choice = trim(fgets(STDIN));
switch ($choice){
case '0':
echo "Ajout d'ami annulé"
echo "Ajout d'ami annulé";
break;
default :
$user = $userList[$choice-1];
echo "Ajout de ".$user->getPrenom." ".$user->getNom."\n";
echo "Ajout de ".$user->getPrenom()." ".$user->getNom()."\n";
if ($model->userMgr->addFriend()){
sleep(2)
sleep(2);
echo "Notification envoyée\n";
}
else echo "Problème a l'envoi de la notification, veuillez vérifier votre connexion ou réessayer plus tard\n";
@ -161,13 +161,13 @@ function addFriend(DataManager $model){
function deleteFriend(DataManager $model, int $userId){
$model->userMgr->deleteFriend($userId);
echo "Ami supprimé\n"
echo "Ami supprimé\n";
}
function answerAdd(DataManager $model, User $user){
echo "Vous avez une demande d'ami de ".$user->getPrenom." ".$user->getNom."\n"
echo "Vous avez une demande d'ami de ".$user->getPrenom." ".$user->getNom."\n";
while ($answer!='o' || $answer!='n'){
echo "Voulez vous accepter (o) ou refuser (n)\n"
echo "Voulez vous accepter (o) ou refuser (n)\n";
$answer = trim(fgets(STDIN));
if($answer=='o'){
answer($model->userMgr, $user, "accept");
@ -177,7 +177,7 @@ function answerAdd(DataManager $model, User $user){
answer($model->userMgr, $user, "refuse");
echo "Demande refusée";
}
else echo "Réponse incorrect, veuiilez réessayer\n"
else echo "Réponse incorrect, veuillez réessayer\n";
}
}

@ -10,22 +10,33 @@ use Model\Role;
* Represents a user in the system
*/
class User{
private int $id;
private string $nom;
private string $prenom;
private string $email;
private string $motDePasse;
private string $sexe;
private float $taille;
private float $poids;
private \DateTime $dateNaissance;
private Role $role;
/**
* @var array List of friends associated with the user
*/
private array $friendsList;
public function __construct(
private int $id,
private string $nom,
private string $prenom,
private string $email,
private string $motDePasse,
private string $sexe,
private float $taille,
private float $poids,
private \DateTime $dateNaissance,
private Role $role,
int $id,
string $nom,
string $prenom,
string $email,
string $motDePasse,
string $sexe,
float $taille,
float $poids,
\DateTime $dateNaissance,
Role $role
) {
$this->friends = array();
}

@ -19,7 +19,7 @@ class UserManager
private User $currentUser;
private UserRepository $userRepo
private UserRepository $userRepo;
public function __construct(IAuthService $authService,IFriendRequestService $friendService)
{
@ -38,12 +38,14 @@ class UserManager
}
public function addFriends($newFriendId) {
foreach($u in $this->userRepo->getItems()){
$list=$this->userRepo->getItems();
foreach($u as $list){
if($u->getId()==$newFriendId){
throw new \Exception("User non existing");
}
}
foreach($u in $this->currentUser->getFriendsList()){
$list=$this->currentUser->getFriendsList();
foreach($u as $list){
if($newFriendId==$u->getId()){
throw new \Exception("Already friend");
}
@ -102,7 +104,8 @@ class UserManager
}
public function searchUsersByName(string $name) : array{
$list=array();
foreach($u in $this->currentUser->getFriendsList()){
$friendsList=$this->currentUser->getFriendsList();
foreach($u as $friendsList){
if(strcasecmp($name,$u->getNom())==0 || strcasecmp($name,$u->getPrenom())==0){
array_push($list, $u);
}
@ -110,10 +113,11 @@ class UserManager
return $list;
}
public function deleteFriend(int $id){
foreach($u in $this->currentUser->getFriendsList()){
$list=$this->currentUser->getFriendsList();
foreach($u as $list){
if($id==$u->getId()){
unset($u);
return true;
if($this->currentUser->delFriendsById($id)==1) return true;
else return false;
}
}
return false;

Loading…
Cancel
Save