Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feature/team with a mate #294

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
133 changes: 133 additions & 0 deletions cncnet-api/app/Http/Controllers/AccountController.php
Original file line number Diff line number Diff line change
Expand Up @@ -420,4 +420,137 @@ public function updateUserSettings(Request $request)
$request->session()->flash("success", 'User settings updated!');
return redirect()->back();
}

public function sendPlayerInvitation(Request $request)
{
$invitedPlayer = \App\Models\Player::where('ladder_id', $request->ladder_id)->where('username', $request->invite_player_name)->first();

$author =\App\Models\Player::where('ladder_id', $request->ladder_id)->where('id', $request->author_player_id)->first();

// can't find author
if ($author == null)
{
$request->session()->flash("error", "Error fetching player not found!");
return redirect()->back();
}

// can't find invited player
if ($invitedPlayer == null)
{
$request->session()->flash("error", "Player $request->invite_player_name not found!");
return redirect()->back();
}

// both players belong to same user
if ($author->user->id == $invitedPlayer->user->id)
{
$request->session()->flash("error", "You cannot add one of your own players as a teammate");
return redirect()->back();
}

// invited player already has a teammate
if ($invitedPlayer->preferredTeamMate() != null)
{
$invitedUsername = $invitedPlayer->username;
$request->session()->flash("error", "$invitedUsername already has a teammate!");
return redirect()->back();
}

// create invitation
$playerInvitation = new \App\Models\PlayerInvitation();
$playerInvitation->invited_player_id = $invitedPlayer->id;
$playerInvitation->author_player_id = $request->author_player_id;
$playerInvitation->status = 'pending';
$playerInvitation->save();

$request->session()->flash("success", "Player $request->invite_player_name invited!");
return redirect()->back();
}

public function processInvitation(Request $request)
{
$playerInvitation = \App\Models\PlayerInvitation::where('id', $request->id)->first();

// can't find invitation
if ($playerInvitation == null)
{
$request->session()->flash("error", "Invite not found!");
return redirect()->back();
}

// accept the invitation
if ($request->action == 'accept') # this code is processed by the 'invited' player clicking 'accept'.
{

// invited player already has a teammate
if ($playerInvitation->invitedPlayer->preferredTeamMate() != null)
{
$invitedUsername = $playerInvitation->invitedPlayer->username;
$request->session()->flash("error", "Your user $invitedUsername already has a teammate!");
return redirect()->back();
}

// author already has a teammate
if ($playerInvitation->author->preferredTeamMate() != null)
{
$authorUsername = $playerInvitation->author->username;
$request->session()->flash("error", "$authorUsername already has a teammate!");
return redirect()->back();
}

$invitedPlayer = $playerInvitation->invitedPlayer;
$invitedPlayer->preferred_teammate_id = $playerInvitation->author->id;
$invitedPlayer->save();

$authorPlayer = $playerInvitation->author;
$authorPlayer->preferred_teammate_id = $playerInvitation->invitedPlayer->id;
$authorPlayer->save();

$playerInvitation->status = 'accepted';
$playerInvitation->save();

// cancel other pending invites from author
foreach (\App\Models\PlayerInvitation::where('author_player_id', $authorPlayer->id)->where('status', 'pending')->get() as $pendingInvite)
{
$pendingInvite->status = 'canceled';
$pendingInvite->save();
}

// cancel other pending invites from invited
foreach (\App\Models\PlayerInvitation::where('author_player_id', $invitedPlayer->id)->where('status', 'pending')->get() as $pendingInvite)
{
$pendingInvite->status = 'canceled';
$pendingInvite->save();
}

$request->session()->flash("success", "$authorPlayer->username is now your teammate!");
return redirect()->back();
}

// reject the invitation
else if ($request->action == 'reject')
{
$playerInvitation->delete();
$request->session()->flash("success", "Invitation rejected!");
return redirect()->back();
}

// should not reach this code
$request->session()->flash("success", "Unexpected error");
return redirect()->back();
}

public function removeTeammate(Request $request)
{
$player = \App\Models\Player::where('id', $request->player_id)->first();
$player->preferred_teammate_id = 0;
$player->save();

$teammate = \App\Models\Player::where('id', $request->teammate_player_id)->first();
$teammate->preferred_teammate_id = 0;
$teammate->save();

$request->session()->flash("success", "$teammate->username removed!");
return redirect()->back();
}
}
16 changes: 16 additions & 0 deletions cncnet-api/app/Models/Player.php
Original file line number Diff line number Diff line change
Expand Up @@ -291,6 +291,22 @@ public function alerts()
return $this->hasMany(PlayerAlert::class)->where('expires_at', '>', Carbon::now());
}

public function preferredTeamMate()
{
return Player::where('id', $this->preferred_teammate_id)->first();
}

# Invites received from other players
public function invitesReceived()
{
return $this->hasMany(PlayerInvitation::class, 'invited_player_id');
}

# Invites sent to other players
public function invitesSent()
{
return $this->hasMany(PlayerInvitation::class, 'author_player_id');
}

# Relationships

Expand Down
20 changes: 20 additions & 0 deletions cncnet-api/app/Models/PlayerInvitation.php
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php

namespace App\Models;

use Illuminate\Database\Eloquent\Model;

class PlayerInvitation extends Model
{
# player who sent the invitation
public function author()
{
return $this->belongsTo(Player::class, 'author_player_id');
}

# player who was invited
public function invitedPlayer()
{
return $this->belongsTo(Player::class, 'invited_player_id');
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::table('players', function (Blueprint $table)
{
if (!Schema::hasColumn('players', 'preferred_teammate_id'))
{
$table->unsignedInteger('preferred_teammate_id');
}
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{

}
};
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
<?php

use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;

return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
Schema::dropIfExists('player_invitations');
Schema::create('player_invitations', function (Blueprint $table)
{
$table->id();
$table->unsignedInteger('author_player_id');
$table->unsignedInteger('invited_player_id');
$table->enum('status', ['accepted', 'pending', 'declined', 'canceled']);
$table->timestamps();

$table->foreign('author_player_id')->references('id')->on('players')->onDelete('cascade');
$table->foreign('invited_player_id')->references('id')->on('players')->onDelete('cascade');
});
}

/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};
Loading