shuffled

mirzaev/parser_from_interneturok/system/models/interneturok.php

@@ -70,6 +70,17 @@ final class interneturok extends core
 	 */
 	public const string USER = 'https://api-gw.interneturok.ru/api/v2/homeschool/current_user';
 
+	/**
+	 * TARIFFS 
+	 *
+	 * Method: GET
+	 * Authrorization: Bearer
+	 *
+	 * @var const string TARIFFS The user tariffs API URL
+	 */
+	public const string TARIFFS = 'https://api-gw.interneturok.ru/api/v2/schedules/users/current/tariffs';
+
+
 	/**
 	 * SCHEDULES
 	 *
@@ -176,8 +187,7 @@ final class interneturok extends core
 		if (!empty($accounts)) {
 			// Initialized accounts
 
-			/* if (shuffle($accounts)) { */
+			if (shuffle($accounts)) {
-			if (true) {
 				// Shuffled accounts
 
 				foreach ($accounts as $account) {
@@ -473,10 +483,32 @@ final class interneturok extends core
 					// Initializing the user data
 					$user = json_decode((string) $response->getBody())?->data?->homeschool?->response?->user;
 
-					if ($user->grade + 1 === $grade) {
+					if (!empty($user)) {
-						// Matched the account grade with the grade
+						// Initialized the user data
 
-						// Initialiint the user identifier
+						// Initializing the request to the user data API
+						$request = new request(
+							'GET',
+							static::TARIFFS,
+							[
+								'Authorization' => "Bearer $this->token"
+							]
+						);
+
+						return $this->browser->sendAsync($request)
+							->then(function ($response) use ($grade, $week, $user) {
+								// Sended the request and received the response
+
+								// Initializing the tariffs data
+								$tariffs = json_decode((string) $response->getBody())?->data?->tariffs?->response;
+
+								foreach ($tariffs as $tariff) {
+									// Iterating over tariffs
+
+									if ($tariff->grade === $grade) {
+										// Matched the tariff grade with the target grade
+
+										// Initializing the user identifier
 										$identifier = $user?->id;
 
 										if (!empty($identifier)) {
@@ -591,8 +623,13 @@ final class interneturok extends core
 											// Exit (fail)
 											return false;
 										}
+									}
+								}
+								// Exit (fail)
+								return false;
+							});
 					} else {
-						// Not matched the account grade with the grade
+						// Not initialized the user data
 
 						// Exit (fail)
 						return false;