@smartico/public-api 0.0.288 → 0.0.290

package/docs/interfaces/TTournament.md

@@ -145,6 +145,9 @@ Info about current player in tournament
 | `avatar_url` | `string` | The URL to the avatar of the participant |
 | `position` | `number` | The position of the participant in the tournament |
 | `scores` | `number` | The scores of the participant in the tournament |
+| `user_ext_id` | `string` | The external user id of the participant |
+| `crm_brand_id` | `number` | The crm brand id of the participant |
+| `user_id` | `number` | The user id of the participant |
 
 ___
 

package/docs/interfaces/TTournamentDetailed.md

@@ -441,7 +441,7 @@ ___
 
 ### players
 
-• `Optional` **players**: \{ `public_username`: `string` ; `avatar_url`: `string` ; `position`: `number` ; `scores`: `number` ; `is_me`: `boolean`  }[]
+• `Optional` **players**: \{ `public_username`: `string` ; `avatar_url`: `string` ; `position`: `number` ; `scores`: `number` ; `is_me`: `boolean` ; `user_ext_id`: `string` ; `crm_brand_id`: `number` ; `user_id`: `number`  }[]
 
 The list of the tournament participants
 
@@ -461,6 +461,9 @@ The information about current user in the tournament if he is registered in the
 | `avatar_url` | `string` | The URL to the avatar of the current user |
 | `position` | `number` | The position of the current user in the tournament |
 | `scores` | `number` | The scores of the current user in the tournament |
+| `user_ext_id` | `string` | The external user id of the current user |
+| `crm_brand_id` | `number` | The crm brand id of the current user |
+| `user_id` | `number` | The user id of the current user |
 
 #### Overrides
 

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "@smartico/public-api",
-	"version": "0.0.288",
+	"version": "0.0.290",
 	"description": "Smartico public API",
 	"main": "dist/index.js",
 	"types": "dist/index.d.ts",

package/src/Quiz/ScoreResultTypes.ts

@@ -1,5 +1,5 @@
 type TeamType = 'Home' | 'Away';
-type CardType = 'Yellow' | 'Red';
+type CardType = 'Yellow' | 'Red' | 'YellowRed';
 type TimeType = 'FT' | '1st Half' | '2nd Half';
 
 export type OverHalfFullTimeScoreType = {

package/src/SmarticoAPI.ts

@@ -1034,27 +1034,32 @@ class SmarticoAPI {
 		const userInfo = await this.getUserGamificationInfo(user_ext_id);
 		if (!levels || levels.length === 0) return null;
 
-		const userPoints = userInfo.points_balance;
+		const sortedLevels = [...levels].sort((a, b) => a.required_points - b.required_points);
 
-		const sortedLevels = levels.sort((a, b) => a.required_points - b.required_points);
-
-		let currentLevelIndex = sortedLevels.findIndex((level, index) => {
-			const nextLevel = sortedLevels[index + 1];
-			return userPoints >= level.required_points && (!nextLevel || userPoints < nextLevel.required_points);
-		});
+		let currentLevelIndex = sortedLevels.findIndex((level) => level.id === userInfo.current_level);
 
 		if (currentLevelIndex === -1) {
-			currentLevelIndex = sortedLevels.length - 1;
+			const userPointsEver = userInfo.points_ever ?? 0;
+			currentLevelIndex = sortedLevels.findIndex((level, index) => {
+				const nextLevel = sortedLevels[index + 1];
+				return userPointsEver >= level.required_points && (!nextLevel || userPointsEver < nextLevel.required_points);
+			});
+			if (currentLevelIndex === -1) {
+				currentLevelIndex = sortedLevels.length - 1;
+			}
 		}
 
 		const currentLevel = sortedLevels[currentLevelIndex];
 		const nextLevel = sortedLevels[currentLevelIndex + 1];
-		const progress = nextLevel ? ((userPoints - currentLevel.required_points) / (nextLevel.required_points - currentLevel.required_points)) * 100 : 100;
+		const userPointsEver = userInfo.points_ever ?? 0;
+		const progress = nextLevel
+			? ((userPointsEver - currentLevel.required_points) / (nextLevel.required_points - currentLevel.required_points)) * 100
+			: 100;
 
 		return {
 			...currentLevel,
 			ordinal_position: currentLevelIndex + 1,
-			progress: Math.min(Math.max(progress, 0), 100)
+			progress: Math.min(Math.max(progress, 0), 100),
 		};
 	}
 

package/src/Tournaments/TournamentPlayer.ts

@@ -1,5 +1,7 @@
 export interface TournamentPlayer {
 	userAltName: string;
+	cleanExtUserId: string;
+	crmBrandId: number;
 	position: number;
 	scores: number;
 	isMe: boolean;

package/src/Tournaments/TournamentUtils.ts

@@ -96,6 +96,9 @@ export class TournamentUtils {
 				position: player.position,
 				scores: player.scores,
 				is_me: player.isMe,
+				user_ext_id: player.cleanExtUserId,
+				crm_brand_id: player.crmBrandId,
+				user_id: player.userId,
 			};
 
 			if (isMe) {

package/src/WSAPI/WSAPITypes.ts

@@ -331,6 +331,12 @@ export interface TTournament {
 		position: number;
 		/** The scores of the participant in the tournament */
 		scores: number;
+		/** The external user id of the participant */
+		user_ext_id: string;
+		/** The crm brand id of the participant */
+		crm_brand_id: number;
+		/** The user id of the participant */
+		user_id: number;
 	};
 	/** Prize structure */
 	prizes?: {
@@ -412,6 +418,12 @@ export interface TTournamentDetailed extends TTournament {
 		scores: number;
 		/** The indicator if the participant is current user */
 		is_me: boolean;
+		/** The external user id of the participant */
+		user_ext_id: string;
+		/** The crm brand id of the participant */
+		crm_brand_id: number;
+		/** The user id of the participant */
+		user_id: number;
 	}[];
 	/** The information about current user in the tournament if he is registered in the tournamnet */
 	me?: {
@@ -423,6 +435,12 @@ export interface TTournamentDetailed extends TTournament {
 		position: number;
 		/** The scores of the current user in the tournament */
 		scores: number;
+		/** The external user id of the current user */
+		user_ext_id: string;
+		/** The crm brand id of the current user */
+		crm_brand_id: number;
+		/** The user id of the current user */
+		user_id: number;
 	};
 
 	prizes?: {