itube-specs 0.0.731 → 0.0.733

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "itube-specs",
   "type": "module",
-  "version": "0.0.731",
+  "version": "0.0.733",
   "main": "./nuxt.config.ts",
   "types": "./types/index.d.ts",
   "scripts": {

package/runtime/utils/cleaners/__tests__/clean-model-card.test.ts

@@ -9,9 +9,9 @@ const makeRaw = (overrides = {}) => ({
   guid: 'model-1',
   parameters: [
     { name: 'birthplace_country', values: [{ title: 'USA', name: 'usa' }] },
+    { name: 'guy_type', values: [{ title: 'Twink' }] },
+    { name: 'ethnicity', values: [{ title: 'Asian' }] },
     { name: 'age', values: [{ title: '25' }] },
-    { name: 'height_cm', values: [{ title: '170' }] },
-    { name: 'weight_kg', values: [{ title: '55' }] },
   ],
   ...overrides,
 });
@@ -26,12 +26,12 @@ describe('cleanModelCard', () => {
     expect(result.country).toEqual({ title: 'USA', name: 'usa' });
   });
 
-  it('параметры: age, height, weight', () => {
+  it('параметры: guy_type, ethnicity, age', () => {
     const result = cleanModelCard(makeRaw() as any);
     expect(result.parameters).toEqual([
+      { title: 'guy_type', value: 'Twink' },
+      { title: 'ethnicity', value: 'Asian' },
       { title: 'age', value: '25' },
-      { title: 'height_cm', value: '170' },
-      { title: 'weight_kg', value: '55' },
     ]);
   });
 
@@ -39,12 +39,29 @@ describe('cleanModelCard', () => {
     const raw = makeRaw({
       parameters: [
         { name: 'birthplace_country', values: [{ title: 'USA', name: 'usa' }] },
-        { name: 'height_cm', values: [{ title: '170' }] },
+        { name: 'guy_type', values: [{ title: 'Twink' }] },
+        { name: 'ethnicity', values: [{ title: 'Asian' }] },
       ],
     });
     const result = cleanModelCard(raw as any);
     expect(result.parameters).toEqual([
-      { title: 'height_cm', value: '170' },
+      { title: 'guy_type', value: 'Twink' },
+      { title: 'ethnicity', value: 'Asian' },
+    ]);
+  });
+
+  it('параметр с пустым values отбрасывается', () => {
+    const raw = makeRaw({
+      parameters: [
+        { name: 'guy_type', values: [] },
+        { name: 'ethnicity', values: [{ title: 'Asian' }] },
+        { name: 'age', values: [{ title: '25' }] },
+      ],
+    });
+    const result = cleanModelCard(raw as any);
+    expect(result.parameters).toEqual([
+      { title: 'ethnicity', value: 'Asian' },
+      { title: 'age', value: '25' },
     ]);
   });
 
@@ -54,4 +71,4 @@ describe('cleanModelCard', () => {
     expect(result.country).toEqual({ title: '', name: '' });
     expect(result.parameters).toEqual([]);
   });
-});
+});

package/runtime/utils/cleaners/clean-model-card.ts

@@ -1,7 +1,7 @@
 import type { IRawModelCard, IModelCard, IModelParameter } from '../../../types';
 import { ThumbSize } from '../../enums/thumb-size';
 
-const parameterNames = ['height_cm', 'weight_kg'];
+const parameterNames = ['guy_type', 'ethnicity'];
 const age = (card: IRawModelCard) => card.parameters.find(item => item.name === 'age')?.values[0].title;
 
 /** Нормализует сырую карточку модели к типу IModelCard, включая параметры (возраст, рост, вес) и страну. */
@@ -16,13 +16,13 @@ export const cleanModelCard = (card: IRawModelCard): IModelCard => ({
         name: card.parameters?.find(item => item.name === 'birthplace_country')?.values[0].name || '',
     },
     parameters: [
-        ...(age(card) ? [{
-            title: 'age',
-            value: age(card),
-        }] : []),
         ...card.parameters.filter(item => parameterNames.includes(item.name) && item.values?.length).map((item: IModelParameter) => ({
             title: item.name,
             value: item.values?.[0]?.title,
         })),
+        ...(age(card) ? [{
+            title: 'age',
+            value: age(card),
+        }] : []),
     ],
 });