Изменена логика объявления параметров запроса на фасадную

composer.json

@@ -32,7 +32,8 @@
             "aliases": {
                 "VkApi": "Hopex\\VkSdk\\Facades\\VkApi",
                 "Format": "Hopex\\VkSdk\\Facades\\Format",
-                "SdkConfig": "Hopex\\VkSdk\\Facades\\SdkConfig"
+                "SdkConfig": "Hopex\\VkSdk\\Facades\\SdkConfig",
+                "RequestFields": "Hopex\\VkSdk\\Facades\\RequestFields"
             }
         }
     },

src/Facades/RequestFields.php

@@ -0,0 +1,20 @@
+<?php
+
+namespace Hopex\VkSdk\Facades;
+
+use Illuminate\Support\Facades\Facade;
+
+/**
+ * Class RequestFields
+ * @package Hopex\VkSdk\Facades
+ */
+class RequestFields extends Facade
+{
+    /**
+     * @return string
+     */
+    protected static function getFacadeAccessor(): string
+    {
+        return \Hopex\VkSdk\Foundation\Core\Models\RequestFields::class;
+    }
+}

src/Foundation/Core/Models/Database/Database.php

@@ -64,11 +64,11 @@ public function getCitiesById(CityRequestFields $cityRequestFields): Collection
 
     /**
      * @param int $cityId
-     * @return ChairField
+     * @return CityField
      * @throws ApiException
      * @throws Throwable
      */
-    public function getCityById(int $cityId): ChairField
+    public function getCityById(int $cityId): CityField
     {
         return $this->getCitiesById((new CityRequestFields())->setCityIds([$cityId]))->first();
     }

src/Foundation/Core/Models/Messages/MessageFields.php

@@ -58,15 +58,16 @@ public function getDate(): Carbon
      * @throws ApiException
      * @throws Throwable
      */
-    public function getSender(string $token, array $userProfileFields = []): UserProfileFields
+    public function getSender(string $token, UserRequestFields $userRequestFields): UserProfileFields
     {
-        return new UserProfileFields(collect(VkApi::user($token)
-            ->get((new UserRequestFields())
-                ->setUserIds([
-                    $this->message->get(self::FROM_ID)
-                ])
-                ->setProfileFields($userProfileFields)
-            )->first()));
+        return new UserProfileFields([]);
+//        return new UserProfileFields(collect(VkApi::user($token)
+//            ->get((new UserRequestFields())
+//                ->setUserIds([
+//                    $this->getSenderId()
+//                ])
+//                ->setProfileFields($userRequestFields->)
+//            )->first()));
     }
 
     /**

src/Foundation/Core/Models/RequestFields.php

@@ -0,0 +1,119 @@
+<?php
+
+namespace Hopex\VkSdk\Foundation\Core\Models;
+
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\Chair\ChairRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\City\CityRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\Country\CountryRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\Faculty\FacultyRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\Metro\MetroStationRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\Region\RegionRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\School\SchoolClasses\SchoolClassRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\School\SchoolRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\University\UniversityRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Groups\GroupRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Messages\MessageRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\Users\UserRequestFields;
+
+/**
+ * Class RequestFields
+ * @package Hopex\VkSdk\Foundation\Core\Models
+ */
+class RequestFields
+{
+    /**
+     * @return GroupRequestFields
+     */
+    public function group(): GroupRequestFields
+    {
+        return new GroupRequestFields();
+    }
+
+    /**
+     * @return MessageRequestFields
+     */
+    public function message(): MessageRequestFields
+    {
+        return new MessageRequestFields();
+    }
+
+    /**
+     * @return UserRequestFields
+     */
+    public function user(): UserRequestFields
+    {
+        return new UserRequestFields();
+    }
+
+    /**
+     * @return UniversityRequestFields
+     */
+    public function university(): UniversityRequestFields
+    {
+        return new UniversityRequestFields();
+    }
+
+    /**
+     * @return SchoolRequestFields
+     */
+    public function school(): SchoolRequestFields
+    {
+        return new SchoolRequestFields();
+    }
+
+    /**
+     * @return SchoolClassRequestFields
+     */
+    public function schoolClass(): SchoolClassRequestFields
+    {
+        return new SchoolClassRequestFields();
+    }
+
+    /**
+     * @return RegionRequestFields
+     */
+    public function region(): RegionRequestFields
+    {
+        return new RegionRequestFields();
+    }
+
+    /**
+     * @return MetroStationRequestFields
+     */
+    public function metroStation(): MetroStationRequestFields
+    {
+        return new MetroStationRequestFields();
+    }
+
+    /**
+     * @return FacultyRequestFields
+     */
+    public function faculty(): FacultyRequestFields
+    {
+        return new FacultyRequestFields();
+    }
+
+    /**
+     * @return CountryRequestFields
+     */
+    public function country(): CountryRequestFields
+    {
+        return new CountryRequestFields();
+    }
+
+    /**
+     * @return CityRequestFields
+     */
+    public function city(): CityRequestFields
+    {
+        return new CityRequestFields();
+    }
+
+    /**
+     * @return ChairRequestFields
+     */
+    public function chair(): ChairRequestFields
+    {
+        return new ChairRequestFields();
+    }
+}

src/Foundation/Core/Models/Users/UserNameCases.php → src/Foundation/Core/Models/Users/Enums/UserNameCases.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace Hopex\VkSdk\Foundation\Core\Models\Users;
+namespace Hopex\VkSdk\Foundation\Core\Models\Users\Enums;
 
 /**
  * Class UserNameCases
- * @package Hopex\VkSdk\Foundation\Core\Models\Users
- * @see https://dev.vk.com/method/users.get
+ * @package Hopex\VkSdk\Foundation\Core\Models\Users\Enums
  */
 class UserNameCases
 {

src/Foundation/Core/Models/Users/UserReportTypes.php → src/Foundation/Core/Models/Users/Enums/UserReportTypes.php

@@ -1,11 +1,10 @@
 <?php
 
-namespace Hopex\VkSdk\Foundation\Core\Models\Users;
+namespace Hopex\VkSdk\Foundation\Core\Models\Users\Enums;
 
 /**
  * Class UserReportTypes
- * @package Hopex\VkSdk\Foundation\Core\Models\Users
- * @see https://dev.vk.com/method/users.report
+ * @package Hopex\VkSdk\Foundation\Core\Models\Users\Enums
  */
 class UserReportTypes
 {

src/Foundation/Core/Models/Users/UserProfileFields.php

@@ -4,8 +4,9 @@
 
 use Carbon\Carbon;
 use Hopex\VkSdk\Exceptions\Api\ApiException;
-use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\CityField;
-use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\CountryField;
+use Hopex\VkSdk\Facades\VkApi;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\City\CityField;
+use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\Country\CountryField;
 use Hopex\VkSdk\Foundation\Core\Models\Users\ProfileFields\CareerField;
 use Hopex\VkSdk\Foundation\Core\Models\Users\ProfileFields\EducationField;
 use Hopex\VkSdk\Foundation\Core\Models\Users\ProfileFields\LastSeenField;
@@ -91,23 +92,15 @@ class UserProfileFields
     /**
      * @var Collection
      */
-    public Collection $user;
+    private Collection $user;
 
     /**
      * UserFields constructor.
-     * @param Collection $user
+     * @param Collection|array $user
      */
-    public function __construct(Collection $user)
+    public function __construct(Collection|array $user)
     {
-        $this->user = $user;
-    }
-
-    /**
-     * @return Collection
-     */
-    public function getUser(): Collection
-    {
-        return $this->user;
+        $this->user = $user instanceof Collection ? $user : collect($user);
     }
 
     /**
@@ -276,14 +269,14 @@ public function getCareer(): Collection
     }
 
     /**
-     * @param string|null $token
+     * @param string $userOrServiceToken
      * @return CityField
      * @throws ApiException
      * @throws Throwable
      */
-    public function getCity(string $token = null): CityField
+    public function getCity(string $userOrServiceToken): CityField
     {
-        return new CityField($this->user->get(UserProfileFields::CITY), $token);
+        return VkApi::database($userOrServiceToken)->getCityById($this->getCityId());
     }
 
     /**
@@ -295,14 +288,14 @@ public function getCityId(): int
     }
 
     /**
-     * @param string|null $token
+     * @param string $userOrServiceToken
      * @return CountryField
      * @throws ApiException
      * @throws Throwable
      */
-    public function getCountry(string $token = null): CountryField
+    public function getCountry(string $userOrServiceToken): CountryField
     {
-        return new CountryField($this->user->get(UserProfileFields::COUNTRY), $token);
+        return VkApi::database($userOrServiceToken)->getCountryById($this->getCountryId());
     }
 
     /**

src/Providers/ServiceProvider.php

@@ -5,6 +5,7 @@
 use Hopex\VkSdk\Contracts\HasRequestFieldsContract;
 use Hopex\VkSdk\Foundation\Core\Api\Client;
 use Hopex\VkSdk\Foundation\Core\Models\Database\Fields\School\SchoolRequestFields;
+use Hopex\VkSdk\Foundation\Core\Models\RequestFields;
 use Hopex\VkSdk\Foundation\Format;
 use Hopex\VkSdk\Foundation\SdkConfig;
 use Hopex\VkSdk\Services\CallbackEventService;
@@ -24,6 +25,7 @@ public function register(): void
         $this->app->bind('sdkconfig', SdkConfig::class);
         $this->app->bind('format', Format::class);
         $this->app->bind('vkapi', Client::class);
+        $this->app->bind('requestfields', RequestFields::class);
     }
 
     /**