@infrab4a/connect 1.0.0-beta.9 → 1.0.1-beta.0

package/bundles/infrab4a-connect.umd.js

@@ -1,14 +1,13 @@
 (function (global, factory) {
-    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('reflect-metadata'), require('class-transformer'), require('date-fns'), require('lodash'), require('ts-md5'), require('axios'), require('firebase'), require('firebase/app'), require('gql-query-builder'), require('node-fetch')) :
-    typeof define === 'function' && define.amd ? define('@infrab4a/connect', ['exports', 'reflect-metadata', 'class-transformer', 'date-fns', 'lodash', 'ts-md5', 'axios', 'firebase', 'firebase/app', 'gql-query-builder', 'node-fetch'], factory) :
-    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a.connect = {}), null, global["class-transformer"], global["date-fns"], global.lodash, global.tsMd5, global.axios, global.firebase, global.firebase$1, global["gql-query-builder"], global.fetch));
-})(this, (function (exports, reflectMetadata, classTransformer, dateFns, lodash, tsMd5, axios, firebase, firebase$1, gqlQueryBuilder, fetch) { 'use strict';
+    typeof exports === 'object' && typeof module !== 'undefined' ? factory(exports, require('reflect-metadata'), require('class-transformer'), require('date-fns'), require('lodash'), require('ts-custom-error'), require('ts-md5'), require('axios'), require('firebase'), require('gql-query-builder'), require('node-fetch')) :
+    typeof define === 'function' && define.amd ? define('@infrab4a/connect', ['exports', 'reflect-metadata', 'class-transformer', 'date-fns', 'lodash', 'ts-custom-error', 'ts-md5', 'axios', 'firebase', 'gql-query-builder', 'node-fetch'], factory) :
+    (global = typeof globalThis !== 'undefined' ? globalThis : global || self, factory((global.infrab4a = global.infrab4a || {}, global.infrab4a.connect = {}), null, global["class-transformer"], global["date-fns"], global.lodash, global["ts-custom-error"], global["ts-md5"], global.axios, global.firebase, global["gql-query-builder"], global["node-fetch"]));
+})(this, (function (exports, reflectMetadata, classTransformer, dateFns, lodash, tsCustomError, tsMd5, axios, firebase, gqlQueryBuilder, fetch) { 'use strict';
 
     function _interopDefaultLegacy (e) { return e && typeof e === 'object' && 'default' in e ? e : { 'default': e }; }
 
     var axios__default = /*#__PURE__*/_interopDefaultLegacy(axios);
     var firebase__default = /*#__PURE__*/_interopDefaultLegacy(firebase);
-    var firebase__default$1 = /*#__PURE__*/_interopDefaultLegacy(firebase$1);
     var fetch__default = /*#__PURE__*/_interopDefaultLegacy(fetch);
 
     var BaseModel = /** @class */ (function () {
@@ -35,13 +34,13 @@
             configurable: true
         });
         BaseModel.toInstance = function (data) {
-            return classTransformer.plainToClass(this, data || {});
+            return classTransformer.plainToInstance(this, data || {});
         };
         BaseModel.isModel = function (value) {
             return value instanceof this;
         };
         BaseModel.prototype.toPlain = function () {
-            return classTransformer.classToPlain(this);
+            return classTransformer.instanceToPlain(this);
         };
         return BaseModel;
     }());
@@ -1048,7 +1047,7 @@
             return _this;
         }
         return UnauthorizedError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     exports.SignInMethods = void 0;
     (function (SignInMethods) {
@@ -1107,7 +1106,7 @@
             return _this;
         }
         return UserAlreadyRegisteredError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     var WeakPasswordError = /** @class */ (function (_super) {
         __extends(WeakPasswordError, _super);
@@ -1118,7 +1117,7 @@
             return _this;
         }
         return WeakPasswordError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     var Register = /** @class */ (function () {
         function Register(registerService, userRepository) {
@@ -1204,13 +1203,6 @@
         return RecoveryPassword;
     }());
 
-    exports.Shops = void 0;
-    (function (Shops) {
-        Shops["MENSMARKET"] = "mensmarket";
-        Shops["GLAMSHOP"] = "Glamshop";
-        Shops["GLAMPOINTS"] = "Glampoints";
-    })(exports.Shops || (exports.Shops = {}));
-
     var Category = /** @class */ (function (_super) {
         __extends(Category, _super);
         function Category() {
@@ -1229,6 +1221,13 @@
         return Category;
     }(BaseModel));
 
+    exports.Shops = void 0;
+    (function (Shops) {
+        Shops["MENSMARKET"] = "mensmarket";
+        Shops["GLAMSHOP"] = "Glamshop";
+        Shops["GLAMPOINTS"] = "Glampoints";
+    })(exports.Shops || (exports.Shops = {}));
+
     var Product = /** @class */ (function (_super) {
         __extends(Product, _super);
         function Product() {
@@ -1250,6 +1249,33 @@
         });
         return Product;
     }(BaseModel));
+    __decorate([
+        classTransformer.Type(function () { return KitProduct; }),
+        __metadata("design:type", Array)
+    ], Product.prototype, "kitProducts", void 0);
+
+    var KitProduct = /** @class */ (function (_super) {
+        __extends(KitProduct, _super);
+        function KitProduct() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        Object.defineProperty(KitProduct, "identifiersFields", {
+            get: function () {
+                return ['productId', 'kitProducId'];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        return KitProduct;
+    }(BaseModel));
+    __decorate([
+        classTransformer.Type(function () { return Product; }),
+        __metadata("design:type", Product)
+    ], KitProduct.prototype, "kit", void 0);
+    __decorate([
+        classTransformer.Type(function () { return Product; }),
+        __metadata("design:type", Product)
+    ], KitProduct.prototype, "product", void 0);
 
     var Variant = /** @class */ (function (_super) {
         __extends(Variant, _super);
@@ -1586,7 +1612,7 @@
             return _this;
         }
         return InvalidArgumentError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     var RequiredArgumentError = /** @class */ (function (_super) {
         __extends(RequiredArgumentError, _super);
@@ -1597,7 +1623,7 @@
             return _this;
         }
         return RequiredArgumentError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     var NotFoundError = /** @class */ (function (_super) {
         __extends(NotFoundError, _super);
@@ -1607,7 +1633,7 @@
             return _this;
         }
         return NotFoundError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     var DuplicatedResultsError = /** @class */ (function (_super) {
         __extends(DuplicatedResultsError, _super);
@@ -1617,12 +1643,35 @@
             return _this;
         }
         return DuplicatedResultsError;
-    }(Error));
+    }(tsCustomError.CustomError));
 
     var AxiosAdapter = /** @class */ (function () {
         function AxiosAdapter(config) {
             this.config = config;
         }
+        AxiosAdapter.prototype.get = function (index) {
+            return __awaiter(this, void 0, void 0, function () {
+                var data, error_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _a.trys.push([0, 2, , 3]);
+                            return [4 /*yield*/, axios__default["default"]({
+                                    url: this.config.url + "/" + index,
+                                    method: 'GET',
+                                    headers: { Authorization: "Basic " + this.config.credential },
+                                })];
+                        case 1:
+                            data = (_a.sent()).data;
+                            return [2 /*return*/, data._source];
+                        case 2:
+                            error_1 = _a.sent();
+                            throw new NotFoundError(error_1.message);
+                        case 3: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         AxiosAdapter.prototype.query = function (index, query) {
             return __awaiter(this, void 0, void 0, function () {
                 var data;
@@ -1644,6 +1693,39 @@
                 });
             });
         };
+        AxiosAdapter.prototype.save = function (index, data) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, axios__default["default"]({
+                                url: this.config.url + "/" + index,
+                                method: 'PUT',
+                                headers: { Authorization: "Basic " + this.config.credential },
+                                data: data,
+                            })];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        AxiosAdapter.prototype.delete = function (index) {
+            return __awaiter(this, void 0, void 0, function () {
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, axios__default["default"]({
+                                url: this.config.url + "/" + index,
+                                method: 'DELETE',
+                                headers: { Authorization: "Basic " + this.config.credential },
+                            })];
+                        case 1:
+                            _a.sent();
+                            return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return AxiosAdapter;
     }());
 
@@ -1651,6 +1733,19 @@
         function ProductsIndex(adapter) {
             this.adapter = adapter;
         }
+        ProductsIndex.prototype.get = function (id) {
+            return __awaiter(this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0: return [4 /*yield*/, this.adapter.get("products/_doc/" + id)];
+                        case 1:
+                            data = _a.sent();
+                            return [2 /*return*/, Product.toInstance(data)];
+                    }
+                });
+            });
+        };
         ProductsIndex.prototype.findById = function (ids, options) {
             return __awaiter(this, void 0, void 0, function () {
                 var publishedField, fields, hits;
@@ -1710,6 +1805,64 @@
                 });
             });
         };
+        ProductsIndex.prototype.save = function (product) {
+            return __awaiter(this, void 0, void 0, function () {
+                var error_1;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            delete product.createdAt;
+                            delete product.updatedAt;
+                            delete product.kitProducts;
+                            _a.label = 1;
+                        case 1:
+                            _a.trys.push([1, 4, , 6]);
+                            if (!product.firestoreId)
+                                throw new Error('Is not a product from firestore');
+                            return [4 /*yield*/, this.get(product.firestoreId)];
+                        case 2:
+                            _a.sent();
+                            return [4 /*yield*/, this.adapter.save("products/_doc/" + product.firestoreId, product.toPlain())];
+                        case 3:
+                            _a.sent();
+                            return [3 /*break*/, 6];
+                        case 4:
+                            error_1 = _a.sent();
+                            console.info(error_1.message);
+                            return [4 /*yield*/, this.adapter.save("products/_doc/" + product.id, product.toPlain())];
+                        case 5:
+                            _a.sent();
+                            return [3 /*break*/, 6];
+                        case 6: return [2 /*return*/];
+                    }
+                });
+            });
+        };
+        ProductsIndex.prototype.delete = function (product) {
+            return __awaiter(this, void 0, void 0, function () {
+                var error_2;
+                return __generator(this, function (_a) {
+                    switch (_a.label) {
+                        case 0:
+                            _a.trys.push([0, 3, , 5]);
+                            return [4 /*yield*/, this.get(product.firestoreId)];
+                        case 1:
+                            _a.sent();
+                            return [4 /*yield*/, this.adapter.delete("products/_doc/" + product.firestoreId)];
+                        case 2:
+                            _a.sent();
+                            return [3 /*break*/, 5];
+                        case 3:
+                            error_2 = _a.sent();
+                            return [4 /*yield*/, this.adapter.delete("products/_doc/" + product.id)];
+                        case 4:
+                            _a.sent();
+                            return [3 /*break*/, 5];
+                        case 5: return [2 /*return*/];
+                    }
+                });
+            });
+        };
         return ProductsIndex;
     }());
 
@@ -1729,7 +1882,7 @@
                     fromFirestore: function (snap) {
                         var data = snap.data();
                         Object.keys(data).forEach(function (key) {
-                            if (data[key] instanceof firebase__default["default"].firestore.Timestamp) {
+                            if (data[key] && typeof data[key] === 'object' && '_seconds' in data[key]) {
                                 data[key] = data[key].toDate();
                             }
                         });
@@ -1835,15 +1988,24 @@
                 return _this;
             }
             FindFirestore.prototype.find = function (_a) {
-                var filters = _a.filters, limits = _a.limits, orderBy = _a.orderBy;
+                var _b = _a === void 0 ? {} : _a, filters = _b.filters, limits = _b.limits, orderBy = _b.orderBy;
                 return __awaiter(this, void 0, void 0, function () {
-                    var query, docs, data;
+                    var orderByKeys, query, filtersKeysWithUnordered, docs, data;
                     return __generator(this, function (_a) {
                         switch (_a.label) {
                             case 0:
-                                query = this.collection(this.buildCollectionPathForFind(filters));
-                                query = this.makeFirestoreWhere(query, filters);
-                                Object.keys(orderBy).forEach(function (fieldName) { return (query = query.orderBy(fieldName, orderBy[fieldName])); });
+                                orderByKeys = Object.keys(orderBy || {});
+                                query = this.collection(this.buildCollectionPathForFind(filters || {}));
+                                query = this.makeFirestoreWhere(query, filters || {});
+                                if (orderByKeys.length) {
+                                    filtersKeysWithUnordered = Object.keys(filters || {}).filter(function (filterKey) { return !orderByKeys.includes(filterKey); });
+                                    if (filtersKeysWithUnordered.length)
+                                        filtersKeysWithUnordered.forEach(function (filterKey) {
+                                            var _a;
+                                            return (orderBy = Object.assign((_a = {}, _a[filterKey] = 'asc', _a), orderBy));
+                                        });
+                                    Object.keys(orderBy).forEach(function (fieldName) { return (query = query.orderBy(fieldName, orderBy[fieldName])); });
+                                }
                                 return [4 /*yield*/, this.defineLimits(query, filters, limits)];
                             case 1:
                                 query = _a.sent();
@@ -2378,7 +2540,9 @@
                             productIds = chunks_1_1.value;
                             if ((options === null || options === void 0 ? void 0 : options.limit) && products.length >= (options === null || options === void 0 ? void 0 : options.limit))
                                 return [3 /*break*/, 6];
-                            return [4 /*yield*/, this.collection('products').where(publishedField, '==', true).where('id', 'in', productIds)];
+                            return [4 /*yield*/, this.collection('productsErpVitrine')
+                                    .where(publishedField, '==', true)
+                                    .where('id', 'in', productIds)];
                         case 3:
                             query = _b.sent();
                             if (options === null || options === void 0 ? void 0 : options.hasStock)
@@ -2419,11 +2583,12 @@
         function ProductFirestoreRepository(firestore) {
             var _this = _super.call(this) || this;
             _this.firestore = firestore;
-            _this.collectionName = 'products';
+            _this.reviews = {};
+            _this.collectionName = 'productsErpVitrine';
             _this.model = Product;
             return _this;
         }
-        ProductFirestoreRepository.prototype.getBySlug = function (slug, shop) {
+        ProductFirestoreRepository.prototype.getBySlug = function (slug) {
             var _a;
             return __awaiter(this, void 0, void 0, function () {
                 var result;
@@ -2432,7 +2597,6 @@
                         case 0: return [4 /*yield*/, this.find({
                                 filters: {
                                     slug: { operator: exports.Where.EQUALS, value: slug },
-                                    shopAvailability: { operator: exports.Where.IN, value: [shop] },
                                 },
                             })];
                         case 1:
@@ -2442,6 +2606,41 @@
                 });
             });
         };
+        ProductFirestoreRepository.prototype.fetchReviews = function (status) {
+            return __awaiter(this, void 0, void 0, function () {
+                var products;
+                var _this = this;
+                return __generator(this, function (_b) {
+                    switch (_b.label) {
+                        case 0: return [4 /*yield*/, this.find()];
+                        case 1:
+                            products = (_b.sent()).data;
+                            products.forEach(function (product) {
+                                var _a;
+                                if ([undefined, 0].includes((_a = product.reviews) === null || _a === void 0 ? void 0 : _a.length))
+                                    return;
+                                var productInfo = {
+                                    productId: product.id,
+                                    productName: product.name,
+                                    productSku: product.sku,
+                                };
+                                _this.reviews.pending = [];
+                                _this.reviews.approved = [];
+                                _this.reviews.rejected = [];
+                                product.reviews.forEach(function (review) {
+                                    if ([null, undefined].includes(review.status))
+                                        return _this.reviews.pending.push(Object.assign(Object.assign({}, review), productInfo));
+                                    if (review.status === false)
+                                        return _this.reviews.rejected.push(Object.assign(Object.assign({}, review), productInfo));
+                                    if (!!review.status)
+                                        return _this.reviews.approved.push(Object.assign(Object.assign({}, review), productInfo));
+                                });
+                            });
+                            return [2 /*return*/, this.reviews[status]];
+                    }
+                });
+            });
+        };
         return ProductFirestoreRepository;
     }(withCrudFirestore(withHelpers(withFirestore(Base)))));
 
@@ -2680,7 +2879,7 @@
                 var credentials, user;
                 return __generator(this, function (_a) {
                     switch (_a.label) {
-                        case 0: return [4 /*yield*/, this.firebaseAuth.signInWithPopup(new firebase__default$1["default"].auth.GoogleAuthProvider())];
+                        case 0: return [4 /*yield*/, this.firebaseAuth.signInWithPopup(new firebase__default["default"].auth.GoogleAuthProvider())];
                         case 1:
                             credentials = _a.sent();
                             user = credentials.user;
@@ -2761,6 +2960,139 @@
         return RegisterFirebaseAuthService;
     }());
 
+    var AttributeOptionHelper = /** @class */ (function () {
+        function AttributeOptionHelper() {
+        }
+        return AttributeOptionHelper;
+    }());
+    AttributeOptionHelper.FindByAttribute = function (attributeName, fields) {
+        if (fields.includes(attributeName))
+            return { columnName: attributeName.toString(), attributeName: attributeName };
+        var field = fields.find(function (columnOption) { return lodash.isObject(columnOption) && Object.keys(columnOption).includes(attributeName.toString()); });
+        var fieldOption = field === null || field === void 0 ? void 0 : field[attributeName.toString()];
+        if (lodash.isNil(fieldOption))
+            return { columnName: attributeName.toString(), attributeName: attributeName };
+        if (Array.isArray(fieldOption))
+            return { columnName: attributeName.toString(), attributeName: attributeName, fields: fieldOption };
+        return Object.assign({ attributeName: attributeName, columnName: attributeName.toString() }, fieldOption);
+    };
+    AttributeOptionHelper.CheckIsColumnOption = function (fieldValue) { return !!fieldValue.columnName; };
+    AttributeOptionHelper.FindColumnOptionFromList = function (columnName, fields) {
+        if (fields.includes(columnName))
+            return { columnName: columnName, attributeName: columnName };
+        var field = fields.find(function (columnOption) {
+            var _a;
+            return lodash.isObject(columnOption) &&
+                ((_a = Object.values(columnOption).find(function (option) { return AttributeOptionHelper.CheckIsColumnOption(option) && option.columnName === columnName; })) === null || _a === void 0 ? void 0 : _a.columnName) === columnName;
+        }) || {};
+        var attributeName = Object.keys(field).find(function (fieldOptionFromList) { return AttributeOptionHelper.CheckIsColumnOption(field[fieldOptionFromList]) ||
+            Array.isArray(field[fieldOptionFromList]); });
+        var fieldOption = field === null || field === void 0 ? void 0 : field[attributeName];
+        if (Array.isArray(fieldOption))
+            return { attributeName: attributeName, fields: fieldOption };
+        return Object.assign({ attributeName: attributeName || columnName, columnName: columnName }, fieldOption);
+    };
+
+    var GraphQLFieldHelper = /** @class */ (function () {
+        function GraphQLFieldHelper() {
+        }
+        return GraphQLFieldHelper;
+    }());
+    GraphQLFieldHelper.CheckIsGraphQLParams = function (params) { return !lodash.isString(params) && Array.isArray(params) && params.length >= 0 && !!params[0].operation; };
+    GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields = function (fields) {
+        return fields === null || fields === void 0 ? void 0 : fields.map(function (field) {
+            var _b, _c;
+            if (lodash.isString(field))
+                return field.toString();
+            var fieldName = Object.keys(field).shift();
+            var fieldValue = field[fieldName];
+            if (Array.isArray(fieldValue))
+                return _b = {}, _b[fieldName] = GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fieldValue), _b;
+            if (!AttributeOptionHelper.CheckIsColumnOption(fieldValue))
+                return;
+            if (fieldValue.fields)
+                return _c = {},
+                    _c[fieldValue.columnName || fieldName] = GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fieldValue.fields),
+                    _c;
+            return fieldValue.columnName;
+        }).filter(function (field) { return !!field; });
+    };
+    GraphQLFieldHelper.ConvertFieldValueFrom = function (data, fields) { return Object.keys(data).reduce(function (result, columnName) {
+        var _b, _c, _d, _e;
+        var _f = AttributeOptionHelper.FindColumnOptionFromList(columnName, fields), attributeName = _f.attributeName, attributeFields = _f.fields, from = _f.from;
+        if (!!attributeFields && Array.isArray(attributeFields)) {
+            if (Array.isArray(data[columnName]))
+                return Object.assign(Object.assign({}, result), (_b = {}, _b[attributeName] = from
+                    ? from(data[columnName], data)
+                    : data[columnName].map(function (value) { return GraphQLFieldHelper.ConvertFieldValueFrom(value, attributeFields); }), _b));
+            if (lodash.isObject(data[columnName]))
+                return Object.assign(Object.assign({}, result), (_c = {}, _c[attributeName] = !!from
+                    ? from(data[columnName])
+                    : GraphQLFieldHelper.ConvertFieldValueFrom(data[columnName], attributeFields), _c));
+        }
+        if (!!from)
+            return Object.assign(Object.assign({}, result), (_d = {}, _d[attributeName] = from(data[columnName], data), _d));
+        return Object.assign(Object.assign({}, result), (_e = {}, _e[attributeName] = parseDateTime(data[columnName]), _e));
+    }, {}); };
+    GraphQLFieldHelper.ConvertFieldValueTo = function (instance, fields, update) {
+        if (update === void 0) { update = false; }
+        var _a;
+        var data = ((_a = instance.toPlain) === null || _a === void 0 ? void 0 : _a.call(instance)) || instance;
+        return Object.keys(data).reduce(function (result, attributeName) {
+            var _b, _c, _d;
+            var _e = AttributeOptionHelper.FindByAttribute(attributeName, fields), columnName = _e.columnName, attributeFields = _e.fields, foreignKeyColumn = _e.foreignKeyColumn, to = _e.to, bindPersistData = _e.bindPersistData;
+            if (bindPersistData)
+                return Object.assign(Object.assign({}, result), bindPersistData(data[attributeName], instance));
+            if (lodash.isNil(columnName))
+                return result;
+            if (!!foreignKeyColumn &&
+                !lodash.isEmpty(foreignKeyColumn) &&
+                !Object.keys(foreignKeyColumn).filter(function (key) { var _a; return !((_a = data[attributeName]) === null || _a === void 0 ? void 0 : _a[key]); }).length)
+                return Object.keys(foreignKeyColumn).reduce(function (object, current) {
+                    var _b;
+                    var _a;
+                    return (Object.assign(Object.assign({}, object), (_b = {}, _b[foreignKeyColumn[current]] = (_a = data[attributeName]) === null || _a === void 0 ? void 0 : _a[current], _b)));
+                }, Object.assign({}, result));
+            if (update && lodash.isObject(data[attributeName]) && !lodash.isNil(attributeFields) && !lodash.isDate(data[attributeName]))
+                return result;
+            if (!!columnName && Array.isArray(attributeFields) && lodash.isObject(data[attributeName])) {
+                var converted = !lodash.isNil(columnName) && to ? to(instance[attributeName], instance) : data[attributeName];
+                return Object.assign(Object.assign({}, result), (converted !== undefined
+                    ? (_b = {},
+                        _b[columnName] = {
+                            data: instance[attributeName] instanceof BaseModel
+                                ? GraphQLFieldHelper.ConvertFieldValueTo(data[attributeName], attributeFields)
+                                : converted,
+                        },
+                        _b) : {}));
+            }
+            if (!!to)
+                return Object.assign(Object.assign({}, result), (_c = {}, _c[columnName] = to(instance[attributeName], instance), _c));
+            return Object.assign(Object.assign({}, result), (_d = {}, _d[columnName] = data[attributeName], _d));
+        }, {});
+    };
+
+    var FilterOptionHelper = /** @class */ (function () {
+        function FilterOptionHelper() {
+        }
+        return FilterOptionHelper;
+    }());
+    FilterOptionHelper.CheckIfIsFilterOption = function (filter) { return !lodash.isNil(filter === null || filter === void 0 ? void 0 : filter.operator); };
+    FilterOptionHelper.GetValueFromFilter = function (filter, fieldOption) {
+        if (!FilterOptionHelper.CheckIfIsFilterOption(filter))
+            return filter;
+        if (filter.operator === exports.Where.ISNULL)
+            return true;
+        if (filter.operator === exports.Where.ISNOTNULL)
+            return false;
+        var converter = fieldOption.to
+            ? fieldOption.to
+            : function (value) { return (filter.operator === exports.Where.LIKE && value.indexOf('%') < 0 ? "%" + value + "%" : value); };
+        return Array.isArray(filter.value) && !fieldOption.fields && [exports.Where.IN, exports.Where.NOTIN].includes(filter.operator)
+            ? filter.value.map(function (fieldValue) { return converter(fieldValue); })
+            : converter(filter.value);
+    };
+
     var withCreateHasuraGraphQL = function (MixinBase) {
         return /** @class */ (function (_super) {
             __extends(CreateHasuraGraphQLMixin, _super);
@@ -2779,11 +3111,11 @@
             CreateHasuraGraphQLMixin.prototype.create = function (data) {
                 return __awaiter(this, void 0, void 0, function () {
                     var newData;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0: return [4 /*yield*/, this.save(this.model.toInstance(data))];
                             case 1:
-                                newData = _a.sent();
+                                newData = _b.sent();
                                 return [2 /*return*/, this.model.toInstance(newData)];
                         }
                     });
@@ -2791,14 +3123,34 @@
             };
             CreateHasuraGraphQLMixin.prototype.save = function (data) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var result;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
-                            case 0: return [4 /*yield*/, this.mutation(this.insertGraphQLOperation, this.model.identifiersFields, {
-                                    object: { type: this.insertGraphQLObjectType, required: true, value: this.convertDataToHasura(data) },
-                                })];
+                    var primaryKeyColumns, foreignKeyColumns, result;
+                    var _this = this;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
+                            case 0:
+                                primaryKeyColumns = this.model.identifiersFields.map(function (field) { return AttributeOptionHelper.FindByAttribute(field, _this.fields).columnName; });
+                                foreignKeyColumns = this.fields
+                                    .map(function (field) {
+                                    var _b;
+                                    var columnOptions = Object.values(field).shift();
+                                    return (AttributeOptionHelper.CheckIsColumnOption(columnOptions) &&
+                                        columnOptions.foreignKeyColumn && __spreadArray(__spreadArray([], __read(Object.values(columnOptions.foreignKeyColumn))), [
+                                        (_b = {},
+                                            _b[columnOptions.columnName] = Object.keys(columnOptions.foreignKeyColumn).map(function (foreignKeyField) {
+                                                var _a;
+                                                return ((_a = AttributeOptionHelper.FindByAttribute(foreignKeyField, columnOptions === null || columnOptions === void 0 ? void 0 : columnOptions.fields)) === null || _a === void 0 ? void 0 : _a.columnName) ||
+                                                    foreignKeyField;
+                                            }),
+                                            _b),
+                                    ]));
+                                })
+                                    .filter(Boolean)
+                                    .reduce(function (keys, current) { return __spreadArray(__spreadArray([], __read(keys)), __read(current)); }, []);
+                                return [4 /*yield*/, this.mutation(this.insertGraphQLOperation, __spreadArray(__spreadArray([], __read(primaryKeyColumns)), __read(foreignKeyColumns)), {
+                                        object: { type: this.insertGraphQLObjectType, required: true, value: this.convertDataToHasura(data) },
+                                    })];
                             case 1:
-                                result = _a.sent();
+                                result = _b.sent();
                                 return [2 /*return*/, Object.assign(Object.assign({}, data.toPlain()), this.convertDataFromHasura(result[this.insertGraphQLOperation]).toPlain())];
                         }
                     });
@@ -2830,13 +3182,17 @@
                         switch (_a.label) {
                             case 0:
                                 instance = this.model.toInstance(identifiers);
-                                return [4 /*yield*/, this.mutation(this.deleteGraphQLOperation, this.model.identifiersFields, Object.keys(instance.identifier).reduce(function (variables, key) {
+                                return [4 /*yield*/, this.mutation(this.deleteGraphQLOperation, this.model.identifiersFields.map(function (field) { return AttributeOptionHelper.FindByAttribute(field, _this.fields).columnName; }), this.model.identifiersFields.reduce(function (ids, identifier) {
                                         var _a;
-                                        return (Object.assign(Object.assign({}, variables), (_a = {}, _a[key] = {
-                                            type: _this.getAttributeGraphQLTypeOf(instance[key]),
+                                        if (lodash.isNil(instance[identifier]))
+                                            return ids;
+                                        var columnOption = AttributeOptionHelper.FindByAttribute(identifier, _this.fields);
+                                        var value = columnOption.to(identifiers[identifier.toString()], instance);
+                                        return Object.assign(Object.assign({}, ids), (_a = {}, _a[columnOption.columnName] = {
+                                            type: _this.getAttributeGraphQLTypeOf(columnOption.type || value),
+                                            value: value,
                                             required: true,
-                                            value: instance.identifier[key],
-                                        }, _a)));
+                                        }, _a));
                                     }, {}))];
                             case 1:
                                 _a.sent();
@@ -2849,104 +3205,7 @@
         }(MixinBase));
     };
 
-    var AttributeOptionHelper = /** @class */ (function () {
-        function AttributeOptionHelper() {
-        }
-        return AttributeOptionHelper;
-    }());
-    AttributeOptionHelper.findByAttribute = function (attributeName, fields) {
-        if (fields.includes(attributeName))
-            return { columnName: attributeName.toString(), attributeName: attributeName };
-        var field = fields.find(function (columnOption) { return lodash.isObject(columnOption) && Object.keys(columnOption).includes(attributeName.toString()); });
-        var fieldOption = field === null || field === void 0 ? void 0 : field[attributeName.toString()];
-        if (lodash.isNil(fieldOption))
-            return { columnName: attributeName.toString(), attributeName: attributeName };
-        if (Array.isArray(fieldOption))
-            return { columnName: attributeName.toString(), attributeName: attributeName, fields: fieldOption };
-        return Object.assign({ attributeName: attributeName, columnName: attributeName.toString() }, fieldOption);
-    };
-
     var withHasuraGraphQL = function (MixinBase) {
-        var checkIsGraphQLParams = function (params) { return !lodash.isString(params) && Array.isArray(params) && params.length >= 0 && !!params[0].operation; };
-        var checkIsColumnModelOption = function (fieldValue) { return !!fieldValue.columnName && !!fieldValue.fields; };
-        var checkIsColumnOption = function (fieldValue) { return checkIsColumnModelOption(fieldValue) || !!fieldValue.columnName; };
-        var convertModelFieldsToGraphQLFields = function (fields) {
-            return fields
-                .map(function (field) {
-                var _b, _c;
-                if (lodash.isString(field))
-                    return field.toString();
-                var fieldName = Object.keys(field).shift();
-                var fieldValue = field[fieldName];
-                if (Array.isArray(fieldValue))
-                    return _b = {}, _b[fieldName] = convertModelFieldsToGraphQLFields(fieldValue), _b;
-                if (checkIsColumnModelOption(fieldValue))
-                    return _c = {}, _c[fieldValue.columnName || fieldName] = convertModelFieldsToGraphQLFields(fieldValue.fields), _c;
-                if (checkIsColumnOption(fieldValue))
-                    return fieldValue.columnName;
-                return;
-            })
-                .filter(function (field) { return !!field; });
-        };
-        var findColumnOptionFromList = function (columnName, fields) {
-            if (fields.includes(columnName))
-                return { columnName: columnName, attributeName: columnName };
-            var field = fields.find(function (columnOption) {
-                var _a;
-                return lodash.isObject(columnOption) &&
-                    ((_a = Object.values(columnOption).find(function (option) { return checkIsColumnOption(option) && option.columnName === columnName; })) === null || _a === void 0 ? void 0 : _a.columnName) === columnName;
-            }) || {};
-            var attributeName = Object.keys(field).find(function (fieldOption) { return checkIsColumnOption(field[fieldOption]) || Array.isArray(field[fieldOption]); });
-            var fieldOption = field === null || field === void 0 ? void 0 : field[attributeName];
-            if (Array.isArray(fieldOption))
-                return { attributeName: attributeName, fields: fieldOption };
-            return Object.assign({ attributeName: attributeName || columnName, columnName: columnName }, fieldOption);
-        };
-        var convertFieldValueFrom = function (data, fields) { return Object.keys(data).reduce(function (result, columnName) {
-            var _b, _c, _d, _e;
-            var _f = findColumnOptionFromList(columnName, fields), attributeName = _f.attributeName, attributeFields = _f.fields, from = _f.from;
-            if (!!attributeFields && Array.isArray(attributeFields)) {
-                if (Array.isArray(data[columnName]))
-                    return Object.assign(Object.assign({}, result), (_b = {}, _b[attributeName] = from
-                        ? from(data[columnName], data)
-                        : data[columnName].map(function (value) { return convertFieldValueFrom(value, attributeFields); }), _b));
-                if (lodash.isObject(data[columnName]))
-                    return Object.assign(Object.assign({}, result), (_c = {}, _c[attributeName] = convertFieldValueFrom(data[columnName], attributeFields), _c));
-            }
-            if (!!from)
-                return Object.assign(Object.assign({}, result), (_d = {}, _d[attributeName] = from(data[columnName], data), _d));
-            return Object.assign(Object.assign({}, result), (_e = {}, _e[attributeName] = parseDateTime(data[columnName]), _e));
-        }, {}); };
-        var convertFieldValueTo = function (instance, fields, update) {
-            if (update === void 0) { update = false; }
-            var _a;
-            var data = ((_a = instance.toPlain) === null || _a === void 0 ? void 0 : _a.call(instance)) || instance;
-            return Object.keys(data)
-                .filter(function (key) { return !lodash.isNil(data[key]); })
-                .reduce(function (result, attributeName) {
-                var _b, _c, _d;
-                var _e = AttributeOptionHelper.findByAttribute(attributeName, fields), columnName = _e.columnName, attributeFields = _e.fields, foreignKeyColumn = _e.foreignKeyColumn, to = _e.to;
-                if (lodash.isNil(columnName))
-                    return result;
-                if (!!foreignKeyColumn &&
-                    !lodash.isEmpty(foreignKeyColumn) &&
-                    !Object.keys(foreignKeyColumn).filter(function (key) { return !data[attributeName][key]; }).length)
-                    return Object.keys(foreignKeyColumn).reduce(function (object, current) {
-                        var _b;
-                        return (Object.assign(Object.assign({}, object), (_b = {}, _b[foreignKeyColumn[current]] = data[attributeName][current], _b)));
-                    }, Object.assign({}, result));
-                if (update && lodash.isObject(data[attributeName]) && !lodash.isDate(data[attributeName]))
-                    return result;
-                if (!!columnName && Array.isArray(attributeFields) && lodash.isObject(data[attributeName])) {
-                    var converted = !lodash.isNil(columnName) ? to(instance[attributeName], instance) : data[attributeName];
-                    return Object.assign(Object.assign({}, result), (converted !== undefined
-                        ? (_b = {}, _b[columnName] = { data: convertFieldValueTo(data[attributeName], attributeFields) }, _b) : {}));
-                }
-                if (!!to)
-                    return Object.assign(Object.assign({}, result), (_c = {}, _c[columnName] = to(instance[attributeName], instance), _c));
-                return Object.assign(Object.assign({}, result), (_d = {}, _d[columnName] = data[attributeName], _d));
-            }, {});
-        };
         return /** @class */ (function (_super) {
             __extends(HasuraGraphQLMixin, _super);
             function HasuraGraphQLMixin() {
@@ -2976,11 +3235,11 @@
             HasuraGraphQLMixin.prototype.mutation = function (operation, fields, variables) {
                 return __awaiter(this, void 0, void 0, function () {
                     var resultQuery;
-                    return __generator(this, function (_b) {
+                    return __generator(this, function (_a) {
                         resultQuery = gqlQueryBuilder.mutation({
                             operation: operation,
                             variables: variables,
-                            fields: convertModelFieldsToGraphQLFields(fields),
+                            fields: GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fields),
                         });
                         return [2 /*return*/, this.fetch(resultQuery)];
                     });
@@ -2989,17 +3248,17 @@
             HasuraGraphQLMixin.prototype.query = function (operation, fields, variables) {
                 return __awaiter(this, void 0, void 0, function () {
                     var resultQuery;
-                    return __generator(this, function (_b) {
-                        resultQuery = checkIsGraphQLParams(operation)
+                    return __generator(this, function (_a) {
+                        resultQuery = GraphQLFieldHelper.CheckIsGraphQLParams(operation)
                             ? gqlQueryBuilder.query(operation.map(function (option) { return ({
                                 operation: option.operation,
                                 variables: option.variables,
-                                fields: convertModelFieldsToGraphQLFields(option.fields),
+                                fields: GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(option.fields),
                             }); }))
                             : gqlQueryBuilder.query({
                                 operation: operation,
                                 variables: variables,
-                                fields: convertModelFieldsToGraphQLFields(fields),
+                                fields: GraphQLFieldHelper.ConvertModelFieldsToGraphQLFields(fields),
                             });
                         return [2 /*return*/, this.fetch(resultQuery)];
                     });
@@ -3008,8 +3267,8 @@
             HasuraGraphQLMixin.prototype.fetch = function (params) {
                 return __awaiter(this, void 0, void 0, function () {
                     var headers, response, result;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    return __generator(this, function (_a) {
+                        switch (_a.label) {
                             case 0:
                                 headers = this.headers;
                                 return [4 /*yield*/, fetch__default["default"]("" + this.endpoint, {
@@ -3018,10 +3277,10 @@
                                         headers: headers,
                                     })];
                             case 1:
-                                response = _b.sent();
+                                response = _a.sent();
                                 return [4 /*yield*/, response.json()];
                             case 2:
-                                result = _b.sent();
+                                result = _a.sent();
                                 if (!lodash.isNil(result.errors))
                                     throw new Error(JSON.stringify(result.errors));
                                 return [2 /*return*/, result.data];
@@ -3053,12 +3312,12 @@
                 return date;
             };
             HasuraGraphQLMixin.prototype.convertDataFromHasura = function (data) {
-                var plain = convertFieldValueFrom(data, this.fields);
+                var plain = GraphQLFieldHelper.ConvertFieldValueFrom(data, this.fields);
                 return this.model.toInstance(plain);
             };
             HasuraGraphQLMixin.prototype.convertDataToHasura = function (instance, update) {
                 if (update === void 0) { update = false; }
-                return convertFieldValueTo(instance, this.fields, update);
+                return GraphQLFieldHelper.ConvertFieldValueTo(instance, this.fields, update);
             };
             return HasuraGraphQLMixin;
         }(MixinBase));
@@ -3066,9 +3325,11 @@
 
     var withUpdateHasuraGraphQL = function (MixinBase) {
         var getValueByAction = function (options) {
-            if (lodash.isNil(options.action))
+            if (options instanceof BaseModel)
+                return options.toPlain();
+            if (lodash.isNil(options === null || options === void 0 ? void 0 : options.action))
                 return options;
-            if (options.action === exports.UpdateOptionActions.REMOVE_FIELD)
+            if ([exports.UpdateOptionActions.REMOVE_FIELD.toString(), exports.UpdateOptionActions.NULL.toString()].includes(options.action))
                 return null;
             return options.value;
         };
@@ -3090,11 +3351,12 @@
             UpdateHasuraGraphQLMixin.prototype.update = function (data) {
                 return __awaiter(this, void 0, void 0, function () {
                     var plainData;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    var _this = this;
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 plainData = this.paramsToPlain(data);
-                                return [4 /*yield*/, this.mutation(this.updateGraphQLOperation, this.model.identifiersFields, {
+                                return [4 /*yield*/, this.mutation(this.updateGraphQLOperation, this.model.identifiersFields.map(function (field) { return AttributeOptionHelper.FindByAttribute(field, _this.fields).columnName; }), {
                                         _set: {
                                             type: this.updateGraphQLObjectType,
                                             value: this.convertDataToHasura(this.model.toInstance(plainData), true),
@@ -3103,7 +3365,7 @@
                                         pk_columns: { type: this.updateGraphQLPKType, value: this.getUpdateModelKeys(plainData), required: true },
                                     })];
                             case 1:
-                                _a.sent();
+                                _b.sent();
                                 return [2 /*return*/, this.model.toInstance(plainData)];
                         }
                     });
@@ -3114,14 +3376,21 @@
                 if (model.isModel(params))
                     return params.toPlain();
                 return Object.keys(params).reduce(function (data, currentKey) {
-                    var _a;
-                    return (Object.assign(Object.assign({}, data), (_a = {}, _a[currentKey] = getValueByAction(params[currentKey]), _a)));
+                    var _b;
+                    return (Object.assign(Object.assign({}, data), (params[currentKey] !== undefined && (_b = {}, _b[currentKey] = getValueByAction(params[currentKey]), _b))));
                 }, {});
             };
             UpdateHasuraGraphQLMixin.prototype.getUpdateModelKeys = function (data) {
-                return this.model.identifiersFields.reduce(function (columns, key) {
+                var _this = this;
+                var instance = this.model.toInstance(data);
+                return this.model.identifiersFields.reduce(function (ids, identifier) {
+                    var _b;
                     var _a;
-                    return (Object.assign(Object.assign({}, columns), (_a = {}, _a[key] = data[key], _a)));
+                    if (lodash.isNil(instance[identifier]))
+                        return ids;
+                    var columnOption = AttributeOptionHelper.FindByAttribute(identifier, _this.fields);
+                    var value = ((_a = columnOption === null || columnOption === void 0 ? void 0 : columnOption.to) === null || _a === void 0 ? void 0 : _a.call(columnOption, data[identifier.toString()], instance)) || data[columnOption.attributeName];
+                    return Object.assign(Object.assign({}, ids), (_b = {}, _b[columnOption.columnName] = value, _b));
                 }, {});
             };
             return UpdateHasuraGraphQLMixin;
@@ -3146,24 +3415,25 @@
                 return __awaiter(this, void 0, void 0, function () {
                     var instance, result, data;
                     var _this = this;
-                    return __generator(this, function (_a) {
-                        switch (_a.label) {
+                    return __generator(this, function (_b) {
+                        switch (_b.label) {
                             case 0:
                                 instance = this.model.toInstance(identifiers);
                                 return [4 /*yield*/, this.query(this.getGraphQLOperation, this.fields, this.model.identifiersFields.reduce(function (ids, identifier) {
+                                        var _b;
                                         var _a;
-                                        return (Object.assign(Object.assign({}, ids), (instance[identifier] === undefined
-                                            ? {}
-                                            : (_a = {},
-                                                _a[identifier] = {
-                                                    type: _this.getAttributeGraphQLTypeOf(instance[identifier]),
-                                                    value: identifiers[identifier],
-                                                    required: true,
-                                                },
-                                                _a))));
+                                        if (lodash.isNil(instance[identifier]))
+                                            return ids;
+                                        var columnOption = AttributeOptionHelper.FindByAttribute(identifier, _this.fields);
+                                        var value = ((_a = columnOption === null || columnOption === void 0 ? void 0 : columnOption.to) === null || _a === void 0 ? void 0 : _a.call(columnOption, identifiers[identifier.toString()], instance)) || identifiers[identifier.toString()];
+                                        return Object.assign(Object.assign({}, ids), (_b = {}, _b[columnOption.columnName] = {
+                                            type: _this.getAttributeGraphQLTypeOf(columnOption.type || value),
+                                            value: value,
+                                            required: true,
+                                        }, _b));
                                     }, {}))];
                             case 1:
-                                result = _a.sent();
+                                result = _b.sent();
                                 data = result[this.getGraphQLOperation];
                                 if (lodash.isNil(data))
                                     throw new NotFoundError(instance.constructor.name + " not found");
@@ -3205,60 +3475,53 @@
     })(HasuraGraphQLColumnType || (HasuraGraphQLColumnType = {}));
 
     var withFindHasuraGraphQL = function (MixinBase) {
-        var checkIfIsFilterOption = function (filter) { return !lodash.isNil(filter === null || filter === void 0 ? void 0 : filter.operator); };
-        var getValueFromFilter = function (filter, fieldOption) {
-            if (!checkIfIsFilterOption(filter))
-                return filter;
-            if (filter.operator === exports.Where.ISNULL)
-                return true;
-            if (filter.operator === exports.Where.ISNOTNULL)
-                return false;
-            var converter = fieldOption.to ? fieldOption.to : function (value) { return value; };
-            return Array.isArray(filter.value) && [exports.Where.IN, exports.Where.NOTIN].includes(filter.operator)
-                ? filter.value.map(function (fieldValue) { return converter(fieldValue); })
-                : converter(filter.value);
-        };
         return /** @class */ (function (_super) {
             __extends(FindHasuraGraphQLMixin, _super);
             function FindHasuraGraphQLMixin() {
                 var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
                 _this.makeGraphQLWhere = function (filter, fields) { return Object.keys(filter).reduce(function (variables, fieldName) {
-                    var _a;
-                    return (Object.assign(Object.assign({}, variables), (_a = {}, _a[AttributeOptionHelper.findByAttribute(fieldName, fields)
-                        .columnName] = _this.buildWhereSentence(fieldName, filter[fieldName], fields), _a)));
+                    var _b;
+                    var columnOption = AttributeOptionHelper.FindByAttribute(fieldName, fields);
+                    if (!columnOption.bindFindFilter)
+                        return Object.assign(Object.assign({}, variables), (_b = {}, _b[columnOption.columnName] = _this.buildWhereSentence(fieldName, filter[fieldName], fields), _b));
+                    var builtFilter = columnOption.bindFindFilter(filter[fieldName]);
+                    return Object.assign(Object.assign({}, variables), Object.keys(builtFilter).reduce(function (variablesList, columnName) {
+                        var _b;
+                        return (Object.assign(Object.assign({}, variablesList), (_b = {}, _b[columnName] = _this.buildWhereSentence(fieldName, builtFilter[columnName], fields), _b)));
+                    }, {}));
                 }, {}); };
                 _this.buildWhereSentence = function (field, options, fields) {
-                    var _a;
-                    var fieldSentenceOptions = AttributeOptionHelper.findByAttribute(field, fields);
+                    var _b;
+                    var fieldSentenceOptions = AttributeOptionHelper.FindByAttribute(field, fields);
                     if (!Array.isArray(options) &&
                         lodash.isObject(options) &&
                         lodash.isNil(options === null || options === void 0 ? void 0 : options.operator) &&
                         lodash.isNil(options === null || options === void 0 ? void 0 : options.value) &&
                         lodash.isNil(fieldSentenceOptions === null || fieldSentenceOptions === void 0 ? void 0 : fieldSentenceOptions.to))
                         return Object.keys(options).reduce(function (variables, key) {
-                            var _a;
-                            var fieldOptions = AttributeOptionHelper.findByAttribute(key, fields);
+                            var _b;
+                            var fieldOptions = AttributeOptionHelper.FindByAttribute(key, (fieldSentenceOptions === null || fieldSentenceOptions === void 0 ? void 0 : fieldSentenceOptions.fields) || fields);
                             var columnName = fieldOptions.columnName;
                             var columnFields = fieldOptions.fields;
-                            return Object.assign(Object.assign({}, variables), (_a = {}, _a[columnName] = _this.buildWhereSentence(key, options[key], columnFields || []), _a));
+                            return Object.assign(Object.assign({}, variables), (_b = {}, _b[columnName] = _this.buildWhereSentence(key, options[key], columnFields || []), _b));
                         }, {});
                     if (!Array.isArray(options) && !lodash.isNil(fieldSentenceOptions.fields))
-                        return _a = {},
-                            _a[fieldSentenceOptions.fields[0]] = _this.buildOperatorSentence(options, fieldSentenceOptions),
-                            _a;
-                    if (lodash.isObject(options) && !checkIfIsFilterOption(options))
+                        return _b = {},
+                            _b[fieldSentenceOptions.fields[0]] = _this.buildOperatorSentence(options, fieldSentenceOptions),
+                            _b;
+                    if (lodash.isObject(options) && !FilterOptionHelper.CheckIfIsFilterOption(options))
                         options = Object.values(options)[0];
                     return Array.isArray(options)
                         ? options.reduce(function (whereSentence, option) { return (Object.assign(Object.assign({}, whereSentence), _this.buildOperatorSentence(option, fieldSentenceOptions))); }, {})
                         : _this.buildOperatorSentence(options, fieldSentenceOptions);
                 };
                 _this.buildOperatorSentence = function (options, fieldOption) {
-                    var _a;
-                    return (_a = {},
-                        _a[_this.getHasuraOperator(options, fieldOption)] = getValueFromFilter(options, fieldOption),
-                        _a);
+                    var _b;
+                    return (_b = {},
+                        _b[_this.getHasuraOperator(options, fieldOption)] = FilterOptionHelper.GetValueFromFilter(options, fieldOption),
+                        _b);
                 };
-                _this.getHasuraOperator = function (options, fieldOption) { return checkIfIsFilterOption(options)
+                _this.getHasuraOperator = function (options, fieldOption) { return FilterOptionHelper.CheckIfIsFilterOption(options)
                     ? fieldOption.type === HasuraGraphQLColumnType.Jsonb
                         ? _this.getHasuraJsonbOperator(options)
                         : HasuraGraphQLWhere[Object.keys(HasuraGraphQLWhere).find(function (graphQLOperator) { return graphQLOperator === Object.keys(exports.Where).find(function (operator) { return exports.Where[operator] === (options === null || options === void 0 ? void 0 : options.operator); }); })]
@@ -3272,12 +3535,12 @@
             }
             FindHasuraGraphQLMixin.prototype.find = function (options) {
                 return __awaiter(this, void 0, void 0, function () {
-                    var _a, filters, limits, orderBy, variablesCount, variables, result, data, count;
+                    var _b, filters, limits, orderBy, variablesCount, variables, result, data, count;
                     var _this = this;
-                    return __generator(this, function (_b) {
-                        switch (_b.label) {
+                    return __generator(this, function (_c) {
+                        switch (_c.label) {
                             case 0:
-                                _a = options || {}, filters = _a.filters, limits = _a.limits, orderBy = _a.orderBy;
+                                _b = options || {}, filters = _b.filters, limits = _b.limits, orderBy = _b.orderBy;
                                 variablesCount = Object.assign(Object.assign({}, (lodash.isNil(orderBy) ? {} : { order_by: { type: this.tableName + "_order_by!", list: true, value: orderBy } })), (lodash.isNil(filters)
                                     ? {}
                                     : {
@@ -3288,11 +3551,17 @@
                                         },
                                     }));
                                 variables = Object.assign(Object.assign({}, (lodash.isNil(limits) ? {} : limits)), variablesCount);
-                                console.log(JSON.stringify(variables));
                                 return [4 /*yield*/, this.query([
                                         {
                                             operation: this.tableName,
-                                            fields: this.fields,
+                                            fields: options.fields
+                                                ? options.fields
+                                                    .map(function (fieldName) {
+                                                    var _a;
+                                                    return (_a = _this.fields.find(function (fieldOption) { return fieldOption === fieldName; })) !== null && _a !== void 0 ? _a : _this.fields.find(function (fieldOption) { return Object.keys(fieldOption).shift() === fieldName; });
+                                                })
+                                                    .filter(Boolean)
+                                                : this.fields,
                                             variables: variables,
                                         },
                                         {
@@ -3302,8 +3571,8 @@
                                         },
                                     ])];
                             case 1:
-                                result = _b.sent();
-                                data = result[this.tableName].map(function (data) { return _this.convertDataFromHasura(data); });
+                                result = _c.sent();
+                                data = result[this.tableName].map(function (row) { return _this.convertDataFromHasura(row); });
                                 count = result[this.tableName + "_aggregate"].aggregate.count;
                                 return [2 /*return*/, { count: count, data: data }];
                         }
@@ -3324,32 +3593,90 @@
         }(withUpdateHasuraGraphQL(withGetHasuraGraphQL(withFindHasuraGraphQL(withDeleteHasuraGraphQL(withCreateHasuraGraphQL(MixinBase)))))));
     };
 
-    var CategoryHasuraGraphQLRepository = /** @class */ (function (_super_1) {
-        __extends(CategoryHasuraGraphQLRepository, _super_1);
-        function CategoryHasuraGraphQLRepository(endpoint, authOptions, productRepository) {
-            var _this = _super_1.call(this, {
-                tableName: 'category',
-                model: Category,
-                endpoint: endpoint,
-                authOptions: authOptions,
-                fields: [
-                    { id: { columnName: 'id', to: function (value) { return +value; }, from: function (value) { return value.toString(); } } },
-                    'firestore_id',
-                    'name',
-                    'description',
-                    'image',
-                    'published',
-                    'shop',
-                    'slug',
+    var CategoryHasuraGraphQL = /** @class */ (function (_super) {
+        __extends(CategoryHasuraGraphQL, _super);
+        function CategoryHasuraGraphQL() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return CategoryHasuraGraphQL;
+    }(Category));
+
+    var ProductHasuraGraphQL = /** @class */ (function (_super) {
+        __extends(ProductHasuraGraphQL, _super);
+        function ProductHasuraGraphQL() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return ProductHasuraGraphQL;
+    }(Product));
+    __decorate([
+        classTransformer.Type(function () { return KitProductHasuraGraphQL; }),
+        __metadata("design:type", Array)
+    ], ProductHasuraGraphQL.prototype, "kitProducts", void 0);
+
+    var KitProductHasuraGraphQL = /** @class */ (function (_super) {
+        __extends(KitProductHasuraGraphQL, _super);
+        function KitProductHasuraGraphQL() {
+            return _super !== null && _super.apply(this, arguments) || this;
+        }
+        return KitProductHasuraGraphQL;
+    }(KitProduct));
+    __decorate([
+        classTransformer.Type(function () { return ProductHasuraGraphQL; }),
+        __metadata("design:type", ProductHasuraGraphQL)
+    ], KitProductHasuraGraphQL.prototype, "kit", void 0);
+    __decorate([
+        classTransformer.Type(function () { return ProductHasuraGraphQL; }),
+        __metadata("design:type", ProductHasuraGraphQL)
+    ], KitProductHasuraGraphQL.prototype, "product", void 0);
+
+    var VariantHasuraGraphQL = /** @class */ (function (_super) {
+        __extends(VariantHasuraGraphQL, _super);
+        function VariantHasuraGraphQL() {
+            var _this = _super.apply(this, __spreadArray([], __read(arguments))) || this;
+            _this.name = '';
+            _this.hasVariants = false;
+            return _this;
+        }
+        return VariantHasuraGraphQL;
+    }(Variant));
+
+    var CategoryHasuraGraphQLRepository = /** @class */ (function (_super_1) {
+        __extends(CategoryHasuraGraphQLRepository, _super_1);
+        function CategoryHasuraGraphQLRepository(endpoint, authOptions, productRepository) {
+            var _this = _super_1.call(this, {
+                tableName: 'category',
+                model: Category,
+                endpoint: endpoint,
+                authOptions: authOptions,
+                fields: [
+                    { id: { columnName: 'id', to: function (value) { return +value; }, from: function (value) { return value.toString(); } } },
+                    { firestoreId: { columnName: 'firestore_id' } },
+                    'name',
+                    'description',
+                    'image',
+                    'published',
+                    'shop',
+                    'slug',
                     { brandCategory: { columnName: 'brand_category' } },
                     { brandCategoryBanner: { columnName: 'brand_banner' } },
                     { brandCategoryBannerMobile: { columnName: 'brand_banner_mobile' } },
                     { brandLogo: { columnName: 'brand_logo' } },
-                    { conditions: { columnName: 'brand_condition' } },
+                    { brandCondition: { columnName: 'brand_condition' } },
                     {
                         conditions: {
                             columnName: 'tag_condition',
-                            from: function (tags, row) { return ({ brand: row.brand_condition, tags: tags }); },
+                            type: HasuraGraphQLColumnType.Jsonb,
+                            from: function (tags, row) { return ({ brand: row.brand_condition, tags: Array.isArray(tags) ? tags : [] }); },
+                            bindPersistData: function (value) {
+                                var _a, _b;
+                                return {
+                                    brand_condition: value.brand,
+                                    tag_condition: "{\"" + (((_b = (_a = value === null || value === void 0 ? void 0 : value.tags) === null || _a === void 0 ? void 0 : _a.join) === null || _b === void 0 ? void 0 : _b.call(_a, '","')) || '') + "\"}",
+                                };
+                            },
+                            bindFindFilter: function (sentence) {
+                                return Object.assign(Object.assign({}, (sentence.brand ? { brand_condition: sentence.brand } : {})), (sentence.tags ? { tag_condition: sentence.tags } : {}));
+                            },
                         },
                     },
                     'filters',
@@ -3360,6 +3687,9 @@
                             columnName: 'products',
                             fields: ['product_id'],
                             from: function (value) { return value.map(function (product) { return product.product_id.toString(); }); },
+                            to: function (productIds) { return productIds.map(function (productId) { return ({
+                                product_id: +productId,
+                            }); }); },
                         },
                     },
                 ],
@@ -3373,34 +3703,34 @@
             });
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             if (!Number.isNaN(+identifiers.id)) return [3 /*break*/, 2];
-                            return [4 /*yield*/, this.find({ filters: { firestore_id: identifiers.id } })];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id } })];
                         case 1:
-                            _b = (_a = (_c.sent()).data) === null || _a === void 0 ? void 0 : _a[0];
+                            _c = (_a = (_d.sent()).data) === null || _a === void 0 ? void 0 : _a[0];
                             return [3 /*break*/, 3];
                         case 2:
-                            _b = _super.get.call(this, identifiers);
-                            _c.label = 3;
-                        case 3: return [2 /*return*/, _b];
+                            _c = _super.get.call(this, identifiers);
+                            _d.label = 3;
+                        case 3: return [2 /*return*/, _c];
                     }
                 });
             });
         };
         CategoryHasuraGraphQLRepository.prototype.getCategoryBySlug = function (slug, shop) {
             return __awaiter(this, void 0, void 0, function () {
-                var _b, data, count;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var _c, data, count;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             if (!slug)
                                 return [2 /*return*/];
                             return [4 /*yield*/, this.find({ filters: { slug: slug, shop: shop, published: true } })];
                         case 1:
-                            _b = _c.sent(), data = _b.data, count = _b.count;
+                            _c = _d.sent(), data = _c.data, count = _c.count;
                             if (count > 1)
                                 throw new DuplicatedResultsError('Query returned duplicated values');
                             if (!count)
@@ -3413,33 +3743,33 @@
         CategoryHasuraGraphQLRepository.prototype.getCategoriesForHome = function (categoryIds, limit) {
             if (limit === void 0) { limit = 4; }
             return __awaiter(this, void 0, void 0, function () {
-                var _b, categories, count, homeSections;
+                var _c, categories, count, homeSections;
                 var _this = this;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0: return [4 /*yield*/, this.find({
-                                filters: { firestore_id: { operator: exports.Where.IN, value: categoryIds.filter(Boolean) }, published: true },
+                                filters: { firestoreId: { operator: exports.Where.IN, value: categoryIds.filter(Boolean) }, published: true },
                             })];
                         case 1:
-                            _b = _c.sent(), categories = _b.data, count = _b.count;
+                            _c = _d.sent(), categories = _c.data, count = _c.count;
                             if (!count)
                                 throw new NotFoundError('Categories not found');
                             return [4 /*yield*/, Promise.all(categories.map(function (category) { return __awaiter(_this, void 0, void 0, function () {
-                                    var _b;
-                                    return __generator(this, function (_c) {
-                                        switch (_c.label) {
+                                    var _c;
+                                    return __generator(this, function (_d) {
+                                        switch (_d.label) {
                                             case 0:
-                                                _b = {
+                                                _c = {
                                                     category: category
                                                 };
                                                 return [4 /*yield*/, this.mountCategory(category, { limit: limit, hasStock: true })];
-                                            case 1: return [2 /*return*/, (_b.products = _c.sent(),
-                                                    _b)];
+                                            case 1: return [2 /*return*/, (_c.products = _d.sent(),
+                                                    _c)];
                                         }
                                     });
                                 }); }))];
                         case 2:
-                            homeSections = _c.sent();
+                            homeSections = _d.sent();
                             return [2 /*return*/, homeSections];
                     }
                 });
@@ -3448,23 +3778,40 @@
         CategoryHasuraGraphQLRepository.prototype.mountCategory = function (category, options) {
             return __awaiter(this, void 0, void 0, function () {
                 var products, publishedField, productsData;
-                var _b;
-                return __generator(this, function (_c) {
-                    switch (_c.label) {
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
                         case 0:
                             if (!category.products)
                                 throw new RequiredArgumentError(['Category products is empty']);
-                            console.log(category);
-                            console.log(category.products);
                             products = [];
                             publishedField = category.shop === exports.Shops.GLAMSHOP ? 'publishedGlam' : 'published';
-                            return [4 /*yield*/, this.productRepository.find(Object.assign({ filters: (_b = {
-                                            id: { operator: exports.Where.IN, value: category.products }
-                                        },
-                                        _b[publishedField] = true,
-                                        _b) }, ((options === null || options === void 0 ? void 0 : options.limit) ? { limits: { limit: options === null || options === void 0 ? void 0 : options.limit } } : {})))];
+                            return [4 /*yield*/, this.productRepository.find(Object.assign({ filters: Object.assign((_c = { id: { operator: exports.Where.IN, value: category.products } }, _c[publishedField] = true, _c), ((options === null || options === void 0 ? void 0 : options.hasStock) ? { stock: { quantity: { operator: exports.Where.GT, value: 0 } } } : {})), fields: [
+                                        'id',
+                                        'name',
+                                        'slug',
+                                        'images',
+                                        'miniatures',
+                                        'price',
+                                        'fullPrice',
+                                        'subscriberDiscountPercentage',
+                                        'subscriberPrice',
+                                        'stock',
+                                        'published',
+                                        'publishedGlam',
+                                        'CEST',
+                                        'EAN',
+                                        'NCM',
+                                        'brand',
+                                        'costPrice',
+                                        'hasVariants',
+                                        'isKit',
+                                        'shopAvailability',
+                                        'sku',
+                                        'rate',
+                                    ] }, ((options === null || options === void 0 ? void 0 : options.limit) ? { limits: { limit: options === null || options === void 0 ? void 0 : options.limit } } : {})))];
                         case 1:
-                            productsData = (_c.sent()).data;
+                            productsData = (_d.sent()).data;
                             products.push.apply(products, __spreadArray([], __read(productsData)));
                             return [2 /*return*/, products];
                     }
@@ -3474,97 +3821,720 @@
         return CategoryHasuraGraphQLRepository;
     }(withCrudHasuraGraphQL(withHasuraGraphQL(Base))));
 
-    var ProductHasuraGraphQLRepository = /** @class */ (function (_super) {
-        __extends(ProductHasuraGraphQLRepository, _super);
+    var ProductHasuraGraphQLRepository = /** @class */ (function (_super_1) {
+        __extends(ProductHasuraGraphQLRepository, _super_1);
         function ProductHasuraGraphQLRepository(endpoint, authOptions) {
-            return _super.call(this, {
+            var _this = _super_1.call(this, {
                 tableName: 'product',
-                model: Product,
+                model: ProductHasuraGraphQL,
+                endpoint: endpoint,
+                authOptions: authOptions,
+                fields: [],
+            }) || this;
+            _this.bindReviewToModel = function (plain) { return (Object.assign(Object.assign({}, lodash.omit(plain, ['product_id', 'created_at', 'updated_at', 'person_id', 'order_id'])), { createdAt: typeof plain.created_at === 'string' ? new Date(plain.created_at) : plain.created_at, updatedAt: typeof plain.updated_at === 'string' ? new Date(plain.updated_at) : plain.updated_at, personId: plain.person_id, orderId: plain.order_id })); };
+            _this.bindReviewToHasura = function (review) { return (Object.assign(Object.assign({}, lodash.omit(review, ['productId', 'createdAt', 'updatedAt', 'personId', 'orderId'])), { person_id: review.personId, order_id: review.orderId })); };
+            var commonFields = [
+                { id: { columnName: 'id', to: function (value) { return +value; }, from: function (value) { return value.toString(); } } },
+                { firestoreId: { columnName: 'firestore_id' } },
+                { productId: { columnName: 'main_product_id' } },
+                { CEST: { columnName: 'cest' } },
+                { EAN: { columnName: 'ean' } },
+                { NCM: { columnName: 'ncm' } },
+                'brand',
+                { costPrice: { columnName: 'cost_price' } },
+                {
+                    description: {
+                        columnName: 'description',
+                        from: function (description) { return Object.values(exports.Shops).reduce(function (shops, shop) {
+                            var _c;
+                            return (Object.assign(Object.assign({}, shops), (_c = {}, _c[shop] = { description: description }, _c)));
+                        }, {}); },
+                        to: function (value) { return Object.values(value).shift().description; },
+                    },
+                },
+                { hasVariants: { columnName: 'has_variants' } },
+                { images: { columnName: 'images', to: function (value) { var _a; return "{\"" + (((_a = value === null || value === void 0 ? void 0 : value.join) === null || _a === void 0 ? void 0 : _a.call(value, "\",\"")) || '') + "\"}"; } } },
+                { miniatures: { columnName: 'miniatures', to: function (value) { var _a; return "{\"" + (((_a = value === null || value === void 0 ? void 0 : value.join) === null || _a === void 0 ? void 0 : _a.call(value, "\",\"")) || '') + "\"}"; } } },
+                'name',
+                {
+                    price: {
+                        columnName: 'price',
+                        from: function (price, data) { return Object.values(exports.Shops).reduce(function (prices, shop) {
+                            var _c;
+                            return (Object.assign(Object.assign({}, prices), (_c = {}, _c[shop] = {
+                                price: price,
+                                fullPrice: data.full_price,
+                                subscriberDiscountPercentage: data.subscriber_discount_percentage,
+                                subscriberPrice: data.subscriber_price,
+                            }, _c)));
+                        }, {}); },
+                        bindFindFilter: function (sentence) {
+                            var filters = Object.values(sentence).shift();
+                            return Object.assign(Object.assign(Object.assign(Object.assign({}, (((filters === null || filters === void 0 ? void 0 : filters.price) || (filters === null || filters === void 0 ? void 0 : filters.price) === 0) && { price: filters.price })), ((filters.fullPrice || filters.fullPrice === 0) && { full_price: filters.fullPrice })), ((filters.subscriberDiscountPercentage || filters.subscriberDiscountPercentage === 0) && {
+                                subscriber_discount_percentage: filters.subscriberDiscountPercentage,
+                            })), ((filters.subscriberPrice || filters.subscriberPrice === 0) && {
+                                subscriber_price: filters.subscriberPrice,
+                            }));
+                        },
+                        bindPersistData: function (value) {
+                            var priceData = Object.values(value).shift();
+                            return Object.assign(Object.assign(Object.assign(Object.assign({}, ((priceData === null || priceData === void 0 ? void 0 : priceData.price) >= 0 && { price: priceData.price })), (priceData.fullPrice >= 0 && { full_price: priceData.fullPrice })), (priceData.subscriberDiscountPercentage >= 0 && {
+                                subscriber_discount_percentage: priceData.subscriberDiscountPercentage,
+                            })), (priceData.subscriberPrice >= 0 && { subscriber_price: priceData.subscriberPrice }));
+                        },
+                    },
+                },
+                { fullPrice: { columnName: 'full_price' } },
+                { subscriberDiscountPercentage: { columnName: 'subscriber_discount_percentage' } },
+                { subscriberPrice: { columnName: 'subscriber_price' } },
+                'published',
+                { publishedGlam: { columnName: 'published_glam' } },
+                'sku',
+                {
+                    stock: {
+                        columnName: 'stock',
+                        from: function (quantity) { return ({ quantity: quantity }); },
+                        to: function (value) { return (lodash.isNil(value === null || value === void 0 ? void 0 : value.quantity) ? value : value === null || value === void 0 ? void 0 : value.quantity); },
+                    },
+                },
+                'slug',
+                'type',
+                'video',
+                'weight',
+                {
+                    shopAvailability: {
+                        columnName: 'shop_availabilities',
+                        fields: ['shop'],
+                        from: function (shop) { return (Array.isArray(shop) ? shop.map(function (row) { return row.shop; }) : []); },
+                        bindPersistData: function (shops) { return ({ shop_availabilities: { data: shops.map(function (shop) { return ({ shop: shop }); }) } }); },
+                    },
+                },
+                { tags: { columnName: 'tags', type: HasuraGraphQLColumnType.Jsonb } },
+                { isKit: { columnName: 'is_kit' } },
+                { createdAt: { columnName: 'created_at' } },
+                { updatedAt: { columnName: 'updated_at' } },
+                {
+                    rate: {
+                        columnName: 'reviews_aggregate',
+                        fields: [{ aggregate: [{ avg: ['rate'] }] }],
+                        from: function (value) { return value.aggregate.avg.rate; },
+                    },
+                },
+            ];
+            _this.fields = __spreadArray(__spreadArray([], __read(commonFields)), [
+                {
+                    categories: {
+                        columnName: 'categories',
+                        fields: ['category_id'],
+                        bindPersistData: function (value) { return ({
+                            categories: { data: value.map(function (category) { return ({ category_id: +category }); }) },
+                        }); },
+                        to: function (categories) { return categories.map(function (categoryId) { return +categoryId; }); },
+                        from: function (categories) { return (categories === null || categories === void 0 ? void 0 : categories.map(function (category) { var _a; return (_a = category === null || category === void 0 ? void 0 : category.category_id) === null || _a === void 0 ? void 0 : _a.toString(); })) || []; },
+                    },
+                },
+                {
+                    kitProducts: {
+                        columnName: 'kit_products',
+                        foreignKeyColumn: { productId: 'id' },
+                        fields: [
+                            { productId: { columnName: 'product_id' } },
+                            { kitProductId: { columnName: 'kit_product_id' } },
+                            'quantity',
+                            { product: { columnName: 'product', foreignKeyColumn: { id: 'product_id' }, fields: commonFields } },
+                        ],
+                    },
+                },
+            ]);
+            return _this;
+        }
+        Object.defineProperty(ProductHasuraGraphQLRepository.prototype, "reviewsFields", {
+            get: function () {
+                return [
+                    'id',
+                    'shop',
+                    'rate',
+                    'author',
+                    'email',
+                    'location',
+                    'review',
+                    'status',
+                    'title',
+                    'person_id',
+                    'points',
+                    'order_id',
+                    'created_at',
+                    'updated_at',
+                ];
+            },
+            enumerable: false,
+            configurable: true
+        });
+        ProductHasuraGraphQLRepository.prototype.create = function (data) {
+            var _super = Object.create(null, {
+                create: { get: function () { return _super_1.prototype.create; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var product, _c, error_1;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0: return [4 /*yield*/, _super.create.call(this, lodash.omit(data, ['reviews']))];
+                        case 1:
+                            product = _d.sent();
+                            _d.label = 2;
+                        case 2:
+                            _d.trys.push([2, 4, , 6]);
+                            _c = product;
+                            return [4 /*yield*/, this.updateReviews(+product.id, data)];
+                        case 3:
+                            _c.reviews = _d.sent();
+                            return [3 /*break*/, 6];
+                        case 4:
+                            error_1 = _d.sent();
+                            return [4 /*yield*/, this.delete({ id: product.id })];
+                        case 5:
+                            _d.sent();
+                            throw error_1;
+                        case 6: return [2 /*return*/, product];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.get = function (identifiers) {
+            var _super = Object.create(null, {
+                get: { get: function () { return _super_1.prototype.get; } }
+            });
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                var product, _c, _d;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            if (!Number.isNaN(+identifiers.id)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id } })];
+                        case 1:
+                            _c = (_a = (_e.sent()).data) === null || _a === void 0 ? void 0 : _a[0];
+                            return [3 /*break*/, 4];
+                        case 2: return [4 /*yield*/, _super.get.call(this, identifiers)];
+                        case 3:
+                            _c = _e.sent();
+                            _e.label = 4;
+                        case 4:
+                            product = _c;
+                            _d = product;
+                            return [4 /*yield*/, this.findReviewsByProduct(+product.id)];
+                        case 5:
+                            _d.reviews = _e.sent();
+                            return [2 /*return*/, product];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.find = function (params) {
+            var _super = Object.create(null, {
+                find: { get: function () { return _super_1.prototype.find; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var _a, filters, options;
+                return __generator(this, function (_c) {
+                    _a = params || {}, filters = _a.filters, options = __rest(_a, ["filters"]);
+                    return [2 /*return*/, _super.find.call(this, Object.assign(Object.assign({}, options), { filters: Object.assign(Object.assign({}, filters), { productId: { operator: exports.Where.ISNULL } }) }))];
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.getBySlug = function (slug) {
+            var _a;
+            return __awaiter(this, void 0, void 0, function () {
+                var result, product, _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0: return [4 /*yield*/, this.find({
+                                filters: {
+                                    slug: slug,
+                                },
+                            })];
+                        case 1:
+                            result = _d.sent();
+                            product = (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.shift();
+                            _c = product;
+                            return [4 /*yield*/, this.findReviewsByProduct(+product.id)];
+                        case 2:
+                            _c.reviews = _d.sent();
+                            return [2 /*return*/, product];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.update = function (params) {
+            var _super = Object.create(null, {
+                update: { get: function () { return _super_1.prototype.update; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var categories, kitProducts, reviews, checkId, shopAvailability, rate, data, plainData, id, product, _c, _d, _e, _f, _g, _h;
+                return __generator(this, function (_j) {
+                    switch (_j.label) {
+                        case 0:
+                            categories = params.categories, kitProducts = params.kitProducts, reviews = params.reviews, checkId = params.id, shopAvailability = params.shopAvailability, rate = params.rate, data = __rest(params, ["categories", "kitProducts", "reviews", "id", "shopAvailability", "rate"]);
+                            plainData = this.paramsToPlain({ id: checkId });
+                            return [4 /*yield*/, this.getId(plainData.id)];
+                        case 1:
+                            id = _j.sent();
+                            return [4 /*yield*/, _super.update.call(this, Object.assign({ id: id }, data))];
+                        case 2:
+                            product = _j.sent();
+                            _c = product;
+                            _d = categories;
+                            if (!_d) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.updateCategories(+id, { categories: categories })];
+                        case 3:
+                            _d = (_j.sent());
+                            _j.label = 4;
+                        case 4:
+                            _c.categories = _d;
+                            _e = product;
+                            _f = kitProducts;
+                            if (!_f) return [3 /*break*/, 6];
+                            return [4 /*yield*/, this.updateKitProducts(+id, { kitProducts: kitProducts })];
+                        case 5:
+                            _f = (_j.sent());
+                            _j.label = 6;
+                        case 6:
+                            _e.kitProducts = _f;
+                            _g = product;
+                            _h = reviews;
+                            if (!_h) return [3 /*break*/, 8];
+                            return [4 /*yield*/, this.updateReviews(+id, { reviews: reviews })];
+                        case 7:
+                            _h = (_j.sent());
+                            _j.label = 8;
+                        case 8:
+                            _g.reviews = _h;
+                            return [2 /*return*/, product];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.fetchReviews = function (status) {
+            return __awaiter(this, void 0, void 0, function () {
+                var reviews, data;
+                var _c, _d;
+                var _this = this;
+                return __generator(this, function (_e) {
+                    switch (_e.label) {
+                        case 0:
+                            reviews = {
+                                status: status === 'pending'
+                                    ? (_c = {}, _c[HasuraGraphQLWhere.ISNULL] = true, _c) : (_d = {}, _d[HasuraGraphQLWhere.EQUALS] = status === 'approved', _d),
+                            };
+                            return [4 /*yield*/, this.query('product', ['id', 'name', 'sku', { reviews: { columnName: 'reviews', fields: this.reviewsFields } }], {
+                                    where: { value: { reviews: reviews }, type: 'product_bool_exp', required: true },
+                                })];
+                        case 1:
+                            data = (_e.sent()).product;
+                            return [2 /*return*/, data.reduce(function (reviews, product) { return __spreadArray(__spreadArray([], __read(reviews)), __read(product.reviews
+                                    .filter(function (review) { return (status === 'pending' && [undefined, null].includes(review.status)) ||
+                                    (status === 'approved' && review.status === true) ||
+                                    (status === 'rejected' && review.status === false); })
+                                    .map(function (review) { return (Object.assign(Object.assign({}, _this.bindReviewToModel(review)), { productId: product.id, productName: product.name, productSku: product.sku })); }))); }, [])];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.updateCategories = function (productId, _c) {
+            var categories = _c.categories;
+            return __awaiter(this, void 0, void 0, function () {
+                var plainData;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            plainData = this.paramsToPlain({ categories: categories });
+                            return [4 /*yield*/, this.mutation('delete_category_product', ['affected_rows'], {
+                                    where: {
+                                        type: 'category_product_bool_exp',
+                                        required: true,
+                                        value: { product_id: { _eq: productId } },
+                                    },
+                                })];
+                        case 1:
+                            _c.sent();
+                            return [4 /*yield*/, this.mutation('insert_category_product', ['affected_rows'], {
+                                    objects: {
+                                        type: '[category_product_insert_input!]',
+                                        required: true,
+                                        value: plainData.categories.map(function (categoryId) { return ({ category_id: categoryId, product_id: productId }); }),
+                                    },
+                                })];
+                        case 2:
+                            _c.sent();
+                            return [2 /*return*/, plainData.categories];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.updateKitProducts = function (productId, _c) {
+            var kitProducts = _c.kitProducts;
+            return __awaiter(this, void 0, void 0, function () {
+                var plainData;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            plainData = this.paramsToPlain({ kitProducts: kitProducts });
+                            return [4 /*yield*/, this.mutation('delete_product_kit', ['affected_rows'], {
+                                    where: {
+                                        type: 'product_kit_bool_exp',
+                                        required: true,
+                                        value: { product_id: { _eq: productId } },
+                                    },
+                                })];
+                        case 1:
+                            _c.sent();
+                            return [4 /*yield*/, this.mutation('insert_product_kit', ['affected_rows'], {
+                                    objects: {
+                                        type: '[product_kit_insert_input!]',
+                                        required: true,
+                                        value: plainData.kitProducts.map(function (kitProduct) { return ({
+                                            kit_product_id: kitProduct.productId || kitProduct.product.id,
+                                            product_id: productId,
+                                            quantity: kitProduct.quantity,
+                                        }); }),
+                                    },
+                                })];
+                        case 2:
+                            _c.sent();
+                            return [2 /*return*/, plainData.kitProducts];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.updateReviews = function (productId, _c) {
+            var reviews = _c.reviews;
+            return __awaiter(this, void 0, void 0, function () {
+                var reviewIds_1, plainData;
+                var _this = this;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            if (!reviews)
+                                return [2 /*return*/, []];
+                            if (!('action' in reviews && reviews.action === 'remove')) return [3 /*break*/, 3];
+                            return [4 /*yield*/, Promise.all(reviews.value.map(function (reviewData) { return __awaiter(_this, void 0, void 0, function () {
+                                    var review;
+                                    return __generator(this, function (_c) {
+                                        switch (_c.label) {
+                                            case 0: return [4 /*yield*/, this.findReview(reviewData, productId)];
+                                            case 1:
+                                                review = _c.sent();
+                                                return [2 /*return*/, review === null || review === void 0 ? void 0 : review.id];
+                                        }
+                                    });
+                                }); }))];
+                        case 1:
+                            reviewIds_1 = _c.sent();
+                            return [4 /*yield*/, this.mutation('delete_product_review', ['affected_rows'], {
+                                    where: { value: { id: { _in: reviewIds_1.filter(Boolean) } }, type: 'product_review_bool_exp', required: true },
+                                })];
+                        case 2:
+                            _c.sent();
+                            return [2 /*return*/, reviews.value.map(function (review, index) { return !reviewIds_1[index] && review; }).filter(Boolean)];
+                        case 3:
+                            plainData = this.paramsToPlain({ reviews: reviews });
+                            return [2 /*return*/, Promise.all(plainData.reviews.map(function (reviewData) { return __awaiter(_this, void 0, void 0, function () {
+                                    var review, _c, _d;
+                                    return __generator(this, function (_e) {
+                                        switch (_e.label) {
+                                            case 0: return [4 /*yield*/, this.findReview(reviewData, productId)];
+                                            case 1:
+                                                review = _e.sent();
+                                                if (!review.id) return [3 /*break*/, 3];
+                                                _c = this.bindReviewToModel;
+                                                return [4 /*yield*/, this.mutation('update_product_review_by_pk', this.reviewsFields, {
+                                                        pk_columns: {
+                                                            value: { id: review.id },
+                                                            type: 'product_review_pk_columns_input',
+                                                            required: true,
+                                                        },
+                                                        _set: {
+                                                            value: lodash.omit(this.bindReviewToHasura(reviewData), ['id', 'product_id']),
+                                                            type: 'product_review_set_input',
+                                                            required: true,
+                                                        },
+                                                    })];
+                                            case 2: return [2 /*return*/, _c.apply(this, [(_e.sent()).update_product_review_by_pk])];
+                                            case 3:
+                                                _d = this.bindReviewToModel;
+                                                return [4 /*yield*/, this.mutation('insert_product_review_one', this.reviewsFields, {
+                                                        object: {
+                                                            value: lodash.omit(Object.assign(Object.assign({}, this.bindReviewToHasura(reviewData)), { product_id: productId }), ['id']),
+                                                            type: 'product_review_insert_input',
+                                                            required: true,
+                                                        },
+                                                    })];
+                                            case 4: return [2 /*return*/, _d.apply(this, [(_e.sent()).insert_product_review_one])];
+                                        }
+                                    });
+                                }); }))];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.getId = function (id) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            if (!Number.isNaN(+id))
+                                return [2 /*return*/, id];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: id } })];
+                        case 1:
+                            data = (_c.sent()).data;
+                            if ((_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.id)
+                                return [2 /*return*/, (_b = data === null || data === void 0 ? void 0 : data[0]) === null || _b === void 0 ? void 0 : _b.id];
+                            throw new NotFoundError("Product with id " + id + " not found");
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.findReviewsByProduct = function (productId) {
+            return __awaiter(this, void 0, void 0, function () {
+                var data;
+                var _this = this;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.query('product_review', this.reviewsFields, {
+                                where: {
+                                    value: {
+                                        product_id: { _eq: productId },
+                                    },
+                                    type: 'product_review_bool_exp',
+                                    required: true,
+                                },
+                            })];
+                        case 1:
+                            data = (_c.sent()).product_review;
+                            return [2 /*return*/, data && data.map(function (review) { return _this.bindReviewToModel(review); })];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.findReview = function (review, productId) {
+            return __awaiter(this, void 0, void 0, function () {
+                var loadedReview;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            if (review.id)
+                                return [2 /*return*/, review];
+                            if (!review.personId) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.getReviewByPersonId(review.personId, productId)];
+                        case 1:
+                            loadedReview = _c.sent();
+                            _c.label = 2;
+                        case 2:
+                            if (!(!loadedReview && review.author && review.email)) return [3 /*break*/, 4];
+                            return [4 /*yield*/, this.getReviewByAuthorAndEmail(review.author, review.email, productId)];
+                        case 3:
+                            loadedReview = _c.sent();
+                            _c.label = 4;
+                        case 4: return [2 /*return*/, loadedReview || review];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.getReviewByPersonId = function (personId, productId) {
+            return __awaiter(this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.query('product_review', this.reviewsFields, {
+                                where: {
+                                    value: {
+                                        product_id: { _eq: productId },
+                                        person_id: { _eq: personId },
+                                    },
+                                    type: "product_review_bool_exp",
+                                    required: true,
+                                },
+                            })];
+                        case 1:
+                            data = (_c.sent()).product_review;
+                            return [2 /*return*/, data && data[0] && this.bindReviewToModel(data[0])];
+                    }
+                });
+            });
+        };
+        ProductHasuraGraphQLRepository.prototype.getReviewByAuthorAndEmail = function (author, email, productId) {
+            return __awaiter(this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0: return [4 /*yield*/, this.query('product_review', this.reviewsFields, {
+                                where: {
+                                    value: {
+                                        product_id: { _eq: productId },
+                                        author: { _eq: author },
+                                        email: { _eq: email },
+                                    },
+                                    type: "product_review_bool_exp",
+                                    required: true,
+                                },
+                            })];
+                        case 1:
+                            data = (_c.sent()).product_review;
+                            return [2 /*return*/, data && data[0] && this.bindReviewToModel(data[0])];
+                    }
+                });
+            });
+        };
+        return ProductHasuraGraphQLRepository;
+    }(withCrudHasuraGraphQL(withHasuraGraphQL(Base))));
+
+    var VariantHasuraGraphQLRepository = /** @class */ (function (_super_1) {
+        __extends(VariantHasuraGraphQLRepository, _super_1);
+        function VariantHasuraGraphQLRepository(endpoint, authOptions) {
+            return _super_1.call(this, {
+                tableName: 'product',
+                model: VariantHasuraGraphQL,
                 endpoint: endpoint,
                 authOptions: authOptions,
                 fields: [
                     { id: { columnName: 'id', to: function (value) { return +value; }, from: function (value) { return value.toString(); } } },
-                    { CEST: { columnName: 'cest' } },
+                    { firestoreId: { columnName: 'firestore_id' } },
+                    { productId: { columnName: 'main_product_id', to: function (value) { return +value; }, from: function (value) { return value === null || value === void 0 ? void 0 : value.toString(); } } },
                     { EAN: { columnName: 'ean' } },
-                    { NCM: { columnName: 'ncm' } },
-                    'brand',
                     { costPrice: { columnName: 'cost_price' } },
-                    'description',
-                    { hasVariants: { columnName: 'has_variants' } },
-                    'images',
-                    'miniatures',
-                    'name',
-                    { price: { columnName: 'full_price' } },
-                    { price: { columnName: 'subscriber_discount_percentage' } },
-                    { price: { columnName: 'subscriber_price' } },
                     {
                         price: {
                             columnName: 'price',
                             from: function (price, data) { return Object.values(exports.Shops).reduce(function (prices, shop) {
-                                var _b;
-                                return (Object.assign(Object.assign({}, prices), (_b = {}, _b[shop] = {
+                                var _c;
+                                return (Object.assign(Object.assign({}, prices), (_c = {}, _c[shop] = {
                                     price: price,
                                     fullPrice: data.full_price,
                                     subscriberDiscountPercentage: data.subscriber_discount_percentage,
                                     subscriberPrice: data.subscriber_price,
-                                }, _b)));
+                                }, _c)));
                             }, {}); },
+                            bindFindFilter: function (sentence) {
+                                var filters = Object.values(sentence).shift();
+                                return Object.assign(Object.assign(Object.assign(Object.assign({}, (((filters === null || filters === void 0 ? void 0 : filters.price) || (filters === null || filters === void 0 ? void 0 : filters.price) === 0) && { price: filters.price })), ((filters.fullPrice || filters.fullPrice === 0) && { full_price: filters.fullPrice })), ((filters.subscriberDiscountPercentage || filters.subscriberDiscountPercentage === 0) && {
+                                    subscriber_discount_percentage: filters.subscriberDiscountPercentage,
+                                })), ((filters.subscriberPrice || filters.subscriberPrice === 0) && {
+                                    subscriber_price: filters.subscriberPrice,
+                                }));
+                            },
+                            bindPersistData: function (value) {
+                                var priceData = Object.values(value).shift();
+                                return Object.assign(Object.assign(Object.assign(Object.assign({}, ((priceData === null || priceData === void 0 ? void 0 : priceData.price) >= 0 && { price: priceData.price })), (priceData.fullPrice >= 0 && { full_price: priceData.fullPrice })), (priceData.subscriberDiscountPercentage >= 0 && {
+                                    subscriber_discount_percentage: priceData.subscriberDiscountPercentage,
+                                })), (priceData.subscriberPrice >= 0 && { subscriber_price: priceData.subscriberPrice }));
+                            },
                         },
                     },
-                    'published',
-                    { publishedGlam: { columnName: 'published_glam' } },
+                    { fullPrice: { columnName: 'full_price' } },
+                    { subscriberDiscountPercentage: { columnName: 'subscriber_discount_percentage' } },
+                    { subscriberPrice: { columnName: 'subscriber_price' } },
                     'sku',
                     {
                         stock: {
                             columnName: 'stock',
                             from: function (quantity) { return ({ quantity: quantity }); },
-                            to: function (value) { return (value === null || value === void 0 ? void 0 : value.quantity) || value; },
+                            to: function (value) { return (lodash.isNil(value === null || value === void 0 ? void 0 : value.quantity) ? value : value === null || value === void 0 ? void 0 : value.quantity); },
                         },
                     },
-                    'type',
-                    'video',
                     'weight',
+                    { name: { to: function () { return ''; }, from: function () { return undefined; } } },
+                    { hasVariants: { columnName: 'has_variants', to: function () { return false; }, from: function () { return undefined; } } },
+                    { createdAt: { columnName: 'created_at' } },
+                    { updatedAt: { columnName: 'updated_at' } },
                     {
-                        categories: {
-                            columnName: 'categories',
-                            fields: ['category_id'],
-                            to: function (category_id) { return +category_id; },
-                            from: function (categories) { return (categories === null || categories === void 0 ? void 0 : categories.map(function (category) { var _a; return (_a = category === null || category === void 0 ? void 0 : category.category_id) === null || _a === void 0 ? void 0 : _a.toString(); })) || []; },
-                        },
-                    },
-                    {
-                        shopAvailability: {
-                            columnName: 'shop_availabilities',
-                            fields: ['shop'],
-                            from: function (shop) { return (Array.isArray(shop) ? shop.map(function (row) { return row.shop; }) : []); },
+                        grade: {
+                            columnName: 'grade',
+                            type: HasuraGraphQLColumnType.Jsonb,
                         },
                     },
-                    { tags: { columnName: 'tags', type: HasuraGraphQLColumnType.Jsonb } },
-                    { createdAt: { columnName: 'created_at' } },
-                    { updatedAt: { columnName: 'updated_at' } },
                 ],
             }) || this;
         }
-        ProductHasuraGraphQLRepository.prototype.getBySlug = function (slug, shop) {
+        VariantHasuraGraphQLRepository.prototype.get = function (identifiers) {
+            var _super = Object.create(null, {
+                get: { get: function () { return _super_1.prototype.get; } }
+            });
             var _a;
             return __awaiter(this, void 0, void 0, function () {
-                var result;
-                return __generator(this, function (_b) {
-                    switch (_b.label) {
-                        case 0: return [4 /*yield*/, this.find({
-                                filters: {
-                                    slug: { operator: exports.Where.EQUALS, value: slug },
-                                    shopAvailability: { operator: exports.Where.IN, value: [shop] },
-                                },
-                            })];
+                var _c;
+                return __generator(this, function (_d) {
+                    switch (_d.label) {
+                        case 0:
+                            if (!Number.isNaN(+identifiers.id)) return [3 /*break*/, 2];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: identifiers.id } })];
                         case 1:
-                            result = _b.sent();
-                            return [2 /*return*/, (_a = result === null || result === void 0 ? void 0 : result.data) === null || _a === void 0 ? void 0 : _a.shift()];
+                            _c = (_a = (_d.sent()).data) === null || _a === void 0 ? void 0 : _a[0];
+                            return [3 /*break*/, 3];
+                        case 2:
+                            _c = _super.get.call(this, identifiers);
+                            _d.label = 3;
+                        case 3: return [2 /*return*/, _c];
                     }
                 });
             });
         };
-        return ProductHasuraGraphQLRepository;
+        VariantHasuraGraphQLRepository.prototype.find = function (params) {
+            var _super = Object.create(null, {
+                find: { get: function () { return _super_1.prototype.find; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var _a, filters, options;
+                return __generator(this, function (_c) {
+                    _a = params || {}, filters = _a.filters, options = __rest(_a, ["filters"]);
+                    return [2 /*return*/, _super.find.call(this, Object.assign(Object.assign({}, options), { filters: Object.assign(Object.assign({}, filters), { productId: { operator: exports.Where.ISNOTNULL } }) }))];
+                });
+            });
+        };
+        VariantHasuraGraphQLRepository.prototype.update = function (params) {
+            var _super = Object.create(null, {
+                update: { get: function () { return _super_1.prototype.update; } }
+            });
+            return __awaiter(this, void 0, void 0, function () {
+                var productId, checkId, data, dataWithProductId, id, product;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            productId = params.productId, checkId = params.id, data = __rest(params, ["productId", "id"]);
+                            dataWithProductId = this.paramsToPlain({ id: checkId, productId: productId });
+                            return [4 /*yield*/, this.getId(dataWithProductId.id)];
+                        case 1:
+                            id = _c.sent();
+                            return [4 /*yield*/, _super.update.call(this, Object.assign({ id: id }, data))];
+                        case 2:
+                            product = _c.sent();
+                            product.productId = dataWithProductId.productId;
+                            return [2 /*return*/, product];
+                    }
+                });
+            });
+        };
+        VariantHasuraGraphQLRepository.prototype.getId = function (id) {
+            var _a, _b;
+            return __awaiter(this, void 0, void 0, function () {
+                var data;
+                return __generator(this, function (_c) {
+                    switch (_c.label) {
+                        case 0:
+                            if (!Number.isNaN(+id))
+                                return [2 /*return*/, id];
+                            return [4 /*yield*/, this.find({ filters: { firestoreId: id } })];
+                        case 1:
+                            data = (_c.sent()).data;
+                            if ((_a = data === null || data === void 0 ? void 0 : data[0]) === null || _a === void 0 ? void 0 : _a.id)
+                                return [2 /*return*/, (_b = data === null || data === void 0 ? void 0 : data[0]) === null || _b === void 0 ? void 0 : _b.id];
+                            throw new NotFoundError("Product with id " + id + " not found");
+                    }
+                });
+            });
+        };
+        return VariantHasuraGraphQLRepository;
     }(withCrudHasuraGraphQL(withHasuraGraphQL(Base))));
 
     /**
@@ -3683,6 +4653,7 @@
     exports.Buy2WinFirestoreRepository = Buy2WinFirestoreRepository;
     exports.Category = Category;
     exports.CategoryFirestoreRepository = CategoryFirestoreRepository;
+    exports.CategoryHasuraGraphQL = CategoryHasuraGraphQL;
     exports.CategoryHasuraGraphQLRepository = CategoryHasuraGraphQLRepository;
     exports.Checkout = Checkout;
     exports.CheckoutFirestoreRepository = CheckoutFirestoreRepository;
@@ -3696,6 +4667,8 @@
     exports.Home = Home;
     exports.HomeFirestoreRepository = HomeFirestoreRepository;
     exports.InvalidArgumentError = InvalidArgumentError;
+    exports.KitProduct = KitProduct;
+    exports.KitProductHasuraGraphQL = KitProductHasuraGraphQL;
     exports.Lead = Lead;
     exports.LeadFirestoreRepository = LeadFirestoreRepository;
     exports.LegacyOrderFirestoreRepository = LegacyOrderFirestoreRepository;
@@ -3707,6 +4680,7 @@
     exports.PaymentFirestoreRepository = PaymentFirestoreRepository;
     exports.Product = Product;
     exports.ProductFirestoreRepository = ProductFirestoreRepository;
+    exports.ProductHasuraGraphQL = ProductHasuraGraphQL;
     exports.ProductHasuraGraphQLRepository = ProductHasuraGraphQLRepository;
     exports.ProductVariantFirestoreRepository = ProductVariantFirestoreRepository;
     exports.ProductsIndex = ProductsIndex;
@@ -3737,6 +4711,8 @@
     exports.UserPaymentMethodFirestoreRepository = UserPaymentMethodFirestoreRepository;
     exports.UserSearchFirestoreRepository = UserSearchFirestoreRepository;
     exports.Variant = Variant;
+    exports.VariantHasuraGraphQL = VariantHasuraGraphQL;
+    exports.VariantHasuraGraphQLRepository = VariantHasuraGraphQLRepository;
     exports.WeakPasswordError = WeakPasswordError;
     exports.isUUID = isUUID;
     exports.parseDateTime = parseDateTime;