refactor: Replace specific Hosting and VPS models and repositories with a generic Service repository and associated customer API endpoints.
This commit is contained in:
@@ -17,6 +17,7 @@ use App\Repositories\Module\Domain\DomainRepositoryInterface;
|
||||
use App\Repositories\Module\Hosting\HostingRepositoryInterface as ModuleHostingRepositoryInterface;
|
||||
use App\Repositories\Module\Vmware\VmwareRepositoryInterface;
|
||||
use App\Repositories\Order\OrderRepositoryInterface;
|
||||
use App\Repositories\Service\ServiceRepositoryInterface;
|
||||
use App\Repositories\Transaction\TransactionRepositoryInterface;
|
||||
use Illuminate\Http\JsonResponse;
|
||||
use Illuminate\Http\Request;
|
||||
@@ -35,6 +36,7 @@ class CustomerController extends Controller
|
||||
private readonly OrderRepositoryInterface $orderRepository,
|
||||
private readonly TransactionRepositoryInterface $transactionRepository,
|
||||
private readonly DomainRepositoryInterface $moduleDomainRepository,
|
||||
private readonly ServiceRepositoryInterface $serviceRepository,
|
||||
) {}
|
||||
|
||||
public function index(Request $request): JsonResponse
|
||||
@@ -473,4 +475,39 @@ class CustomerController extends Controller
|
||||
'data' => $domains
|
||||
]);
|
||||
}
|
||||
|
||||
public function getServices(string $uuid, Request $request): JsonResponse
|
||||
{
|
||||
$services = $this->serviceRepository->filter(
|
||||
['customer_uuid' => $uuid],
|
||||
['product', 'orderItem', 'invoice']
|
||||
);
|
||||
|
||||
return response()->json([
|
||||
'error' => false,
|
||||
'data' => $services
|
||||
]);
|
||||
}
|
||||
|
||||
public function getOrders(string $uuid, Request $request): JsonResponse
|
||||
{
|
||||
$customer = $this->customerRepository->findBy('uuid', $uuid);
|
||||
|
||||
if (!$customer) {
|
||||
return response()->json([
|
||||
'error' => true,
|
||||
'message' => "Can't find customer by UUID #" . $uuid
|
||||
], 404);
|
||||
}
|
||||
|
||||
$orders = $this->orderRepository->filter(
|
||||
['client' => $customer->id],
|
||||
['customer', 'payment', 'invoice']
|
||||
);
|
||||
|
||||
return response()->json([
|
||||
'error' => false,
|
||||
'data' => $orders
|
||||
]);
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,40 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class Hosting extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'hosting';
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'price',
|
||||
'price_sale',
|
||||
'description',
|
||||
'template',
|
||||
'group_id',
|
||||
'type_id',
|
||||
'status',
|
||||
'disk',
|
||||
'ram',
|
||||
'bandwidth',
|
||||
'cpu',
|
||||
'gpu',
|
||||
'ip'
|
||||
];
|
||||
|
||||
public function type()
|
||||
{
|
||||
return $this->belongsTo(\App\Models\Type::class);
|
||||
}
|
||||
|
||||
public function group()
|
||||
{
|
||||
return $this->belongsTo(\App\Models\Group::class);
|
||||
}
|
||||
}
|
||||
@@ -1,55 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Models;
|
||||
|
||||
use Illuminate\Database\Eloquent\Factories\HasFactory;
|
||||
use Illuminate\Database\Eloquent\Model;
|
||||
|
||||
class VPS extends Model
|
||||
{
|
||||
use HasFactory;
|
||||
|
||||
protected $table = 'vps';
|
||||
|
||||
protected $fillable = [
|
||||
'name',
|
||||
'cpu',
|
||||
'ram',
|
||||
'disk',
|
||||
'gpu',
|
||||
'description',
|
||||
'bandwidth',
|
||||
'price',
|
||||
'price_sale',
|
||||
'module_host_id',
|
||||
'template_id',
|
||||
'type_id',
|
||||
'group_id',
|
||||
'status'
|
||||
];
|
||||
|
||||
public function type()
|
||||
{
|
||||
return $this->belongsTo(\App\Models\Type::class);
|
||||
}
|
||||
|
||||
public function host()
|
||||
{
|
||||
return $this->belongsTo(\App\Models\ModuleHost::class, 'module_host_id', 'id');
|
||||
}
|
||||
|
||||
public function group()
|
||||
{
|
||||
return $this->belongsTo(\App\Models\Group::class);
|
||||
}
|
||||
|
||||
/**
|
||||
* Many-to-many relationship với OS.
|
||||
*/
|
||||
public function operatingSystems()
|
||||
{
|
||||
return $this->belongsToMany(\App\Models\Os::class, 'product_os', 'product_id', 'os_id')
|
||||
->withTimestamps()
|
||||
->withPivot('product_type');
|
||||
}
|
||||
}
|
||||
@@ -68,6 +68,8 @@ use App\Repositories\TicketReply\TicketReplyCachedRepository;
|
||||
use App\Repositories\TicketReply\TicketReplyRepositoryInterface;
|
||||
use App\Repositories\Transaction\TransactionCachedRepository;
|
||||
use App\Repositories\Transaction\TransactionRepositoryInterface;
|
||||
use App\Repositories\Service\ServiceRepository;
|
||||
use App\Repositories\Service\ServiceRepositoryInterface;
|
||||
use Illuminate\Support\ServiceProvider;
|
||||
use App\Repositories\Module\Domain\DomainRepositoryInterface as ModuleDomainRepositoryInterface;
|
||||
use App\Repositories\Module\Domain\DomainCachedRepository as ModuleDomainCachedRepository;
|
||||
@@ -261,6 +263,11 @@ class RepositoryProvider extends ServiceProvider
|
||||
TransactionRepositoryInterface::class,
|
||||
TransactionCachedRepository::class
|
||||
);
|
||||
//Service
|
||||
$this->app->bind(
|
||||
ServiceRepositoryInterface::class,
|
||||
ServiceRepository::class
|
||||
);
|
||||
//Module Datacenter
|
||||
$this->app->bind(
|
||||
DatacenterRepositoryInterface::class,
|
||||
|
||||
@@ -1,45 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories\Hosting;
|
||||
|
||||
use App\Repositories\BaseCachedRepository;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
|
||||
class HostingCachedRepository extends BaseCachedRepository implements HostingRepositoryInterface
|
||||
{
|
||||
public function __construct(
|
||||
public HostingRepository $hostingRepository
|
||||
) {
|
||||
parent::__construct();
|
||||
}
|
||||
public function getModel()
|
||||
{
|
||||
return $this->hostingRepository->getModel();
|
||||
}
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
|
||||
{
|
||||
$cacheKey = $this->getCacheKey(md5(json_encode([
|
||||
'filterItem' => [
|
||||
'data' => $data,
|
||||
'relationships' => $relationships,
|
||||
'select' => $select,
|
||||
'withCount' => $withCount
|
||||
]
|
||||
])));
|
||||
return Cache::remember($cacheKey, $this->cacheTime, function () use ($data, $relationships, $select, $withCount) {
|
||||
return $this->hostingRepository->filter($data, $relationships, $withCount, $select);
|
||||
});
|
||||
}
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = [])
|
||||
{
|
||||
$cacheKey = $this->getCacheKey(md5(json_encode([
|
||||
'findWithRelationships' => [
|
||||
'id' => $id,
|
||||
'relationships' => $relationships
|
||||
]
|
||||
])));
|
||||
return Cache::remember($cacheKey, $this->cacheTime, function () use ($id, $relationships,$withCount,$withSum) {
|
||||
return $this->hostingRepository->findWithRelationships($id, $relationships,$withCount,$withSum);
|
||||
});
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories\Hosting;
|
||||
|
||||
use App\Repositories\BaseRepositoryInterface;
|
||||
|
||||
interface HostingRepositoryInterface extends BaseRepositoryInterface{
|
||||
public function filter(array $data = [],array $relationships = [],array $withCount = [],array $select = ['*']);
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = []);
|
||||
|
||||
}
|
||||
+25
-11
@@ -1,37 +1,53 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories\Hosting;
|
||||
namespace App\Repositories\Service;
|
||||
|
||||
use App\Models\Hosting;
|
||||
use App\Models\Customer;
|
||||
use App\Repositories\BaseRepository;
|
||||
use App\Models\Service;
|
||||
|
||||
class HostingRepository extends BaseRepository implements HostingRepositoryInterface
|
||||
class ServiceRepository extends BaseRepository implements ServiceRepositoryInterface
|
||||
{
|
||||
public function getModel()
|
||||
{
|
||||
return Hosting::class;
|
||||
return Service::class;
|
||||
}
|
||||
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
|
||||
{
|
||||
$model = $this->model->with($relationships)->select($select);
|
||||
|
||||
|
||||
if (isset($data['customer_uuid'])) {
|
||||
$customer = Customer::where('uuid', $data['customer_uuid'])->first();
|
||||
if ($customer) {
|
||||
$model = $model->where('customer_id', $customer->id);
|
||||
}
|
||||
} elseif (isset($data['customer_id'])) {
|
||||
$model = $model->where('customer_id', $data['customer_id']);
|
||||
}
|
||||
|
||||
if (isset($data['status'])) {
|
||||
$model = $model->where("status", $data['status']);
|
||||
$model = $model->where('status', $data['status']);
|
||||
}
|
||||
if (isset($data['group_id']) && $data['group_id']) {
|
||||
$model = $model->where("group_id", $data['group_id']);
|
||||
if (isset($data['product_id'])) {
|
||||
$model = $model->where('product_id', $data['product_id']);
|
||||
}
|
||||
|
||||
if (count($withCount) > 0) {
|
||||
$model = $model->withCount($withCount);
|
||||
}
|
||||
if(isset($data['page'])) {
|
||||
|
||||
if (isset($data['page'])) {
|
||||
return $model->paginate(15);
|
||||
}
|
||||
|
||||
return $model->get();
|
||||
}
|
||||
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [], array $withCount = [], array $withSum = [])
|
||||
{
|
||||
$model = $this->model;
|
||||
|
||||
if (count($relationships) > 0) {
|
||||
foreach ($relationships as $relationship) {
|
||||
if (method_exists($model, $relationship)) {
|
||||
@@ -40,7 +56,6 @@ class HostingRepository extends BaseRepository implements HostingRepositoryInter
|
||||
}
|
||||
}
|
||||
|
||||
// Xử lý withCount
|
||||
if (count($withCount) > 0) {
|
||||
foreach ($withCount as $key => $items) {
|
||||
if (is_array($items)) {
|
||||
@@ -57,7 +72,6 @@ class HostingRepository extends BaseRepository implements HostingRepositoryInter
|
||||
}
|
||||
}
|
||||
|
||||
// Xử lý withSum
|
||||
if (count($withSum) > 0) {
|
||||
foreach ($withSum as $key => $items) {
|
||||
if (is_array($items)) {
|
||||
@@ -0,0 +1,12 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories\Service;
|
||||
|
||||
use App\Repositories\BaseRepositoryInterface;
|
||||
|
||||
interface ServiceRepositoryInterface extends BaseRepositoryInterface
|
||||
{
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*']);
|
||||
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [], array $withCount = [], array $withSum = []);
|
||||
}
|
||||
@@ -1,57 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories\VPS;
|
||||
|
||||
use App\Repositories\BaseCachedRepository;
|
||||
use Illuminate\Support\Facades\Cache;
|
||||
|
||||
class VPSCachedRepository extends BaseCachedRepository implements VPSRepositoryInterface
|
||||
{
|
||||
public function __construct(
|
||||
public VPSRepository $vPSRepository
|
||||
) {
|
||||
parent::__construct();
|
||||
}
|
||||
public function getModel()
|
||||
{
|
||||
return $this->vPSRepository->getModel();
|
||||
}
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
|
||||
{
|
||||
$cacheKey = $this->getCacheKey(md5(json_encode([
|
||||
'filterItem' => [
|
||||
'data' => $data,
|
||||
'relationships' => $relationships,
|
||||
'select' => $select,
|
||||
'withCount' => $withCount
|
||||
]
|
||||
])));
|
||||
return Cache::remember($cacheKey, $this->cacheTime, function () use ($data, $relationships, $select, $withCount) {
|
||||
return $this->vPSRepository->filter($data, $relationships, $withCount, $select);
|
||||
});
|
||||
}
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = [])
|
||||
{
|
||||
$cacheKey = $this->getCacheKey(md5(json_encode([
|
||||
'findWithRelationships' => [
|
||||
'id' => $id,
|
||||
'relationships' => $relationships
|
||||
]
|
||||
])));
|
||||
return Cache::remember($cacheKey, $this->cacheTime, function () use ($id, $relationships,$withCount,$withSum) {
|
||||
return $this->vPSRepository->findWithRelationships($id, $relationships,$withCount,$withSum);
|
||||
});
|
||||
}
|
||||
|
||||
public function createWithOs(array $data, array $osIds = [])
|
||||
{
|
||||
$this->clearCache();
|
||||
return $this->vPSRepository->createWithOs($data, $osIds);
|
||||
}
|
||||
|
||||
public function updateWithOs(int $id, array $data, array $osIds = [])
|
||||
{
|
||||
$this->clearCache();
|
||||
return $this->vPSRepository->updateWithOs($id, $data, $osIds);
|
||||
}
|
||||
}
|
||||
@@ -1,117 +0,0 @@
|
||||
<?php
|
||||
|
||||
namespace App\Repositories\VPS;
|
||||
|
||||
use App\Models\VPS;
|
||||
use App\Repositories\BaseRepository;
|
||||
|
||||
class VPSRepository extends BaseRepository implements VPSRepositoryInterface
|
||||
{
|
||||
public function getModel()
|
||||
{
|
||||
return VPS::class;
|
||||
}
|
||||
public function filter(array $data = [], array $relationships = [], array $withCount = [], array $select = ['*'])
|
||||
{
|
||||
$model = $this->model->with($relationships)->select($select);
|
||||
|
||||
if (isset($data['status'])) {
|
||||
$model = $model->where("status", $data['status']);
|
||||
}
|
||||
if (isset($data['group_id']) && $data['group_id']) {
|
||||
$model = $model->where("group_id", $data['group_id']);
|
||||
}
|
||||
if (count($withCount) > 0) {
|
||||
$model = $model->withCount($withCount);
|
||||
}
|
||||
if(isset($data['page'])) {
|
||||
return $model->paginate(15);
|
||||
}
|
||||
return $model->get();
|
||||
}
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [], array $withCount = [], array $withSum = [])
|
||||
{
|
||||
$model = $this->model;
|
||||
if (count($relationships) > 0) {
|
||||
foreach ($relationships as $relationship) {
|
||||
if (method_exists($model, $relationship)) {
|
||||
$model = $model->with($relationship);
|
||||
}
|
||||
}
|
||||
}
|
||||
// Xử lý withCount
|
||||
if (count($withCount) > 0) {
|
||||
foreach ($withCount as $key => $items) {
|
||||
if (is_array($items)) {
|
||||
foreach ($items as $alias => $item) {
|
||||
$model = $model->withCount([
|
||||
$key . ' as ' . $alias => function ($query) use ($item) {
|
||||
$query->where($item['key'], $item['condition'], $item['value']);
|
||||
}
|
||||
]);
|
||||
}
|
||||
} else {
|
||||
$model = $model->withCount($key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// Xử lý withSum
|
||||
if (count($withSum) > 0) {
|
||||
foreach ($withSum as $key => $items) {
|
||||
if (is_array($items)) {
|
||||
foreach ($items as $alias => $item) {
|
||||
$model = $model->withSum([
|
||||
$key . ' as ' . $alias => function ($query) use ($item) {
|
||||
$query->where($item['key'], $item['condition'], $item['value']);
|
||||
}
|
||||
], $item['sum']);
|
||||
}
|
||||
} else {
|
||||
$model = $model->withSum($key);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
return $model->find($id);
|
||||
}
|
||||
|
||||
/**
|
||||
* Create VPS with OS relationship
|
||||
*/
|
||||
public function createWithOs(array $data, array $osIds = [])
|
||||
{
|
||||
$vps = $this->create($data);
|
||||
|
||||
if (!empty($osIds) && $vps) {
|
||||
$syncData = [];
|
||||
foreach ($osIds as $osId) {
|
||||
$syncData[$osId] = ['product_type' => 4]; // 4 = VPS type
|
||||
}
|
||||
$vps->operatingSystems()->sync($syncData);
|
||||
}
|
||||
|
||||
return $vps;
|
||||
}
|
||||
|
||||
/**
|
||||
* Update VPS with OS relationship
|
||||
*/
|
||||
public function updateWithOs(int $id, array $data, array $osIds = [])
|
||||
{
|
||||
$vps = $this->update($id, $data);
|
||||
|
||||
if ($vps) {
|
||||
$model = $this->find($id);
|
||||
if ($model) {
|
||||
$syncData = [];
|
||||
foreach ($osIds as $osId) {
|
||||
$syncData[$osId] = ['product_type' => 4]; // 4 = VPS type
|
||||
}
|
||||
$model->operatingSystems()->sync($syncData);
|
||||
}
|
||||
}
|
||||
|
||||
return $vps;
|
||||
}
|
||||
}
|
||||
@@ -1,11 +0,0 @@
|
||||
<?php
|
||||
namespace App\Repositories\VPS;
|
||||
|
||||
use App\Repositories\BaseRepositoryInterface;
|
||||
interface VPSRepositoryInterface extends BaseRepositoryInterface {
|
||||
public function filter(array $data = [],array $relationships = [],array $withCount = [],array $select = ['*']);
|
||||
public function findWithRelationships(int $id = 0, array $relationships = [],array $withCount = [], array $withSum = []);
|
||||
public function createWithOs(array $data, array $osIds = []);
|
||||
public function updateWithOs(int $id, array $data, array $osIds = []);
|
||||
|
||||
}
|
||||
@@ -82,6 +82,7 @@ Route::prefix('v1')
|
||||
Route::post('{uuid}/reset-password', [CustomerController::class, 'resetPassword'])->middleware('perm:customer.edit');
|
||||
Route::post('{uuid}/add-credit', [CustomerController::class, 'addCredit'])->middleware('perm:customer.edit');
|
||||
Route::get('{uuid}/services', [CustomerController::class, 'getServices'])->middleware('perm:customer.view');
|
||||
Route::get('{uuid}/orders', [CustomerController::class, 'getOrders'])->middleware('perm:customer.view');
|
||||
Route::get('{uuid}/invoices', [CustomerController::class, 'getInvoices'])->middleware('perm:customer.view');
|
||||
Route::get('{uuid}/transactions', [CustomerController::class, 'getTransactions'])->middleware('perm:customer.view');
|
||||
Route::get('{uuid}/domains', [CustomerController::class, 'getDomains'])->middleware('perm:customer.view');
|
||||
|
||||
Reference in New Issue
Block a user