@infrab4a/connect 4.3.9-beta.11 → 4.3.9-beta.13

package/index.cjs.js

@@ -4114,9 +4114,7 @@ const withFindHasuraGraphQL = (MixinBase) => {
                 ...acc,
                 {
                     [AttributeOptionHelper.FindByAttribute(current, fields)
-                        .columnName]: orderBy[current] === 'asc'
-                        ? 'asc_nulls_last'
-                        : 'desc_nulls_last',
+                        .columnName]: orderBy[current],
                 },
             ], []);
             this.bindAggretageAttributes = (aggregates, fields) => {
@@ -5177,10 +5175,12 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         ], []);
     }
     async findCatalog(params, mainGender) {
-        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true, gender: mainGender, stock: {
-                    quantity: { operator: exports.Where.GT, value: 0 },
-                } }), orderBy: Object.assign({}, lodash.omit(params.orderBy, ['hasStock', 'intGender'])) }));
-        // se a busca retornar menos que 24, faz consulta pelos sem estoque ou gender diferente
+        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true }), orderBy: Object.assign(Object.assign({ hasStock: 'desc' }, (!mainGender ? {} : { intGender: mainGender === 'female' ? 'desc' : 'asc' })), lodash.omit(params.orderBy, ['hasStock', 'intGender'])) }));
+        // order by stock tbm maior menor
+        // sempre duas condições
+        // verificar se tem empate
+        // null tá aparecendo primeiro no melhor rating
+        // testear com desc null last e verificar empate
     }
     async updateCategories(productId, { categories }) {
         if ('action' in categories && categories.action === 'remove') {

package/index.esm.js

@@ -4090,9 +4090,7 @@ const withFindHasuraGraphQL = (MixinBase) => {
                 ...acc,
                 {
                     [AttributeOptionHelper.FindByAttribute(current, fields)
-                        .columnName]: orderBy[current] === 'asc'
-                        ? 'asc_nulls_last'
-                        : 'desc_nulls_last',
+                        .columnName]: orderBy[current],
                 },
             ], []);
             this.bindAggretageAttributes = (aggregates, fields) => {
@@ -5153,10 +5151,12 @@ class ProductHasuraGraphQLRepository extends withCrudHasuraGraphQL(withHasuraGra
         ], []);
     }
     async findCatalog(params, mainGender) {
-        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true, gender: mainGender, stock: {
-                    quantity: { operator: Where.GT, value: 0 },
-                } }), orderBy: Object.assign({}, omit(params.orderBy, ['hasStock', 'intGender'])) }));
-        // se a busca retornar menos que 24, faz consulta pelos sem estoque ou gender diferente
+        return this.find(Object.assign(Object.assign({}, params), { filters: Object.assign(Object.assign({}, params.filters), { published: true }), orderBy: Object.assign(Object.assign({ hasStock: 'desc' }, (!mainGender ? {} : { intGender: mainGender === 'female' ? 'desc' : 'asc' })), omit(params.orderBy, ['hasStock', 'intGender'])) }));
+        // order by stock tbm maior menor
+        // sempre duas condições
+        // verificar se tem empate
+        // null tá aparecendo primeiro no melhor rating
+        // testear com desc null last e verificar empate
     }
     async updateCategories(productId, { categories }) {
         if ('action' in categories && categories.action === 'remove') {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@infrab4a/connect",
-  "version": "4.3.9-beta.11",
+  "version": "4.3.9-beta.13",
   "publishConfig": {
     "registry": "https://registry.npmjs.org"
   },

package/src/domain/generic/repository/types/repository-order-by-list.type.d.ts

@@ -1,5 +1,5 @@
 import { NonFunctionAndIdentifierPropertyNames } from '../../model/types/non-function-property-name.type';
 export type RepositoryOrderBy<Model> = {
-    [key in NonFunctionAndIdentifierPropertyNames<Model>]?: 'asc' | 'desc';
+    [key in NonFunctionAndIdentifierPropertyNames<Model>]?: 'asc' | 'desc' | 'desc_nulls_last' | 'asc_nulls_last';
 };
 export type RepositoryOrderByList<Model> = RepositoryOrderBy<Model>[];