Add CartController, the selectCity method and its test.
continuous-integration/drone/push Build is failing
continuous-integration/drone/push Build is failing
This commit is contained in:
@@ -6,6 +6,13 @@ use App\Http\Requests\StoreCartRequest;
|
|||||||
use App\Http\Requests\UpdateCartRequest;
|
use App\Http\Requests\UpdateCartRequest;
|
||||||
use App\Http\Resources\API\v2\CartResource;
|
use App\Http\Resources\API\v2\CartResource;
|
||||||
use App\Models\Cart;
|
use App\Models\Cart;
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Models\City;
|
||||||
|
use Illuminate\Http\Request;
|
||||||
|
|
||||||
|
use App\Http\Controllers\Controller;
|
||||||
|
use App\Http\Controllers\API\v2\UserController;
|
||||||
|
use Illuminate\Auth\Events\Validated;
|
||||||
|
|
||||||
class CartController extends Controller
|
class CartController extends Controller
|
||||||
{
|
{
|
||||||
@@ -17,6 +24,51 @@ class CartController extends Controller
|
|||||||
//
|
//
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public function selectCity(Request $request) {
|
||||||
|
$matrix_username = $request->input('matrix_username') ?? '';
|
||||||
|
$city_name = $request->input('city_name') ?? '';
|
||||||
|
|
||||||
|
// check for not valid user
|
||||||
|
$validation = User::validate_with_matrix_username($matrix_username);
|
||||||
|
if(array_key_exists('error', $validation))
|
||||||
|
return response()->json($validation);
|
||||||
|
|
||||||
|
// check for not valid city
|
||||||
|
$validation = City::validate_with_name($city_name);
|
||||||
|
if(array_key_exists('error', $validation))
|
||||||
|
return response()->json($validation);
|
||||||
|
|
||||||
|
// Get objects
|
||||||
|
$user = User::where('matrix_username', $matrix_username)->first();
|
||||||
|
$city = City::where('name', $city_name)->first();
|
||||||
|
|
||||||
|
$cart = Cart::firstOrCreate(
|
||||||
|
[
|
||||||
|
'user_id' => $user->id,
|
||||||
|
'status' => 'CART'
|
||||||
|
],
|
||||||
|
[
|
||||||
|
'city_id' => $city->id,
|
||||||
|
]
|
||||||
|
);
|
||||||
|
|
||||||
|
if($cart->city_id != $city->id) {
|
||||||
|
$cart->setCity($city);
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'ok' => 'City changed successfully',
|
||||||
|
'name' => $city->name,
|
||||||
|
'uuid' => $city->uuid,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
return response()->json([
|
||||||
|
'ok' => 'City selected successfully',
|
||||||
|
'name' => $city->name,
|
||||||
|
'uuid' => $city->uuid,
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the form for creating a new resource.
|
* Show the form for creating a new resource.
|
||||||
*/
|
*/
|
||||||
|
|||||||
@@ -32,20 +32,6 @@ class CityController extends Controller
|
|||||||
return new CityCollection(City::all());
|
return new CityCollection(City::all());
|
||||||
}
|
}
|
||||||
|
|
||||||
public function selectCity(Request $request)
|
|
||||||
{
|
|
||||||
$name = $request->input('name');
|
|
||||||
$uuid = $request->input('uuid');
|
|
||||||
|
|
||||||
// Process the received name and uuid as required
|
|
||||||
|
|
||||||
// Return a response
|
|
||||||
return response()->json([
|
|
||||||
'message' => 'City selected successfully',
|
|
||||||
'name' => $name,
|
|
||||||
'uuid' => $uuid,
|
|
||||||
]);
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Show the form for creating a new resource.
|
* Show the form for creating a new resource.
|
||||||
|
|||||||
@@ -0,0 +1,122 @@
|
|||||||
|
<?php
|
||||||
|
|
||||||
|
namespace Tests\Feature;
|
||||||
|
|
||||||
|
use Illuminate\Foundation\Testing\RefreshDatabase;
|
||||||
|
use Illuminate\Foundation\Testing\WithFaker;
|
||||||
|
use Tests\TestCase;
|
||||||
|
|
||||||
|
use App\Models\User;
|
||||||
|
use App\Models\City;
|
||||||
|
use App\Models\Cart;
|
||||||
|
|
||||||
|
class CartTest extends TestCase
|
||||||
|
{
|
||||||
|
protected $test_user_username = 'Test';
|
||||||
|
protected $test_city_name = 'testCity';
|
||||||
|
protected $test_city_name2 = 'testCity2';
|
||||||
|
|
||||||
|
protected $test_user;
|
||||||
|
protected $test_city;
|
||||||
|
|
||||||
|
public function test_get_data(): void
|
||||||
|
{
|
||||||
|
$this->test_user = User::where('username', $this->test_user_username)->first();
|
||||||
|
$this->test_city = City::where('name', $this->test_city_name)->first();
|
||||||
|
|
||||||
|
$this->assertNotNull($this->test_user);
|
||||||
|
$this->assertNotNull($this->test_city);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_select_city_first_time(): void
|
||||||
|
{
|
||||||
|
$this->test_user = User::where('username', $this->test_user_username)->first();
|
||||||
|
$this->test_city = City::where('name', $this->test_city_name)->first();
|
||||||
|
|
||||||
|
$this->assertNotNull($this->test_user);
|
||||||
|
$this->assertNotNull($this->test_city);
|
||||||
|
|
||||||
|
$response = $this->post('/api/v2/select-city', [
|
||||||
|
'matrix_username' => $this->test_user->matrix_username,
|
||||||
|
'city_name' => $this->test_city->name,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertStatus(200);
|
||||||
|
|
||||||
|
$response->assertJson([
|
||||||
|
'ok' => 'City selected successfully',
|
||||||
|
'name' => $this->test_city->name,
|
||||||
|
'uuid' => $this->test_city->uuid,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertDatabaseHas('carts', [
|
||||||
|
'city_id' => $this->test_city->id,
|
||||||
|
'user_id' => $this->test_user->id,
|
||||||
|
'status' => 'CART',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_select_another_city_time(): void
|
||||||
|
{
|
||||||
|
$this->test_user = User::where('username', $this->test_user_username)->first();
|
||||||
|
$this->test_city = City::where('name', $this->test_city_name2)->first();
|
||||||
|
|
||||||
|
$this->assertNotNull($this->test_user);
|
||||||
|
$this->assertNotNull($this->test_city);
|
||||||
|
|
||||||
|
$response = $this->post('/api/v2/select-city', [
|
||||||
|
'matrix_username' => $this->test_user->matrix_username,
|
||||||
|
'city_name' => $this->test_city->name,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertStatus(200);
|
||||||
|
|
||||||
|
$response->assertJson([
|
||||||
|
'ok' => 'City changed successfully',
|
||||||
|
'name' => $this->test_city->name,
|
||||||
|
'uuid' => $this->test_city->uuid,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$this->assertDatabaseHas('carts', [
|
||||||
|
'city_id' => $this->test_city->id,
|
||||||
|
'user_id' => $this->test_user->id,
|
||||||
|
'status' => 'CART',
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_select_city_with_no_city(): void
|
||||||
|
{
|
||||||
|
$this->test_city = City::where('name', $this->test_city_name2)->first();
|
||||||
|
|
||||||
|
$this->assertNotNull($this->test_city);
|
||||||
|
|
||||||
|
$response = $this->post('/api/v2/select-city', [
|
||||||
|
'matrix_username' => '',
|
||||||
|
'city_name' => $this->test_city->name,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertStatus(200);
|
||||||
|
|
||||||
|
$response->assertJson([
|
||||||
|
'error' => 'The username is empty, please, write username!!!'
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
|
||||||
|
public function test_select_city_with_no_user(): void
|
||||||
|
{
|
||||||
|
$this->test_city = City::where('name', $this->test_city_name2)->first();
|
||||||
|
|
||||||
|
$this->assertNotNull($this->test_city);
|
||||||
|
|
||||||
|
$response = $this->post('/api/v2/select-city', [
|
||||||
|
'matrix_username' => '',
|
||||||
|
'city_name' => $this->test_city->name,
|
||||||
|
]);
|
||||||
|
|
||||||
|
$response->assertStatus(200);
|
||||||
|
|
||||||
|
$response->assertJson([
|
||||||
|
'error' => 'The username is empty, please, write username!!!'
|
||||||
|
]);
|
||||||
|
}
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user