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

Fix larastan on level 2 #547

Open
wants to merge 10 commits into
base: main
Choose a base branch
from
4 changes: 3 additions & 1 deletion src/backend/app/Console/Commands/AddMeterAddress.php
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,9 @@ public function runInCompanyScope(): void {
]
);
$address->owner()->associate($meter);
$address->geo()->associate($meter->geo()->first());
if ($meter->geo()->exists()) {
$address->geo()->create($meter->geo()->first()->toArray());
}
$address->save();
}
}
Expand Down
5 changes: 3 additions & 2 deletions src/backend/app/Console/Commands/AssetRateChecker.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Console\Commands;

use App\Models\AssetRate;
use App\Models\SmsApplianceRemindRate;
use App\Models\User;
use App\Services\MainSettingsService;
use App\Services\SmsApplianceRemindRateService;
Expand Down Expand Up @@ -35,7 +36,7 @@ public function handle(): void {

private function remindUpComingRates(): void {
$smsApplianceRemindRates = $this->getApplianceRemindRates();
$smsApplianceRemindRates->each(function ($smsApplianceRemindRate) {
$smsApplianceRemindRates->each(function (SmsApplianceRemindRate $smsApplianceRemindRate) {
$dueAssetRates = $this->assetRate::with([
'assetPerson.asset.smsReminderRate',
'assetPerson.person.addresses',
Expand All @@ -59,7 +60,7 @@ function ($q) {

private function findOverDueRates(): void {
$smsApplianceRemindRates = $this->getApplianceRemindRates();
$smsApplianceRemindRates->each(function ($smsApplianceRemindRate) {
$smsApplianceRemindRates->each(function (SmsApplianceRemindRate $smsApplianceRemindRate) {
$overDueRates = $this->assetRate::with(['assetPerson.asset', 'assetPerson.person.addresses'])
->whereBetween('due_date', [
now()->toDateString(),
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Console\Commands;

use App\Services\ApplianceRateService;
use Carbon\CarbonImmutable;
use MPM\OutstandingDebts\OutstandingDebtsExportService;

class MailApplianceDebtsCommand extends AbstractSharedCommand {
Expand All @@ -11,7 +12,8 @@ class MailApplianceDebtsCommand extends AbstractSharedCommand {
protected $description = 'Send mail to customers with appliance debts';

public function handle(ApplianceRateService $applianceRateService, OutstandingDebtsExportService $outstandingDebtsExportService): void {
$applianceDebtHavingCustomerCount = $applianceRateService->queryOutstandingDebtsByApplianceRates()->count();
$toDate = CarbonImmutable::now();
$applianceDebtHavingCustomerCount = $applianceRateService->queryOutstandingDebtsByApplianceRates($toDate)->count();
// do not send mail if there is no customer with appliance debt
if ($applianceDebtHavingCustomerCount > 0) {
$outstandingDebtsExportService->sendApplianceDebtsAsEmail();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ public function store(CreateAgentAssignedApplianceRequest $request) {
/**
* List for Web interface.
*
* @param Agent $agent
* @param Agent $agentId
* @param Request $request
*
* @return ApiResource
Expand Down
19 changes: 15 additions & 4 deletions src/backend/app/Http/Controllers/AgentAuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,8 @@
use App\Services\AgentService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
use Tymon\JWTAuth\Facades\JWTAuth;
use Tymon\JWTAuth\JWTGuard;

/**
* @group Agent-Authenticator
Expand All @@ -22,6 +24,15 @@ public function __construct(private AgentService $agentService) {
$this->middleware('auth:agent_api', ['except' => ['login']]);
}

/**
* Get the JWT authentication guard.
*
* @return JWTGuard
*/
protected function guard(): JWTGuard {
return auth('agent_api');
}

/**
* Get JWT via given credentials.
*
Expand All @@ -33,11 +44,11 @@ public function __construct(private AgentService $agentService) {
public function login(Request $request) {
$credentials = $request->only(['email', 'password']);

if (!$token = auth('agent_api')->setTTL(525600)->attempt($credentials)) {
if (!$token = $this->guard()->setTTL(525600)->attempt($credentials)) {
return response()->json(['data' => ['message' => 'Unauthorized', 'status' => 401]], 401);
}

$agentId = auth('agent_api')->user()->id;
$agentId = $this->guard()->user()->id;
$agent = $this->agentService->getById($agentId);
$deviceId = $request->header('device-id');
$this->agentService->updateDevice($agent, $deviceId);
Expand Down Expand Up @@ -72,7 +83,7 @@ public function logout() {
* @return JsonResponse
*/
public function refresh() {
return $this->respondWithToken(auth('agent_api')->refresh());
return $this->respondWithToken($this->guard()->refresh());
}

/**
Expand All @@ -88,7 +99,7 @@ protected function respondWithToken($token) {
'access_token' => $token,
'token_type' => 'bearer',
'expires_in' => auth('agent_api')->factory()->getTTL() * 60,
'agent' => auth('agent_api')->user(),
'agent' => $this->guard()->user(),
]
);
}
Expand Down
6 changes: 4 additions & 2 deletions src/backend/app/Http/Controllers/AgentWebController.php
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,9 @@ public function store(CreateAgentRequest $request): ApiResource {
'fire_base_token' => '-',
'connection' => ' ', // TODO: solve this. //auth('api')->user()->company->database->database_name
];
$companyId = auth('api')->payload()->get('companyId');
/** @var \Tymon\JWTAuth\JWTGuard $guard */
$guard = auth('api');
$companyId = $guard->payload()->get('companyId');
$companyDatabase = CompanyDatabase::query()->where('company_id', $companyId)->firstOrFail();
$databaseProxyData = [
'email' => $request['email'],
Expand All @@ -74,7 +76,7 @@ public function update($agentId, Request $request): ApiResource {
$agent = $this->agentService->getById($agentId);
$agentData = $request->all();

return ApiResource::make($this->agentService->update($agent, $agentData, $this->personService));
return ApiResource::make($this->agentService->update($agent, $agentData));
}

public function destroy($agentId, Request $request): ApiResource {
Expand Down
7 changes: 3 additions & 4 deletions src/backend/app/Http/Controllers/AssetPersonController.php
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
use App\Http\Resources\ApiResource;
use App\Models\Asset;
use App\Models\AssetPerson;
use App\Models\AssetType;
use App\Models\Person\Person;
use App\Services\AddressesService;
use App\Services\AddressGeographicalInformationService;
Expand Down Expand Up @@ -40,9 +39,9 @@ public function __construct(
/**
* Store a newly created resource in storage.
*
* @param AssetType $assetType
* @param Person $person
* @param Request $request
* @param Asset $asset
* @param Person $person
* @param Request $request
*
* @return ApiResource
*/
Expand Down
9 changes: 3 additions & 6 deletions src/backend/app/Http/Controllers/AssetTypeController.php
Original file line number Diff line number Diff line change
Expand Up @@ -7,14 +7,11 @@
use App\Http\Resources\ApiResource;
use App\Models\AssetType;
use App\Services\ApplianceTypeService;
use Illuminate\Database\Eloquent\SoftDeletes;
use Illuminate\Http\Request;

class AssetTypeController extends Controller {
use SoftDeletes;

/**
* @var AssetType
* @var ApplianceTypeService
*/
private $applianceTypeService;

Expand All @@ -39,7 +36,7 @@ public function index(Request $request): ApiResource {
* @return ApiResource
*/
public function store(AssetTypeCreateRequest $request): ApiResource {
$appliance = $this->applianceTypeService->createApplianceType($request);
$appliance = $this->applianceTypeService->createApplianceType($request->validated());

return new ApiResource($appliance);
}
Expand All @@ -53,7 +50,7 @@ public function store(AssetTypeCreateRequest $request): ApiResource {
* @return ApiResource
*/
public function update(AssetTypeUpdateRequest $request, AssetType $assetType): ApiResource {
$appliance = $this->applianceTypeService->updateApplianceType($request, $assetType);
$appliance = $this->applianceTypeService->updateApplianceType($request->validated(), $assetType);

return new ApiResource($appliance);
}
Expand Down
3 changes: 2 additions & 1 deletion src/backend/app/Http/Controllers/AuthController.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
namespace App\Http\Controllers;

use Illuminate\Http\JsonResponse;
use Tymon\JWTAuth\Facades\JWTAuth;

/**
* @group Authenticator
Expand Down Expand Up @@ -78,7 +79,7 @@ protected function respondWithToken($token) {
[
'access_token' => $token,
'token_type' => 'bearer',
'expires_in' => auth('api')->factory()->getTTL() * 60,
'expires_in' => JWTAuth::factory()->getTTL() * 60,
'user' => auth('api')->user(),
]
);
Expand Down
100 changes: 0 additions & 100 deletions src/backend/app/Http/Controllers/DailyTransactions.php

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ public function index($miniGridId): ApiResource {
*
* @urlParam person required The ID of the person
*
* @param int $person
* @param int $personId
*
* @return ApiResource
*
Expand All @@ -71,7 +71,6 @@ public function show(int $personId): ApiResource {
* @bodyParam points string. Comma seperated latitude and longitude. Example 1,2
*
* @param Request $request
* @param Meter $meter
*/
public function update(Request $request): ApiResource {
$meters = $request->all();
Expand Down
6 changes: 3 additions & 3 deletions src/backend/app/Http/Controllers/MeterTariffController.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,6 @@

use App\Http\Requests\TariffCreateRequest;
use App\Http\Resources\ApiResource;
use App\Models\Meter\MeterTariff;
use App\Services\MeterTariffService;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\Request;
Expand Down Expand Up @@ -36,7 +35,8 @@ public function index(Request $request): ApiResource {
*
* @responseFile responses/tariffs/tariff.detail.json
*
* @param MeterTariff $tariff
* @param int $meterTariffId
* @param Request $request
*
* @return ApiResource
*/
Expand All @@ -54,7 +54,7 @@ public function show(Request $request, $meterTariffId): ApiResource {
*
* @param TariffCreateRequest $request
*
* @return ApiResource
* @return JsonResponse
*/
public function store(TariffCreateRequest $request): JsonResponse {
$meterTariffData = $request->only(['name', 'factor', 'currency', 'price', 'minimum_purchase_amount']);
Expand Down
4 changes: 2 additions & 2 deletions src/backend/app/Http/Controllers/MiniGridController.php
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ public function index(Request $request): ApiResource {
*
* @bodyParam id int required
*
* @param int $id
* @param int $miniGridId
* @param Request $request
*
* @return ApiResource
Expand Down Expand Up @@ -68,7 +68,7 @@ public function store(StoreMiniGridRequest $request): ApiResource {
*
* @bodyParam name string The name of the MiniGrid.
*
* @param MiniGrid $miniGrid
* @param int $miniGridId
* @param UpdateMiniGridRequest $request
*
* @return ApiResource
Expand Down
Loading
Loading