fix: complete InvesteMoz validation and error corrections
This commit is contained in:
@@ -4,6 +4,7 @@ namespace App\Policies;
|
||||
|
||||
use App\Models\ExistingBusiness;
|
||||
use App\Models\User;
|
||||
use App\Services\ExistingBusinessProfileCategory;
|
||||
use App\Services\PortalProfileAccess;
|
||||
use Illuminate\Database\Eloquent\Builder;
|
||||
use Illuminate\Support\Facades\DB;
|
||||
@@ -87,11 +88,13 @@ class ExistingBusinessPolicy
|
||||
return $this->designatedAny($user);
|
||||
}
|
||||
|
||||
/** Filter before projecting or decrypting private fields in the review queue. */
|
||||
/** Filter before projecting or decrypting private fields in the review queue.
|
||||
* @param Builder<ExistingBusiness> $query
|
||||
*/
|
||||
public function scopeReviewQueue(Builder $query, User $user): void
|
||||
{
|
||||
if (app(PortalProfileAccess::class)->available()) {
|
||||
$query->whereIn('modality',array_keys(\App\Services\ExistingBusinessProfileCategory::MAP));
|
||||
$query->whereIn('modality', array_keys(ExistingBusinessProfileCategory::MAP));
|
||||
$ids = (clone $query)->get()->filter(fn (ExistingBusiness $business) => $this->view($user, $business))->modelKeys();
|
||||
$query->whereKey($ids);
|
||||
}
|
||||
@@ -119,13 +122,18 @@ class ExistingBusinessPolicy
|
||||
return false;
|
||||
}
|
||||
$access = app(PortalProfileAccess::class);
|
||||
if ($access->has($user, 'auditor')) { return false; }
|
||||
if ($access->has($user, 'auditor')) {
|
||||
return false;
|
||||
}
|
||||
if (! $access->available()) {
|
||||
return $access->legacyWriteAllowed($user) && (bool) $user->two_factor_confirmed_at && (bool) $user->two_factor_secret
|
||||
&& in_array(strtolower($user->email), config('existing-business.reviewers', []), true);
|
||||
}
|
||||
if ($business->modality !== 'company_sale') { return false; }
|
||||
if ($business->modality !== 'company_sale') {
|
||||
return false;
|
||||
}
|
||||
$responsibility = $dimension === 'regulation' ? 'legal_reviewer' : 'technical_reviewer';
|
||||
|
||||
return collect($access->grants($user, 'validator'))->contains(fn ($g) => $g->organization_id === null
|
||||
&& in_array('business_sale', json_decode($g->opportunity_types, true), true)
|
||||
&& in_array($responsibility, json_decode($g->responsibilities, true), true));
|
||||
@@ -137,6 +145,7 @@ class ExistingBusinessPolicy
|
||||
|| app(PortalProfileAccess::class)->has($user, 'auditor') || ! $this->designated($user, 'publishers', $business)) {
|
||||
return false;
|
||||
}
|
||||
|
||||
return ! DB::table('business_workflow_transitions')->where('existing_business_id', $business->id)
|
||||
->whereIn('to_status', ['approval_l2', 'approved'])->where('actor_id', $user->id)->exists();
|
||||
}
|
||||
@@ -156,8 +165,8 @@ class ExistingBusinessPolicy
|
||||
{
|
||||
$access = app(PortalProfileAccess::class);
|
||||
if ($access->available()) {
|
||||
$category=$business ? \App\Services\ExistingBusinessProfileCategory::category($business) : null;
|
||||
if (($business !== null && $category === null) || ! $access->mfa($user) || $access->has($user,'auditor')) {
|
||||
$category = $business ? ExistingBusinessProfileCategory::category($business) : null;
|
||||
if (($business !== null && $category === null) || ! $access->mfa($user) || $access->has($user, 'auditor')) {
|
||||
return false;
|
||||
}
|
||||
$role = $designation === 'publishers' ? 'publisher' : 'validator';
|
||||
@@ -168,7 +177,7 @@ class ExistingBusinessPolicy
|
||||
$organizationMatches = $grant->organization_id === null
|
||||
|| ($business !== null && $grant->organization_id === $business->organization_id);
|
||||
if ($organizationMatches
|
||||
&& ($category !== null ? in_array($category,json_decode($grant->opportunity_types,true,512,JSON_THROW_ON_ERROR),true) : array_intersect(array_values(\App\Services\ExistingBusinessProfileCategory::MAP),json_decode($grant->opportunity_types,true,512,JSON_THROW_ON_ERROR)) !== [])) {
|
||||
&& ($category !== null ? in_array($category, json_decode($grant->opportunity_types, true, 512, JSON_THROW_ON_ERROR), true) : array_intersect(array_values(ExistingBusinessProfileCategory::MAP), json_decode($grant->opportunity_types, true, 512, JSON_THROW_ON_ERROR)) !== [])) {
|
||||
return true;
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user