diff --git a/.gitmodules b/.gitmodules index a3fbbf86..ed295a19 100644 --- a/.gitmodules +++ b/.gitmodules @@ -10,9 +10,6 @@ [submodule "3rdParty/URLCanonicalizer"] path = 3rdParty/URLCanonicalizer url = https://github.com/Targoman/URLCanonicalizer.git -[submodule "3rdParty/E4MT"] - path = 3rdParty/E4MT - url = https://github.com/Targoman/E4MT.git [submodule "3rdParty/QtCurl"] path = 3rdParty/QtCurl url = https://github.com/Targoman/qtcurl.git @@ -28,3 +25,6 @@ [submodule "3rdParty/TargomanCommon"] path = 3rdParty/TargomanCommon url = https://github.com/Targoman/TargomanCommon.git +[submodule "3rdParty/E4MT"] + path = 3rdParty/E4MT + url = git@github.com:Targoman/E4MT.git diff --git a/3rdParty/E4MT b/3rdParty/E4MT index 759a6a67..5ab9db61 160000 --- a/3rdParty/E4MT +++ b/3rdParty/E4MT @@ -1 +1 @@ -Subproject commit 759a6a67c544ba2557f289319725a61ddcb30dad +Subproject commit 5ab9db6176da829bcb00b785678602748089153c diff --git a/3rdParty/QBuildSystem b/3rdParty/QBuildSystem index 522ea000..3f582caa 160000 --- a/3rdParty/QBuildSystem +++ b/3rdParty/QBuildSystem @@ -1 +1 @@ -Subproject commit 522ea000070bd80c92ab29f85375b4c51ddce7c3 +Subproject commit 3f582caab7e07484b7984cf7dfed5f267b5dbb3d diff --git a/3rdParty/TargomanCommon b/3rdParty/TargomanCommon index fc16bab0..8111b949 160000 --- a/3rdParty/TargomanCommon +++ b/3rdParty/TargomanCommon @@ -1 +1 @@ -Subproject commit fc16bab0226eb4ff4db4cc321e6a5e86761dfec1 +Subproject commit 8111b949d6174e369c082fe8c893a8a1601561a4 diff --git a/3rdParty/TargomanDBM b/3rdParty/TargomanDBM index c19fb002..83322dd9 160000 --- a/3rdParty/TargomanDBM +++ b/3rdParty/TargomanDBM @@ -1 +1 @@ -Subproject commit c19fb002367b46872b7005e5200d08252f43536c +Subproject commit 83322dd9e3a2db9133047e5a7a1fd0af6cf8151e diff --git a/Interfaces/AAA/Accounting_Defs.hpp b/Interfaces/AAA/Accounting_Defs.hpp index cfafe228..9bc429f0 100644 --- a/Interfaces/AAA/Accounting_Defs.hpp +++ b/Interfaces/AAA/Accounting_Defs.hpp @@ -141,6 +141,30 @@ TAPI_DEFINE_VARIANT_ENABLED_STRUCT(stuUsage, typedef QMap UsageLimits_t; +#define SF_UsageLimits_t(_name) SF_Generic( \ + /* type */ UsageLimits_t, \ + /* name */ Digested_Limits, \ + /* def */ UsageLimits_t(), \ + /* validator */ v.size(), \ + /* type 2 QJsonValue */ [](UsageLimits_t v) -> QJsonValue { \ + QJsonObject A; \ + for (auto it = v.begin(); \ + it != v.end(); \ + it++ \ + ) { \ + A.insert(it.key(), it->toJson()); \ + } \ + return A; \ + }(v), \ + /* QJsonValue 2 type */ [](QJsonValue v) -> UsageLimits_t { \ + UsageLimits_t L; \ + QJsonObject O = v.toObject(); \ + foreach (const QString &Key, O.keys()) \ + L.insert(Key, stuUsage().fromJson(O.value(Key).toObject())); \ + return L; \ + }(v) \ + ) + struct stuUsageColDefinition { QString PerDay; QString PerWeek; @@ -156,51 +180,77 @@ typedef QMap AssetUsageLimitsCols_t; typedef QMap OrderAdditives_t; -struct stuAssetItem { +TAPI_DEFINE_VARIANT_ENABLED_STRUCT(stuAssetItem, //product - quint32 prdID; - TAPI::ProductCode_t prdCode; - QString prdName; - TAPI::Date_t prdValidFromDate; - TAPI::Date_t prdValidToDate; - NULLABLE_TYPE(quint8) prdValidFromHour; - NULLABLE_TYPE(quint8) prdValidToHour; - TAPI::PrivObject_t prdPrivs; - NULLABLE_TYPE(double) prdVAT; - quint32 prdInStockQty; - NULLABLE_TYPE(quint32) prdOrderedQty; - NULLABLE_TYPE(quint32) prdReturnedQty; - TAPI::enuGenericStatus::Type prdStatus; + SF_quint32 (prdID), + SF_QString (prdCode), //TAPI::ProductCode_t + SF_QString (prdName), + SF_Date_t (prdValidFromDate), + SF_Date_t (prdValidToDate), + SF_NULLABLE_quint8 (prdValidFromHour), + SF_NULLABLE_quint8 (prdValidToHour), + SF_JSON_t (prdPrivs), //TAPI::PrivObject_t + SF_NULLABLE_qreal (prdVAT), + SF_quint32 (prdInStockQty), + SF_NULLABLE_quint32 (prdOrderedQty), + SF_NULLABLE_quint32 (prdReturnedQty), + SF_Enum (TAPI::enuGenericStatus, prdStatus, TAPI::enuGenericStatus::Active), //saleable - quint32 slbID; - TAPI::SaleableCode_t slbCode; - QString slbName; - TAPI::JSON_t slbPrivs; - qreal slbBasePrice; - TAPI::SaleableAdditive_t slbAdditives; -// quint32 slbProductCount; - NULLABLE_TYPE(quint32) slbMaxSaleCountPerUser; - quint32 slbInStockQty; - NULLABLE_TYPE(quint32) slbOrderedQty; - NULLABLE_TYPE(quint32) slbReturnedQty; - QString slbVoucherTemplate; - TAPI::enuGenericStatus::Type slbStatus; - - qreal SubTotal; - NULLABLE_TYPE(stuDiscount3) Discount; - qreal TotalPrice; - + SF_quint32 (slbID), + SF_QString (slbCode), //TAPI::SaleableCode_t + SF_QString (slbName), + SF_JSON_t (slbPrivs), + SF_qreal (slbBasePrice), + SF_JSON_t (slbAdditives), //TAPI::SaleableAdditive_t +// SF_quint32 (slbProductCount), + SF_NULLABLE_quint32 (slbMaxSaleCountPerUser), + SF_quint32 (slbInStockQty), + SF_NULLABLE_quint32 (slbOrderedQty), + SF_NULLABLE_quint32 (slbReturnedQty), + SF_QString (slbVoucherTemplate), + SF_Enum (TAPI::enuGenericStatus, slbStatus, TAPI::enuGenericStatus::Active), + + SF_qreal (SubTotal), + SF_Var_Struct (stuDiscount3, Discount, [](Q_DECL_UNUSED auto v) { return true; }(v)), //NULLABLE_TYPE + SF_qreal (TotalPrice), + + /* struct { // QJsonObject Additives; UsageLimits_t Limits; // QJsonObject Privs; - } Digested; + } Digested;*/ - QJsonObject toJson(bool _full); - stuAssetItem& fromJson(const QJsonObject& _obj); - void fromVariantMap(const QVariantMap& _info); -}; +// SF_UsageLimits_t(Digested_Limits) + SF_Generic( + /* type */ UsageLimits_t, + /* name */ Digested_Limits, + /* def */ UsageLimits_t(), + /* validator */ v.size(), + /* type 2 QJsonValue */ [](UsageLimits_t v) -> QJsonValue { + QJsonObject A; + for (auto it = v.begin(); + it != v.end(); + it++ + ) { + A.insert(it.key(), it->toJson()); + } + return A; + }(v), + /* QJsonValue 2 type */ [](QJsonValue v) -> UsageLimits_t { + UsageLimits_t L; + QJsonObject O = v.toObject(); + foreach (const QString &Key, O.keys()) + L.insert(Key, stuUsage().fromJson(O.value(Key).toObject())); + return L; + }(v) + ) + +// QJsonObject toJson(bool _full); +// stuAssetItem& fromJson(const QJsonObject& _obj); +// void fromVariantMap(const QVariantMap& _info); +); typedef QMap ActiveCredits_t; @@ -218,6 +268,7 @@ struct stuServiceCreditsInfo { QDateTime _dbCurrentDateTime); }; +/* struct stuActiveCredit { stuAssetItem Credit; bool IsFromParent; @@ -228,9 +279,41 @@ struct stuActiveCredit { bool _isFromParent = false, const UsageLimits_t& _myLimitsOnParent = {}, qint64 _ttl = 0); - QJsonObject toJson(bool _full); - stuActiveCredit& fromJson(const QJsonObject _obj); + +// QJsonObject toJson(bool _full); +// stuActiveCredit& fromJson(const QJsonObject _obj); }; +*/ + +TAPI_DEFINE_VARIANT_ENABLED_STRUCT(stuActiveCredit, + SF_Var_Struct(stuAssetItem, Credit, v.prdID), + SF_bool(IsFromParent), +// SF_UsageLimits_t(MyLimitsOnParent), + SF_Generic( + /* type */ UsageLimits_t, + /* name */ MyLimitsOnParent, + /* def */ UsageLimits_t(), + /* validator */ v.size(), + /* type 2 QJsonValue */ [](UsageLimits_t v) -> QJsonValue { + QJsonObject A; + for (auto it = v.begin(); + it != v.end(); + it++ + ) { + A.insert(it.key(), it->toJson()); + } + return A; + }(v), + /* QJsonValue 2 type */ [](QJsonValue v) -> UsageLimits_t { + UsageLimits_t L; + QJsonObject O = v.toObject(); + foreach (const QString &Key, O.keys()) + L.insert(Key, stuUsage().fromJson(O.value(Key).toObject())); + return L; + }(v) + ), + SF_qint64(TTL) +); typedef QList InvItems_t; @@ -276,6 +359,7 @@ extern void checkPreVoucherSanity(stuPreVoucher _preVoucher); namespace tblAccountProductsBase { constexpr char Name[] = "tblAccountProducts"; + TARGOMAN_CREATE_CONSTEXPR(prdID); TARGOMAN_CREATE_CONSTEXPR(prdCode); TARGOMAN_CREATE_CONSTEXPR(prdName); @@ -297,10 +381,35 @@ namespace tblAccountProductsBase { TARGOMAN_CREATE_CONSTEXPR(prdCreatedBy_usrID); TARGOMAN_CREATE_CONSTEXPR(prdCreationDateTime); TARGOMAN_CREATE_CONSTEXPR(prdUpdatedBy_usrID); + + inline QStringList ColumnNames() { + return { + prdID, + prdCode, + prdName, + prdDesc, + prdValidFromDate, + prdValidToDate, + prdValidFromHour, + prdValidToHour, + prdPrivs, + prdVAT, + prdInStockQty, + prdOrderedQty, + prdReturnedQty, + // prdRemainingCount = prdInStockQty - (prdOrderedQty - prdReturnedQty) + prdStatus, + prdCreatedBy_usrID, + prdCreationDateTime, + prdUpdatedBy_usrID, + }; + } + } namespace tblAccountSaleablesBase { constexpr char Name[] = "tblAccountSaleables"; + TARGOMAN_CREATE_CONSTEXPR(slbID); TARGOMAN_CREATE_CONSTEXPR(slb_prdID); TARGOMAN_CREATE_CONSTEXPR(slbCode); @@ -326,10 +435,39 @@ namespace tblAccountSaleablesBase { TARGOMAN_CREATE_CONSTEXPR(slbCreatedBy_usrID); TARGOMAN_CREATE_CONSTEXPR(slbCreationDateTime); TARGOMAN_CREATE_CONSTEXPR(slbUpdatedBy_usrID); + + inline QStringList ColumnNames() { + return { + slbID, + slb_prdID, + slbCode, + slbName, + slbDesc, + slbType, + slbAvailableFromDate, + slbAvailableToDate, + slbPrivs, + slbBasePrice, + slbAdditives, +// slbProductCount, //what is this? + slbMaxSaleCountPerUser, + slbInStockQty, + slbOrderedQty, + slbReturnedQty, +// slbRemainingCount = slbInStockQty - (slbOrderedQty - slbReturnedQty) + slbVoucherTemplate, + slbStatus, + slbCreatedBy_usrID, + slbCreationDateTime, + slbUpdatedBy_usrID, + }; + } + } namespace tblAccountUserAssetsBase { constexpr char Name[] = "tblAccountUserAssets"; + TARGOMAN_CREATE_CONSTEXPR(uasID); TARGOMAN_CREATE_CONSTEXPR(uas_usrID); TARGOMAN_CREATE_CONSTEXPR(uas_slbID); @@ -382,6 +520,7 @@ namespace tblAccountCouponsBase { namespace tblAccountReferalsBase { constexpr char Name[] = "tblAccountReferals"; + TARGOMAN_CREATE_CONSTEXPR(ref_usrID); TARGOMAN_CREATE_CONSTEXPR(refValidFromDateTime); TARGOMAN_CREATE_CONSTEXPR(refValidToDateTime); diff --git a/Interfaces/AAA/Accounting_Interfaces.cpp b/Interfaces/AAA/Accounting_Interfaces.cpp index 9895f7e8..e3c604f3 100644 --- a/Interfaces/AAA/Accounting_Interfaces.cpp +++ b/Interfaces/AAA/Accounting_Interfaces.cpp @@ -187,10 +187,10 @@ namespace Targoman::API::AAA { //constexpr char PKG_LIMITS[] = "LM"; //constexpr char PKG_PROPS[] = "PP"; -constexpr char ASA_PACKAGE[] = "PK"; -constexpr char ASA_ISFROMPARENT[] = "IP"; -constexpr char ASA_TTL[] = "TT"; -constexpr char ASA_LIMITSONPARENT[] = "LP"; +//constexpr char ASA_PACKAGE[] = "PK"; +//constexpr char ASA_ISFROMPARENT[] = "IP"; +//constexpr char ASA_TTL[] = "TT"; +//constexpr char ASA_LIMITSONPARENT[] = "LP"; /******************************************************************/ intfAccountProducts::intfAccountProducts( @@ -249,25 +249,25 @@ QVariant IMPL_ORMGET(intfAccountProducts) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); constexpr quint16 CACHE_TIME = 15 * 60; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, CACHE_TIME); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, CACHE_TIME); } quint32 IMPL_ORMCREATE(intfAccountProducts) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(intfAccountProducts) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(intfAccountProducts) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } /******************************************************************/ @@ -344,25 +344,25 @@ QVariant IMPL_ORMGET(intfAccountSaleables) { ); constexpr quint16 CACHE_TIME = 15 * 60; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, ExtraFilters, CACHE_TIME); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, ExtraFilters, CACHE_TIME); } quint32 IMPL_ORMCREATE(intfAccountSaleables) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(intfAccountSaleables) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(intfAccountSaleables) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } /******************************************************************/ @@ -420,7 +420,7 @@ QVariant IMPL_ORMGET(intfAccountUserAssets) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false) this->setSelfFilters({{tblAccountUserAssetsBase::uas_usrID, _APICALLBOOM.getUserID() }}, _filters); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } bool IMPL_REST_UPDATE(intfAccountUserAssets, setAsPrefered, ( @@ -484,7 +484,7 @@ QVariant IMPL_ORMGET(intfAccountAssetUsage) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false) this->setSelfFilters({{tblAccountUserAssetsBase::uas_usrID, _APICALLBOOM.getUserID()}}, _filters); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } /******************************************************************/ @@ -539,7 +539,7 @@ intfAccountCoupons::intfAccountCoupons( QVariant IMPL_ORMGET(intfAccountCoupons) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -549,19 +549,19 @@ QVariant IMPL_ORMGET(intfAccountCoupons) { quint32 IMPL_ORMCREATE(intfAccountCoupons) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(intfAccountCoupons) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(intfAccountCoupons) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } /******************************************************************/ @@ -581,7 +581,7 @@ intfAccountPrizes::intfAccountPrizes( QVariant IMPL_ORMGET(intfAccountPrizes) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -591,19 +591,19 @@ QVariant IMPL_ORMGET(intfAccountPrizes) { quint32 IMPL_ORMCREATE(intfAccountPrizes) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(intfAccountPrizes) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(intfAccountPrizes) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } //} //namespace Targoman::API::AAA { @@ -613,38 +613,38 @@ bool IMPL_ORMDELETE(intfAccountPrizes) { //using namespace Targoman::API::AAA; -stuActiveCredit::stuActiveCredit(const stuAssetItem& _credit, bool _isFromParent, const UsageLimits_t& _myLimitsOnParent, qint64 _ttl) : - Credit(_credit), - IsFromParent(_isFromParent), - MyLimitsOnParent(_myLimitsOnParent), - TTL(_ttl) { ; } - -QJsonObject stuActiveCredit::toJson(bool _full) { - QJsonObject Account = { - { ASA_PACKAGE, this->Credit.toJson(_full) }, - { ASA_TTL, static_cast(this->TTL) }, - }; - if (this->IsFromParent) - Account.insert(ASA_ISFROMPARENT, true); - for (auto LimitIter = this->MyLimitsOnParent.begin(); - LimitIter != this->MyLimitsOnParent.end(); - LimitIter++) - Account.insert(LimitIter.key(), LimitIter->toJson()); - return Account; -} - -stuActiveCredit& stuActiveCredit::fromJson(const QJsonObject _obj) { - this->Credit = stuAssetItem().fromJson(_obj.value(ASA_PACKAGE).toObject()); - this->IsFromParent = _obj.value(ASA_ISFROMPARENT).toBool(); - this->TTL = static_cast(_obj.value(ASA_TTL).toDouble()); - QJsonObject Limits = _obj.value(ASA_LIMITSONPARENT).toObject(); - for (auto LimitIter = Limits.begin(); - LimitIter != Limits.end(); - LimitIter++) - this->MyLimitsOnParent.insert(LimitIter.key(), stuUsage().fromJson(LimitIter->toObject())); - - return *this; -} +//stuActiveCredit::stuActiveCredit(const stuAssetItem& _credit, bool _isFromParent, const UsageLimits_t& _myLimitsOnParent, qint64 _ttl) : +// Credit(_credit), +// IsFromParent(_isFromParent), +// MyLimitsOnParent(_myLimitsOnParent), +// TTL(_ttl) { ; } + +//QJsonObject stuActiveCredit::toJson(bool _full) { +// QJsonObject Account = { +// { ASA_PACKAGE, this->Credit.toJson(_full) }, +// { ASA_TTL, static_cast(this->TTL) }, +// }; +// if (this->IsFromParent) +// Account.insert(ASA_ISFROMPARENT, true); +// for (auto LimitIter = this->MyLimitsOnParent.begin(); +// LimitIter != this->MyLimitsOnParent.end(); +// LimitIter++) +// Account.insert(LimitIter.key(), LimitIter->toJson()); +// return Account; +//} + +//stuActiveCredit& stuActiveCredit::fromJson(const QJsonObject _obj) { +// this->Credit = stuAssetItem().fromJson(_obj.value(ASA_PACKAGE).toObject()); +// this->IsFromParent = _obj.value(ASA_ISFROMPARENT).toBool(); +// this->TTL = static_cast(_obj.value(ASA_TTL).toDouble()); +// QJsonObject Limits = _obj.value(ASA_LIMITSONPARENT).toObject(); +// for (auto LimitIter = Limits.begin(); +// LimitIter != Limits.end(); +// LimitIter++) +// this->MyLimitsOnParent.insert(LimitIter.key(), stuUsage().fromJson(LimitIter->toObject())); + +// return *this; +//} /******************************************************************/ stuServiceCreditsInfo::stuServiceCreditsInfo( @@ -659,9 +659,9 @@ stuServiceCreditsInfo::stuServiceCreditsInfo( MyLimitsOnParent(_myLimitsOnParent), DBCurrentDateTime(_dbCurrentDateTime) { ; } -QJsonObject stuAssetItem::toJson(bool _full) { - ///TODO: very important: Complete this - QJsonObject Info; +//QJsonObject stuAssetItem::toJson(bool _full) { +// ///TODO: very important: Complete this +// QJsonObject Info; /* if (this->PackageID > 0) Info[PKG_ID] = static_cast(this->PackageID); if (this->PackageCode > -1) Info[PKG_CODE] = this->PackageCode; @@ -680,30 +680,31 @@ QJsonObject stuAssetItem::toJson(bool _full) { Limits.insert(LimitIter.key(), LimitIter->toJson()); Info[PKG_LIMITS] = Limits; }*/ - return Info; -} +// return Info; +//} -stuAssetItem &stuAssetItem::fromJson(const QJsonObject& _obj) { - ///TODO: very important: Complete this - /* - this->PackageID = static_cast(_obj.contains(PKG_ID) ? _obj.value(PKG_ID).toDouble() : 0); - this->PackageCode = _obj.contains(PKG_CODE) ? _obj.value(PKG_CODE).toString() : QString(); - this->RemainingDays = static_cast(_obj.contains(PKG_REMAININGDAYS) ? _obj.value(PKG_REMAININGDAYS).toInt() : -1); - this->RemainingHours = static_cast(_obj.contains(PKG_REMAININGHOURS) ? _obj.value(PKG_REMAININGHOURS).toInt() : -1); - this->StartDate = _obj.contains(PKG_STARTDATE) ? QDate::fromString(_obj.value(PKG_STARTDATE).toString()) : QDate(); - this->EndDate = _obj.contains(PKG_ENDDATE) ? QDate::fromString(_obj.value(PKG_ENDDATE).toString()) : QDate(); - this->StartTime = _obj.contains(PKG_STARTTIME) ? QTime::fromString(_obj.value(PKG_STARTTIME).toString()) : QTime(); - this->EndTime = _obj.contains(PKG_ENDTIME) ? QTime::fromString(_obj.value(PKG_ENDTIME).toString()) : QTime(); - this->Properties = _obj.value(PKG_PROPS).toObject(); - QJsonObject Limits = _obj.value(PKG_LIMITS).toObject(); - for (auto LimitIter = Limits.begin(); - LimitIter != Limits.end(); - LimitIter++) - this->Remaining.insert(LimitIter.key(), stuUsage().fromJson(LimitIter->toObject())); - */ - return *this; -} +//stuAssetItem &stuAssetItem::fromJson(const QJsonObject& _obj) { +// ///TODO: very important: Complete this +// return *this; +/* +this->PackageID = static_cast(_obj.contains(PKG_ID) ? _obj.value(PKG_ID).toDouble() : 0); +this->PackageCode = _obj.contains(PKG_CODE) ? _obj.value(PKG_CODE).toString() : QString(); +this->RemainingDays = static_cast(_obj.contains(PKG_REMAININGDAYS) ? _obj.value(PKG_REMAININGDAYS).toInt() : -1); +this->RemainingHours = static_cast(_obj.contains(PKG_REMAININGHOURS) ? _obj.value(PKG_REMAININGHOURS).toInt() : -1); +this->StartDate = _obj.contains(PKG_STARTDATE) ? QDate::fromString(_obj.value(PKG_STARTDATE).toString()) : QDate(); +this->EndDate = _obj.contains(PKG_ENDDATE) ? QDate::fromString(_obj.value(PKG_ENDDATE).toString()) : QDate(); +this->StartTime = _obj.contains(PKG_STARTTIME) ? QTime::fromString(_obj.value(PKG_STARTTIME).toString()) : QTime(); +this->EndTime = _obj.contains(PKG_ENDTIME) ? QTime::fromString(_obj.value(PKG_ENDTIME).toString()) : QTime(); +this->Properties = _obj.value(PKG_PROPS).toObject(); +QJsonObject Limits = _obj.value(PKG_LIMITS).toObject(); +for (auto LimitIter = Limits.begin(); + LimitIter != Limits.end(); + LimitIter++) + this->Remaining.insert(LimitIter.key(), stuUsage().fromJson(LimitIter->toObject())); + */ + //} +/* void stuAssetItem::fromVariantMap(const QVariantMap& _info) { SET_FIELD_FROM_VARIANT_MAP(this->prdID, _info, tblAccountProductsBase, prdID); SET_FIELD_FROM_VARIANT_MAP(this->prdCode, _info, tblAccountProductsBase, prdCode); @@ -733,6 +734,7 @@ void stuAssetItem::fromVariantMap(const QVariantMap& _info) { SET_FIELD_FROM_VARIANT_MAP(this->slbVoucherTemplate, _info, tblAccountSaleablesBase, slbVoucherTemplate); SET_FIELD_FROM_VARIANT_MAP(this->slbStatus, _info, tblAccountSaleablesBase, slbStatus); } +*/ void stuFullDiscount::fromVariantMap(const QVariantMap& _info) { SET_FIELD_FROM_VARIANT_MAP(this->cpnID, _info, tblAccountCouponsBase, cpnID); diff --git a/Interfaces/AAA/PrivHelpers.cpp b/Interfaces/AAA/PrivHelpers.cpp index 50f56c3a..9451a11e 100644 --- a/Interfaces/AAA/PrivHelpers.cpp +++ b/Interfaces/AAA/PrivHelpers.cpp @@ -49,7 +49,14 @@ stuActiveAccount PrivHelpers::digestPrivileges(const QJsonArray& _privs, quint64 if (PrivIter.key() != "ALL") { Targoman::API::AAA::stuActiveCredit ActiveAccount = serviceAccounting(PrivIter.key())->activeAccountObject(_usrID); if (ActiveAccount.TTL) { - Privs = Targoman::Common::mergeJsonObjects(Privs, QJsonObject({ {PrivIter.key(), ActiveAccount.toJson(false)}}).begin()); + + + + ///@TODO: VERY IMPORTANT fix toJson(false) + Privs = Targoman::Common::mergeJsonObjects(Privs, QJsonObject({ { PrivIter.key(), ActiveAccount.toJson(/*false*/) } }).begin()); + + + if (ActiveAccount.TTL > 0 && ActiveAccount.TTL < MinTTL) MinTTL = ActiveAccount.TTL; } diff --git a/Interfaces/AAA/intfAccountingBasedModule.cpp b/Interfaces/AAA/intfAccountingBasedModule.cpp index d48cfa26..3aeead32 100644 --- a/Interfaces/AAA/intfAccountingBasedModule.cpp +++ b/Interfaces/AAA/intfAccountingBasedModule.cpp @@ -150,28 +150,28 @@ void intfAccountingBasedModule::checkUsageIsAllowed( for (auto UsageIter = _requestedUsage.begin(); UsageIter != _requestedUsage.end(); UsageIter++) { - if (ActiveCredit.Digested.Limits.contains(UsageIter.key()) == false) + if (ActiveCredit.Digested_Limits.contains(UsageIter.key()) == false) continue; if (this->isUnlimited(BestMatchedCredit.MyLimitsOnParent) == false) checkCredit(UsageIter, BestMatchedCredit.MyLimitsOnParent.value(UsageIter.key()), "Own"); - checkCredit(UsageIter, ActiveCredit.Digested.Limits.value(UsageIter.key()), "Parent"); + checkCredit(UsageIter, ActiveCredit.Digested_Limits.value(UsageIter.key()), "Parent"); } return; } - if (this->isUnlimited(ActiveCredit.Digested.Limits)) + if (this->isUnlimited(ActiveCredit.Digested_Limits)) return; for (auto UsageIter = _requestedUsage.begin(); UsageIter != _requestedUsage.end(); UsageIter++) { - if (ActiveCredit.Digested.Limits.contains(UsageIter.key()) == false) + if (ActiveCredit.Digested_Limits.contains(UsageIter.key()) == false) continue; - checkCredit(UsageIter, ActiveCredit.Digested.Limits.value(UsageIter.key()), "Self"); + checkCredit(UsageIter, ActiveCredit.Digested_Limits.value(UsageIter.key()), "Self"); } } @@ -207,7 +207,7 @@ stuActiveCredit intfAccountingBasedModule::findBestMatchedCredit( || (_assetItem.prdValidToDate.isValid() && _assetItem.prdValidToDate < Now.date()) || (NULLABLE_HAS_VALUE(_assetItem.prdValidFromHour) && Now < effectiveStartDateTime(_assetItem)) || (NULLABLE_HAS_VALUE(_assetItem.prdValidToHour) && Now > effectiveEndDateTime(_assetItem)) - || this->isEmpty(_assetItem.Digested.Limits) + || this->isEmpty(_assetItem.Digested_Limits) ) return false; @@ -215,11 +215,11 @@ stuActiveCredit intfAccountingBasedModule::findBestMatchedCredit( for (auto UsageIter = _requestedUsage.begin(); UsageIter != _requestedUsage.end(); UsageIter++) { - if (_assetItem.Digested.Limits.contains(UsageIter.key()) == false) + if (_assetItem.Digested_Limits.contains(UsageIter.key()) == false) continue; - if (this->isUnlimited(_assetItem.Digested.Limits) == false) { - stuUsage Remaining = _assetItem.Digested.Limits.value(UsageIter.key()); + if (this->isUnlimited(_assetItem.Digested_Limits) == false) { + stuUsage Remaining = _assetItem.Digested_Limits.value(UsageIter.key()); if ((NULLABLE_HAS_VALUE(Remaining.PerDay) && *Remaining.PerDay - UsageIter.value() <= 0) || (NULLABLE_HAS_VALUE(Remaining.PerWeek) && *Remaining.PerWeek - UsageIter.value() <= 0) || (NULLABLE_HAS_VALUE(Remaining.PerMonth) && *Remaining.PerMonth - UsageIter.value() <= 0) @@ -241,8 +241,8 @@ stuActiveCredit intfAccountingBasedModule::findBestMatchedCredit( auto comparePackages = [this, &effectiveEndDateTime] (const stuAssetItem& a, stuAssetItem& b) { if (a.prdValidToDate.isValid() && b.prdValidToDate.isValid() == false) return -1; if (a.prdValidToDate.isValid() == false && b.prdValidToDate.isValid()) return 1; - if (this->isUnlimited(a.Digested.Limits) && this->isUnlimited(b.Digested.Limits) == false) return -1; - if (this->isUnlimited(a.Digested.Limits) == false && this->isUnlimited(b.Digested.Limits)) return 1; + if (this->isUnlimited(a.Digested_Limits) && this->isUnlimited(b.Digested_Limits) == false) return -1; + if (this->isUnlimited(a.Digested_Limits) == false && this->isUnlimited(b.Digested_Limits)) return 1; if (NULLABLE_HAS_VALUE(a.prdValidToHour) && NULLABLE_IS_NULL(b.prdValidToHour)) return -1; if (NULLABLE_IS_NULL(a.prdValidToHour) && NULLABLE_HAS_VALUE(b.prdValidToHour)) return 1; if (NULLABLE_HAS_VALUE(a.prdValidToHour) && NULLABLE_HAS_VALUE(b.prdValidToHour)) { @@ -327,47 +327,8 @@ Targoman::API::AAA::stuPreVoucher IMPL_REST_POST(intfAccountingBasedModule, addT throw exHTTPBadRequest("invalid pre-Voucher owner"); QVariantMap SaleableInfo = SelectQuery(*this->AccountSaleables) - .addCols(QStringList({ - tblAccountSaleablesBase::slbID, - tblAccountSaleablesBase::slbCode, - //tblAccountSaleablesBase::slb_prdID, - tblAccountSaleablesBase::slbName, - //tblAccountSaleablesBase::slbDesc, - //tblAccountSaleablesBase::slbType, - tblAccountSaleablesBase::slbAvailableFromDate, - tblAccountSaleablesBase::slbAvailableToDate, - //tblAccountSaleablesBase::slbPrivs, - tblAccountSaleablesBase::slbBasePrice, - tblAccountSaleablesBase::slbAdditives, -// tblAccountSaleablesBase::slbProductCount, - tblAccountSaleablesBase::slbMaxSaleCountPerUser, - tblAccountSaleablesBase::slbInStockQty, - tblAccountSaleablesBase::slbOrderedQty, - tblAccountSaleablesBase::slbReturnedQty, - tblAccountSaleablesBase::slbVoucherTemplate, - tblAccountSaleablesBase::slbStatus, - //tblAccountSaleablesBase::slbCreatedBy_usrID, - //tblAccountSaleablesBase::slbCreationDateTime, - //tblAccountSaleablesBase::slbUpdatedBy_usrID, - - tblAccountProductsBase::prdID, - tblAccountProductsBase::prdCode, - tblAccountProductsBase::prdName, - //tblAccountProductsBase::prdDesc, - tblAccountProductsBase::prdValidFromDate, - tblAccountProductsBase::prdValidToDate, - tblAccountProductsBase::prdValidFromHour, - tblAccountProductsBase::prdValidToHour, - //tblAccountProductsBase::prdPrivs, - tblAccountProductsBase::prdVAT, - tblAccountProductsBase::prdInStockQty, - tblAccountProductsBase::prdOrderedQty, - tblAccountProductsBase::prdReturnedQty, - tblAccountProductsBase::prdStatus, - //tblAccountProductsBase::prdCreatedBy_usrID, - //tblAccountProductsBase::prdCreationDateTime, - //tblAccountProductsBase::prdUpdatedBy_usrID, - })) + .addCols(tblAccountSaleablesBase::ColumnNames()) + .addCols(tblAccountProductsBase::ColumnNames()) .addCols(this->AssetUsageLimitsColsName) .leftJoinWith("product") .where({ tblAccountSaleablesBase::slbCode, enuConditionOperator::Equal, _saleableCode }) @@ -381,7 +342,7 @@ Targoman::API::AAA::stuPreVoucher IMPL_REST_POST(intfAccountingBasedModule, addT qDebug() << "intfAccountingBasedModule::addToBasket : SaleableInfo" << SaleableInfo; stuAssetItem AssetItem; - AssetItem.fromVariantMap(SaleableInfo); + AssetItem.fromJson(QJsonObject::fromVariantMap(SaleableInfo)); //-- check available count -------------------------------- qreal AvailableProductQty = AssetItem.prdInStockQty - (NULLABLE_GET_OR_DEFAULT(AssetItem.prdOrderedQty, 0) - NULLABLE_GET_OR_DEFAULT(AssetItem.prdReturnedQty, 0)); @@ -411,7 +372,7 @@ Targoman::API::AAA::stuPreVoucher IMPL_REST_POST(intfAccountingBasedModule, addT } ); } - AssetItem.Digested.Limits = SaleableUsageLimits; + AssetItem.Digested_Limits = SaleableUsageLimits; AssetItem.SubTotal = AssetItem.slbBasePrice * _qty; AssetItem.TotalPrice = AssetItem.SubTotal; diff --git a/Interfaces/API/intfPureModule.h b/Interfaces/API/intfPureModule.h index 8bc0993d..beef5024 100644 --- a/Interfaces/API/intfPureModule.h +++ b/Interfaces/API/intfPureModule.h @@ -45,98 +45,64 @@ using namespace Targoman::API::Server; //#define RESPONSE_HEADER_X_PAGINATION_CURRENT_PAGE "x-pagination-current-page" //#define RESPONSE_HEADER_X_PAGINATION_PER_PAGE "x-pagination-per-page" +/**********************************************************************/ +#define ORM_EX_CONFIG(_method, ...) QVariantMap confOf##_method() { return __VA_ARGS__; } + /**********************************************************************\ |** GET ***************************************************************| \**********************************************************************/ //used by Api call methods -//TAPI::JWT_t _JWT, -#define INTERNAL_GET_METHOD_ARGS_HEADER_APICALL(_apiCallBoomType) \ - _apiCallBoomType &APICALLBOOM_PARAM, \ - TAPI::PKsByPath_t _pksByPath = {}, \ - quint64 _pageIndex = 0, \ - quint16 _pageSize = 20, \ - TAPI::Cols_t _cols = {}, \ - TAPI::Filter_t _filters = {}, \ - TAPI::OrderBy_t _orderBy = {}, \ - TAPI::GroupBy_t _groupBy = {}, \ - bool _reportCount = true - -#define GET_METHOD_ARGS_HEADER_APICALL INTERNAL_GET_METHOD_ARGS_HEADER_APICALL(APICALLBOOM_TYPE_JWT_DECL) -#define ANONYMOUSE_GET_METHOD_ARGS_HEADER_APICALL INTERNAL_GET_METHOD_ARGS_HEADER_APICALL(APICALLBOOM_TYPE_NO_JWT_DECL) - -//TAPI::JWT_t _JWT, +#define INTERNAL_GET_METHOD_ARGS_DECL_APICALL(_apiCallBoomType) \ + _apiCallBoomType &APICALLBOOM_PARAM, \ + TAPI::PKsByPath_t _pksByPath = {}, \ + quint64 _pageIndex = 0, \ + quint16 _pageSize = 20, \ + TAPI::Cols_t _cols = {}, \ + TAPI::Filter_t _filters = {}, \ + TAPI::OrderBy_t _orderBy = {}, \ + TAPI::GroupBy_t _groupBy = {}, \ + bool _reportCount = true + #define INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(_apiCallBoomType) \ - _apiCallBoomType &APICALLBOOM_PARAM, \ - TAPI::PKsByPath_t _pksByPath, \ - quint64 _pageIndex, \ - quint16 _pageSize, \ - TAPI::Cols_t _cols, \ - TAPI::Filter_t _filters, \ - TAPI::OrderBy_t _orderBy, \ - TAPI::GroupBy_t _groupBy, \ - bool _reportCount + _apiCallBoomType &APICALLBOOM_PARAM, \ + TAPI::PKsByPath_t _pksByPath, \ + quint64 _pageIndex, \ + quint16 _pageSize, \ + TAPI::Cols_t _cols, \ + TAPI::Filter_t _filters, \ + TAPI::OrderBy_t _orderBy, \ + TAPI::GroupBy_t _groupBy, \ + bool _reportCount -#define GET_METHOD_ARGS_IMPL_APICALL INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(APICALLBOOM_TYPE_JWT_DECL) -#define ANONYMOUSE_GET_METHOD_ARGS_IMPL_APICALL INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(APICALLBOOM_TYPE_NO_JWT_DECL) +#define GET_METHOD_ARGS_DECL_APICALL INTERNAL_GET_METHOD_ARGS_DECL_APICALL(APICALLBOOM_TYPE_JWT_DECL) +#define ANONYMOUSE_GET_METHOD_ARGS_DECL_APICALL INTERNAL_GET_METHOD_ARGS_DECL_APICALL(APICALLBOOM_TYPE_NO_JWT_DECL) +#define GET_METHOD_ARGS_IMPL_APICALL INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(APICALLBOOM_TYPE_JWT_IMPL) +#define ANONYMOUSE_GET_METHOD_ARGS_IMPL_APICALL INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(APICALLBOOM_TYPE_NO_JWT_IMPL) -//#define GET_METHOD_CALL_ARGS_APICALL _JWT, _pksByPath, _pageIndex, _pageSize, _cols, _filters, _orderBy, _groupBy, _reportCount +#define ANONYMOUSE_ORMGET(_doc, ...) apiGET(ANONYMOUSE_GET_METHOD_ARGS_DECL_APICALL) __VA_ARGS__; \ + QString signOfGET() { return TARGOMAN_M2STR((GET_METHOD_ARGS_DECL_APICALL)); } \ + QString docOfGET() { return _doc; } -#define ORM_EX_CONFIG(_method, ...) QVariantMap confOf##_method() { return __VA_ARGS__; } +#define ANONYMOUSE_ORMGET_HIDDEN(_doc, ...) ANONYMOUSE_ORMGET(_doc, __VA_ARGS__); ORM_EX_CONFIG(GET, { EXRESTCONFIG_HIDDEN }) + +#define ORMGET(_doc, ...) apiGET(GET_METHOD_ARGS_DECL_APICALL) __VA_ARGS__; \ + QString signOfGET() { return TARGOMAN_M2STR((GET_METHOD_ARGS_DECL_APICALL)); } \ + QString docOfGET() { return _doc; } + +#define IMPL_ORMGET(_module) _module::apiGET(GET_METHOD_ARGS_IMPL_APICALL) +#define IMPL_ANONYMOUSE_ORMGET(_module) _module::apiGET(ANONYMOUSE_GET_METHOD_ARGS_IMPL_APICALL) + +#define ORMGET_HIDDEN(_doc, ...) ORMGET(_doc, __VA_ARGS__); ORM_EX_CONFIG(GET, { EXRESTCONFIG_HIDDEN }) + +#define ORMGETByName(_name, _doc, ...) apiGET##_name(GET_METHOD_ARGS_DECL_APICALL) __VA_ARGS__; \ + QString signOfGET##_name() { return TARGOMAN_M2STR((GET_METHOD_ARGS_DECL_APICALL)); } \ + QString docOfGET##_name() { return _doc; } + +//used by intfSQLBasedModule +#define GET_METHOD_ARGS_DECL_INTERNAL_USER INTERNAL_GET_METHOD_ARGS_DECL_APICALL(INTFAPICALLBOOM_DECL) +#define GET_METHOD_ARGS_IMPL_INTERNAL_USER INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(INTFAPICALLBOOM_IMPL) -#define ANONYMOUSE_ORMGET(_doc) apiGET(ANONYMOUSE_GET_METHOD_ARGS_HEADER_APICALL); \ - QString signOfGET() { return TARGOMAN_M2STR((GET_METHOD_ARGS_HEADER_APICALL)); } \ - QString docOfGET() { return _doc; } - -#define ANONYMOUSE_ORMGET_HIDDEN(_doc) ANONYMOUSE_ORMGET(_doc); ORM_EX_CONFIG(GET, { EXRESTCONFIG_HIDDEN }) - -#define ORMGET(_doc) apiGET(GET_METHOD_ARGS_HEADER_APICALL); \ - QString signOfGET() { return TARGOMAN_M2STR((GET_METHOD_ARGS_HEADER_APICALL)); } \ - QString docOfGET() { return _doc; } - -#define IMPL_ORMGET(_module) _module::apiGET(GET_METHOD_ARGS_IMPL_APICALL) -#define IMPL_ANONYMOUSE_ORMGET(_module) _module::apiGET(ANONYMOUSE_GET_METHOD_ARGS_IMPL_APICALL) - -#define ORMGET_HIDDEN(_doc) ORMGET(_doc); ORM_EX_CONFIG(GET, { EXRESTCONFIG_HIDDEN }) - -#define ORMGETPureVirtual(_doc) apiGET(GET_METHOD_ARGS_HEADER_APICALL)=0; \ - virtual QString signOfGET() { return TARGOMAN_M2STR((GET_METHOD_ARGS_HEADER_APICALL)); } \ - virtual QString docOfGET() { return _doc; } - -#define ORMGETWithBody(_doc, _body) apiGET(GET_METHOD_ARGS_HEADER_APICALL) _body \ - virtual QString signOfGET() { return TARGOMAN_M2STR((GET_METHOD_ARGS_HEADER_APICALL)); } \ - virtual QString docOfGET() { return _doc; } - -#define ORMGETByName(_name, _doc) apiGET##_name(GET_METHOD_ARGS_HEADER_APICALL); \ - QString signOfGET##_name() { return TARGOMAN_M2STR((GET_METHOD_ARGS_HEADER_APICALL)); } \ - QString docOfGET##_name() { return _doc; } - -//used by ApiQuery -//quint64 _userID, -#define GET_METHOD_ARGS_HEAD_INTERNAL_CALL \ - INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, \ - TAPI::PKsByPath_t _pksByPath = {}, \ - quint64 _pageIndex = 0, \ - quint16 _pageSize = 20, \ - TAPI::Cols_t _cols = {}, \ - TAPI::Filter_t _filters = {}, \ - TAPI::OrderBy_t _orderBy = {}, \ - TAPI::GroupBy_t _groupBy = {}, \ - bool _reportCount = true \ - -//quint64 _userID, -#define GET_METHOD_ARGS_IMPL_INTERNAL_CALL \ - INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, \ - TAPI::PKsByPath_t _pksByPath, \ - quint64 _pageIndex, \ - quint16 _pageSize, \ - TAPI::Cols_t _cols, \ - TAPI::Filter_t _filters, \ - TAPI::OrderBy_t _orderBy, \ - TAPI::GroupBy_t _groupBy, \ - bool _reportCount - -//clsJWT(_JWT).usrID(), -#define GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM \ +#define GET_METHOD_ARGS_CALL_INTERNAL_BOOM \ _APICALLBOOM, \ _pksByPath, \ _pageIndex, \ @@ -147,9 +113,8 @@ using namespace Targoman::API::Server; _groupBy, \ _reportCount -//_userID, -#define GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM_RAW \ - _APICALLBOOM, \ +#define GET_METHOD_ARGS_CALL_INTERNAL_BOOM2USER \ + _APICALLBOOM.getUserID(), \ _pksByPath, \ _pageIndex, \ _pageSize, \ @@ -163,70 +128,75 @@ using namespace Targoman::API::Server; |** CREATE ************************************************************| \**********************************************************************/ //used by Api call methods -#define CREATE_METHOD_ARGS_HEADER_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, /*TAPI::JWT_t _JWT, */TAPI::ORMFields_t _createInfo = {} -#define CREATE_METHOD_ARGS_IMPL_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, /*TAPI::JWT_t _JWT, */TAPI::ORMFields_t _createInfo -//#define CREATE_METHOD_CALL_ARGS_APICALL _JWT, _createInfo -#define ORMCREATE(_doc) apiCREATE(CREATE_METHOD_ARGS_HEADER_APICALL); \ - QString signOfCREATE() { return TARGOMAN_M2STR((CREATE_METHOD_ARGS_HEADER_APICALL)); } \ +#define CREATE_METHOD_ARGS_DECL_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo = {} +#define CREATE_METHOD_ARGS_IMPL_APICALL APICALLBOOM_TYPE_JWT_IMPL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo + +#define ORMCREATE(_doc, ...) apiCREATE(CREATE_METHOD_ARGS_DECL_APICALL) __VA_ARGS__; \ + QString signOfCREATE() { return TARGOMAN_M2STR((CREATE_METHOD_ARGS_DECL_APICALL)); } \ QString docOfCREATE() { return _doc; } -#define IMPL_ORMCREATE(_module) _module::apiCREATE(CREATE_METHOD_ARGS_IMPL_APICALL) +#define IMPL_ORMCREATE(_module) _module::apiCREATE(CREATE_METHOD_ARGS_IMPL_APICALL) + +//used by intfSQLBasedModule +#define CREATE_METHOD_ARGS_DECL_INTERNAL_USER quint64 _userID, TAPI::ORMFields_t _createInfo = {} +#define CREATE_METHOD_ARGS_IMPL_INTERNAL_USER quint64 _userID, TAPI::ORMFields_t _createInfo +#define CREATE_METHOD_ARGS_CALL_INTERNAL_USER _userID, _createInfo -//used by ApiQuery -#define CREATE_METHOD_ARGS_HEAD_INTERNAL_CALL quint64 _userID, TAPI::ORMFields_t _createInfo = {} -#define CREATE_METHOD_ARGS_IMPL_INTERNAL_CALL quint64 _userID, TAPI::ORMFields_t _createInfo -#define CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_USER _userID, _createInfo -#define CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER _APICALLBOOM.getUserID(), _createInfo +#define CREATE_METHOD_ARGS_DECL_INTERNAL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo = {} +#define CREATE_METHOD_ARGS_IMPL_INTERNAL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo +#define CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM _APICALLBOOM, _createInfo -#define CREATE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo = {} -#define CREATE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo -#define CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM _APICALLBOOM, _createInfo +#define CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER _APICALLBOOM.getUserID(), _createInfo /**********************************************************************\ |** UPDATE ************************************************************| \**********************************************************************/ //used by Api call methods -#define UPDATE_METHOD_ARGS_HEADER_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, /*TAPI::JWT_t _JWT, */TAPI::PKsByPath_t _pksByPath = {}, const TAPI::ORMFields_t& _updateInfo = {} -#define UPDATE_METHOD_ARGS_IMPL_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, /*TAPI::JWT_t _JWT, */TAPI::PKsByPath_t _pksByPath, const TAPI::ORMFields_t& _updateInfo -//#define UPDATE_METHOD_CALL_ARGS_APICALL clsJWT(_JWT).usrID(), _pksByPath, _updateInfo -#define ORMUPDATE(_doc) apiUPDATE(UPDATE_METHOD_ARGS_HEADER_APICALL); \ - QString signOfUPDATE() { return TARGOMAN_M2STR((UPDATE_METHOD_ARGS_HEADER_APICALL)); } \ +#define UPDATE_METHOD_ARGS_DECL_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}, const TAPI::ORMFields_t& _updateInfo = {} +#define UPDATE_METHOD_ARGS_IMPL_APICALL APICALLBOOM_TYPE_JWT_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath, const TAPI::ORMFields_t& _updateInfo + +#define ORMUPDATE(_doc, ...) apiUPDATE(UPDATE_METHOD_ARGS_DECL_APICALL) __VA_ARGS__; \ + QString signOfUPDATE() { return TARGOMAN_M2STR((UPDATE_METHOD_ARGS_DECL_APICALL)); } \ QString docOfUPDATE() { return _doc; } -#define IMPL_ORMUPDATE(_module) _module::apiUPDATE(UPDATE_METHOD_ARGS_IMPL_APICALL) +#define IMPL_ORMUPDATE(_module) _module::apiUPDATE(UPDATE_METHOD_ARGS_IMPL_APICALL) + +//used by intfSQLBasedModule +#define UPDATE_METHOD_ARGS_DECL_INTERNAL_USER quint64 _userID, TAPI::PKsByPath_t _pksByPath = {}, const TAPI::ORMFields_t& _updateInfo = {} +#define UPDATE_METHOD_ARGS_IMPL_INTERNAL_USER quint64 _userID, TAPI::PKsByPath_t _pksByPath, const TAPI::ORMFields_t& _updateInfo +#define UPDATE_METHOD_ARGS_CALL_INTERNAL_USER _userID, _pksByPath, _updateInfo -//used by ApiQuery -#define UPDATE_METHOD_ARGS_HEAD_INTERNAL_CALL quint64 _userID, TAPI::PKsByPath_t _pksByPath = {}, const TAPI::ORMFields_t& _updateInfo = {} -#define UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL quint64 _userID, TAPI::PKsByPath_t _pksByPath, const TAPI::ORMFields_t& _updateInfo -#define UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_USER _userID, _pksByPath, _updateInfo -#define UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER _APICALLBOOM.getUserID(), _pksByPath, _updateInfo +#define UPDATE_METHOD_ARGS_DECL_INTERNAL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}, const TAPI::ORMFields_t& _updateInfo = {} +#define UPDATE_METHOD_ARGS_IMPL_INTERNAL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath, const TAPI::ORMFields_t& _updateInfo +#define UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM _APICALLBOOM, _pksByPath, _updateInfo + +#define UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER _APICALLBOOM.getUserID(), _pksByPath, _updateInfo -#define UPDATE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}, const TAPI::ORMFields_t& _updateInfo = {} -#define UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath, const TAPI::ORMFields_t& _updateInfo -#define UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM _APICALLBOOM, _pksByPath, _updateInfo /**********************************************************************\ |** DELETE ************************************************************| \**********************************************************************/ //used by Api call methods -#define DELETE_METHOD_ARGS_HEADER_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, /*TAPI::JWT_t _JWT, */TAPI::PKsByPath_t _pksByPath = {} -#define DELETE_METHOD_ARGS_IMPL_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, /*TAPI::JWT_t _JWT, */TAPI::PKsByPath_t _pksByPath -//#define DELETE_METHOD_CALL_ARGS_APICALL clsJWT(_JWT).usrID(), _pksByPath -#define ORMDELETE(_doc) apiDELETE(DELETE_METHOD_ARGS_HEADER_APICALL); \ - QString signOfDELETE() { return TARGOMAN_M2STR((DELETE_METHOD_ARGS_HEADER_APICALL)); } \ +#define DELETE_METHOD_ARGS_DECL_APICALL APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {} +#define DELETE_METHOD_ARGS_IMPL_APICALL APICALLBOOM_TYPE_JWT_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath + +#define ORMDELETE(_doc, ...) apiDELETE(DELETE_METHOD_ARGS_DECL_APICALL) __VA_ARGS__; \ + QString signOfDELETE() { return TARGOMAN_M2STR((DELETE_METHOD_ARGS_DECL_APICALL)); } \ QString docOfDELETE() { return _doc; } -#define IMPL_ORMDELETE(_module) _module::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL) +#define IMPL_ORMDELETE(_module) _module::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL) -//used by ApiQuery -#define DELETE_METHOD_ARGS_HEAD_INTERNAL_CALL quint64 _userID, TAPI::PKsByPath_t _pksByPath = {} -#define DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL quint64 _userID, TAPI::PKsByPath_t _pksByPath -#define DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_USER _userID, _pksByPath -#define DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER _APICALLBOOM.getUserID(), _pksByPath +//used by intfSQLBasedModule +#define DELETE_METHOD_ARGS_DECL_INTERNAL_USER quint64 _userID, TAPI::PKsByPath_t _pksByPath = {} +#define DELETE_METHOD_ARGS_IMPL_INTERNAL_USER quint64 _userID, TAPI::PKsByPath_t _pksByPath +#define DELETE_METHOD_ARGS_CALL_INTERNAL_USER _userID, _pksByPath -#define DELETE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {} -#define DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath -#define DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM _APICALLBOOM, _pksByPath +#define DELETE_METHOD_ARGS_DECL_INTERNAL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {} +#define DELETE_METHOD_ARGS_IMPL_INTERNAL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath +#define DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM _APICALLBOOM, _pksByPath +#define DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER _APICALLBOOM.getUserID(), _pksByPath + +/**********************************************************************/ namespace TAPI { TAPI_ADD_TYPE_STRING(Cols_t); TAPI_ADD_TYPE_STRING(Filter_t); diff --git a/Interfaces/API/intfSQLBasedModule.cpp b/Interfaces/API/intfSQLBasedModule.cpp index d8c30021..00f29315 100644 --- a/Interfaces/API/intfSQLBasedModule.cpp +++ b/Interfaces/API/intfSQLBasedModule.cpp @@ -74,7 +74,7 @@ intfSQLBasedModule::intfSQLBasedModule( QVariantMap intfSQLBasedModule::SelectOne( clsTable& _table, - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters, quint16 _cacheTime, std::function _lambda_TouchQuery @@ -117,7 +117,7 @@ QVariantMap intfSQLBasedModule::SelectOne( QVariantList intfSQLBasedModule::SelectAll( clsTable& _table, - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters, quint16 _cacheTime, std::function _lambda_TouchQuery @@ -158,7 +158,7 @@ QVariantList intfSQLBasedModule::SelectAll( TAPI::stuTable intfSQLBasedModule::SelectAllWithCount( clsTable& _table, - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters, quint16 _cacheTime, std::function _lambda_TouchQuery @@ -199,7 +199,7 @@ TAPI::stuTable intfSQLBasedModule::SelectAllWithCount( QVariant intfSQLBasedModule::Select( clsTable& _table, - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters, quint16 _cacheTime, std::function _lambda_TouchQuery @@ -208,7 +208,7 @@ QVariant intfSQLBasedModule::Select( if (_reportCount) return this->SelectAllWithCount( _table, - GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM_RAW, + GET_METHOD_ARGS_CALL_INTERNAL_BOOM, _extraFilters, _cacheTime, _lambda_TouchQuery @@ -218,7 +218,7 @@ QVariant intfSQLBasedModule::Select( return this->SelectAll( _table, - GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM_RAW, + GET_METHOD_ARGS_CALL_INTERNAL_BOOM, _extraFilters, _cacheTime, _lambda_TouchQuery @@ -227,7 +227,7 @@ QVariant intfSQLBasedModule::Select( return this->SelectOne( _table, - GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM_RAW, + GET_METHOD_ARGS_CALL_INTERNAL_BOOM, _extraFilters, _cacheTime, _lambda_TouchQuery @@ -235,14 +235,14 @@ QVariant intfSQLBasedModule::Select( } QVariant intfSQLBasedModule::Select( - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters, quint16 _cacheTime, std::function _lambda_TouchQuery ) { return this->Select( *this, - GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM_RAW, + GET_METHOD_ARGS_CALL_INTERNAL_BOOM, _extraFilters, _cacheTime, _lambda_TouchQuery @@ -251,7 +251,7 @@ QVariant intfSQLBasedModule::Select( quint64 intfSQLBasedModule::Create( clsTable& _table, - CREATE_METHOD_ARGS_IMPL_INTERNAL_CALL + CREATE_METHOD_ARGS_IMPL_INTERNAL_USER ) { _table.prepareFiltersList(); @@ -266,36 +266,36 @@ quint64 intfSQLBasedModule::Create( } quint64 intfSQLBasedModule::Create( - CREATE_METHOD_ARGS_IMPL_INTERNAL_CALL + CREATE_METHOD_ARGS_IMPL_INTERNAL_USER ) { return this->Create( *this, - CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_USER + CREATE_METHOD_ARGS_CALL_INTERNAL_USER ); } quint64 intfSQLBasedModule::Create( clsTable& _table, - CREATE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM + CREATE_METHOD_ARGS_IMPL_INTERNAL_BOOM ) { return this->Create( _table, - CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER + CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER ); } quint64 intfSQLBasedModule::Create( - CREATE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM + CREATE_METHOD_ARGS_IMPL_INTERNAL_BOOM ) { return this->Create( *this, - CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER + CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER ); } bool intfSQLBasedModule::Update( clsTable& _table, - UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL, + UPDATE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters ) { _table.prepareFiltersList(); @@ -330,42 +330,42 @@ bool intfSQLBasedModule::Update( } bool intfSQLBasedModule::Update( - UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL, + UPDATE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters ) { return this->Update( *this, - UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_USER, + UPDATE_METHOD_ARGS_CALL_INTERNAL_USER, _extraFilters ); } bool intfSQLBasedModule::Update( clsTable& _table, - UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM, + UPDATE_METHOD_ARGS_IMPL_INTERNAL_BOOM, const QVariantMap& _extraFilters ) { return this->Update( _table, - UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, + UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, _extraFilters ); } bool intfSQLBasedModule::Update( - UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM, + UPDATE_METHOD_ARGS_IMPL_INTERNAL_BOOM, const QVariantMap& _extraFilters ) { return this->Update( *this, - UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, + UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, _extraFilters ); } bool intfSQLBasedModule::DeleteByPks( clsTable& _table, - DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL, + DELETE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters, bool _realDelete ) { @@ -403,13 +403,13 @@ bool intfSQLBasedModule::DeleteByPks( } bool intfSQLBasedModule::DeleteByPks( - DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL, + DELETE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters, bool _realDelete ) { return this->DeleteByPks( *this, - DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_USER, + DELETE_METHOD_ARGS_CALL_INTERNAL_USER, _extraFilters, _realDelete ); @@ -417,26 +417,26 @@ bool intfSQLBasedModule::DeleteByPks( bool intfSQLBasedModule::DeleteByPks( clsTable& _table, - DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM, + DELETE_METHOD_ARGS_IMPL_INTERNAL_BOOM, const QVariantMap& _extraFilters, bool _realDelete ) { return this->DeleteByPks( _table, - DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, + DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, _extraFilters, _realDelete ); } bool intfSQLBasedModule::DeleteByPks( - DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL_BOOM, + DELETE_METHOD_ARGS_IMPL_INTERNAL_BOOM, const QVariantMap& _extraFilters, bool _realDelete ) { return this->DeleteByPks( *this, - DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, + DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, _extraFilters, _realDelete ); diff --git a/Interfaces/API/intfSQLBasedModule.h b/Interfaces/API/intfSQLBasedModule.h index 0a9703aa..ef7bc77f 100644 --- a/Interfaces/API/intfSQLBasedModule.h +++ b/Interfaces/API/intfSQLBasedModule.h @@ -56,21 +56,21 @@ class intfSQLBasedModule : public intfPureModule, public clsTable private: QVariantMap SelectOne( clsTable& _table, - GET_METHOD_ARGS_HEAD_INTERNAL_CALL, + GET_METHOD_ARGS_DECL_INTERNAL_USER, const clsCondition& _extraFilters = {}, quint16 _cacheTime = 0, std::function _lambda_TouchQuery = nullptr ); QVariantList SelectAll( clsTable& _table, - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters = {}, quint16 _cacheTime = 0, std::function _lambda_TouchQuery = nullptr ); TAPI::stuTable SelectAllWithCount( clsTable& _table, - GET_METHOD_ARGS_IMPL_INTERNAL_CALL, + GET_METHOD_ARGS_IMPL_INTERNAL_USER, const clsCondition& _extraFilters = {}, quint16 _cacheTime = 0, std::function _lambda_TouchQuery = nullptr @@ -79,13 +79,13 @@ class intfSQLBasedModule : public intfPureModule, public clsTable public: QVariant Select( clsTable& _table, - GET_METHOD_ARGS_HEAD_INTERNAL_CALL, + GET_METHOD_ARGS_DECL_INTERNAL_USER, const clsCondition& _extraFilters = {}, quint16 _cacheTime = 0, std::function _lambda_TouchQuery = nullptr ); QVariant Select( - GET_METHOD_ARGS_HEAD_INTERNAL_CALL, + GET_METHOD_ARGS_DECL_INTERNAL_USER, const clsCondition& _extraFilters = {}, quint16 _cacheTime = 0, std::function _lambda_TouchQuery = nullptr @@ -93,57 +93,57 @@ class intfSQLBasedModule : public intfPureModule, public clsTable quint64 Create( clsTable& _table, - CREATE_METHOD_ARGS_HEAD_INTERNAL_CALL + CREATE_METHOD_ARGS_DECL_INTERNAL_USER ); quint64 Create( - CREATE_METHOD_ARGS_HEAD_INTERNAL_CALL + CREATE_METHOD_ARGS_DECL_INTERNAL_USER ); quint64 Create( clsTable& _table, - CREATE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM + CREATE_METHOD_ARGS_DECL_INTERNAL_BOOM ); quint64 Create( - CREATE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM + CREATE_METHOD_ARGS_DECL_INTERNAL_BOOM ); bool Update( clsTable& _table, - UPDATE_METHOD_ARGS_HEAD_INTERNAL_CALL, + UPDATE_METHOD_ARGS_DECL_INTERNAL_USER, const QVariantMap& _extraFilters = {} ); bool Update( - UPDATE_METHOD_ARGS_HEAD_INTERNAL_CALL, + UPDATE_METHOD_ARGS_DECL_INTERNAL_USER, const QVariantMap& _extraFilters = {} ); bool Update( clsTable& _table, - UPDATE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM, + UPDATE_METHOD_ARGS_DECL_INTERNAL_BOOM, const QVariantMap& _extraFilters = {} ); bool Update( - UPDATE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM, + UPDATE_METHOD_ARGS_DECL_INTERNAL_BOOM, const QVariantMap& _extraFilters = {} ); bool DeleteByPks( clsTable& _table, - DELETE_METHOD_ARGS_HEAD_INTERNAL_CALL, + DELETE_METHOD_ARGS_DECL_INTERNAL_USER, const QVariantMap& _extraFilters = {}, bool _realDelete = false ); bool DeleteByPks( - DELETE_METHOD_ARGS_HEAD_INTERNAL_CALL, + DELETE_METHOD_ARGS_DECL_INTERNAL_USER, const QVariantMap& _extraFilters = {}, bool _realDelete = false ); bool DeleteByPks( clsTable& _table, - DELETE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM, + DELETE_METHOD_ARGS_DECL_INTERNAL_BOOM, const QVariantMap& _extraFilters = {}, bool _realDelete = false ); bool DeleteByPks( - DELETE_METHOD_ARGS_HEAD_INTERNAL_CALL_BOOM, + DELETE_METHOD_ARGS_DECL_INTERNAL_BOOM, const QVariantMap& _extraFilters = {}, bool _realDelete = false ); diff --git a/Interfaces/Common/APIArgHelperMacros.hpp b/Interfaces/Common/APIArgHelperMacros.hpp index bc4176d8..cd466afd 100644 --- a/Interfaces/Common/APIArgHelperMacros.hpp +++ b/Interfaces/Common/APIArgHelperMacros.hpp @@ -136,12 +136,17 @@ /************************************************************/ #define TAPI_VALIDATION_REQUIRED_TYPE_IMPL(_complexity, _namespace, _type, _validationRule, _toVariant, ...) \ TAPI_REGISTER_METATYPE( \ - _complexity, _namespace, _type, \ - [](const _namespace::_type& _value) -> QVariant {return _toVariant;}, \ + _complexity, \ + _namespace, \ + _type, \ + [](const _namespace::_type& _value) -> QVariant { return _toVariant; }, \ [](const QVariant& _value, const QByteArray& _paramName) -> _namespace::_type { \ static QFieldValidator Validator = QFieldValidator()._validationRule; \ - if (Validator.isValid(_value, _paramName) == false) throw exHTTPBadRequest(Validator.errorMessage()); \ - _namespace::_type Value; Value=_value.toString(); return Value; \ + if (Validator.isValid(_value, _paramName) == false) \ + throw exHTTPBadRequest(Validator.errorMessage()); \ + _namespace::_type Value; \ + Value = _value.toString(); \ + return Value; \ }, __VA_ARGS__ \ ) @@ -174,10 +179,10 @@ /* validator */ v, \ /* type 2 QJsonValue */ _type::toStr(v), \ /* QJsonValue 2 type */ [](QJsonValue v) -> _type::Type { \ - _type::Type t; \ - TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ - return t; \ - }(v) + _type::Type t; \ + TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ + return t; \ + }(v) #define SF_NULLABLE_Enum(_type, _name) \ /* type */ NULLABLE_TYPE(_type::Type), \ @@ -185,15 +190,15 @@ /* def */ NULLABLE_NULL_VALUE, \ /* validator */ v==v, \ /* type 2 QJsonValue */ [](NULLABLE_TYPE(_type::Type) v) -> QJsonValue { \ - if (NULLABLE_IS_NULL(v)) \ - return QJsonValue(); \ - return QVariant(NULLABLE_GET(v).toString()).toJsonValue(); \ - }(v), \ + if (NULLABLE_IS_NULL(v)) \ + return QJsonValue(); \ + return QVariant(NULLABLE_GET(v).toString()).toJsonValue(); \ + }(v), \ /* QJsonValue 2 type */ [](QJsonValue v) -> NULLABLE_TYPE(_type::Type) { \ - NULLABLE_TYPE(_type::Type) t; \ - TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ - return t; \ - }(v) + NULLABLE_TYPE(_type::Type) t; \ + TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ + return t; \ + }(v) #define SF_JSON_t(_name) \ /* type */ TAPI::JSON_t, \ @@ -202,10 +207,10 @@ /* validator */ v.isEmpty() == false, \ /* type 2 QJsonValue */ [](TAPI::JSON_t v) -> QJsonValue { return QVariant(v).toJsonValue(); }(v), \ /* QJsonValue 2 type */ [](QJsonValue v) -> TAPI::JSON_t { \ - TAPI::JSON_t t; \ - TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ - return t; \ - }(v) + TAPI::JSON_t t; \ + TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ + return t; \ + }(v) #define SF_DateTime_t(_name) \ /* type */ TAPI::DateTime_t, \ @@ -214,10 +219,22 @@ /* validator */ v.isValid(), \ /* type 2 QJsonValue */ [](TAPI::DateTime_t v) -> QJsonValue { return QVariant(v.toString()).toJsonValue(); }(v), \ /* QJsonValue 2 type */ [](QJsonValue v) -> TAPI::DateTime_t { \ - TAPI::DateTime_t t; \ - TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ - return t; \ - }(v) + TAPI::DateTime_t t; \ + TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ + return t; \ + }(v) + +#define SF_Date_t(_name) \ + /* type */ TAPI::Date_t, \ + /* name */ _name, \ + /* def */ TAPI::Date_t(), \ + /* validator */ v.isValid(), \ + /* type 2 QJsonValue */ [](TAPI::Date_t v) -> QJsonValue { return QVariant(v.toString()).toJsonValue(); }(v), \ + /* QJsonValue 2 type */ [](QJsonValue v) -> TAPI::Date_t { \ + TAPI::Date_t t; \ + TAPI::setFromVariant(t, v.toVariant(), toCammel(#_name)); \ + return t; \ + }(v) // _type, _name, _typeGroup, _typeToQJsonValue, _qJsonValueToType, _def, _validator #define SF_String(_name, _type, ...) INTERNAL_SF(_type, _name, STRING, v, v.toString(), __VA_ARGS__) @@ -235,6 +252,16 @@ #define SF_NULLABLE_quint32(_name, ...) INTERNAL_SF(NULLABLE_TYPE(quint32), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2uint32(v), __VA_ARGS__) #define SF_quint64(_name, ...) INTERNAL_SF(quint64, _name, INTEGRAL, INTERNAL_C2DBL(v), INTERNAL_V2uint64(v), __VA_ARGS__) #define SF_NULLABLE_quint64(_name, ...) INTERNAL_SF(NULLABLE_TYPE(quint64), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2uint64(v), __VA_ARGS__) + +#define SF_qint8(_name, ...) INTERNAL_SF(qint8, _name, INTEGRAL, INTERNAL_C2DBL(v), INTERNAL_V2int8(v), __VA_ARGS__) +#define SF_NULLABLE_qint8(_name, ...) INTERNAL_SF(NULLABLE_TYPE(qint8), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2int8(v), __VA_ARGS__) +#define SF_qint16(_name, ...) INTERNAL_SF(qint16, _name, INTEGRAL, INTERNAL_C2DBL(v), INTERNAL_V2int16(v), __VA_ARGS__) +#define SF_NULLABLE_qint16(_name, ...) INTERNAL_SF(NULLABLE_TYPE(qint16), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2int16(v), __VA_ARGS__) +#define SF_qint32(_name, ...) INTERNAL_SF(qint32, _name, INTEGRAL, INTERNAL_C2DBL(v), INTERNAL_V2int32(v), __VA_ARGS__) +#define SF_NULLABLE_qint32(_name, ...) INTERNAL_SF(NULLABLE_TYPE(qint32), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2int32(v), __VA_ARGS__) +#define SF_qint64(_name, ...) INTERNAL_SF(qint64, _name, INTEGRAL, INTERNAL_C2DBL(v), INTERNAL_V2int64(v), __VA_ARGS__) +#define SF_NULLABLE_qint64(_name, ...) INTERNAL_SF(NULLABLE_TYPE(qint64), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2int64(v), __VA_ARGS__) + #define SF_qreal(_name, ...) INTERNAL_SF(qreal, _name, INTEGRAL, INTERNAL_C2DBL(v), INTERNAL_V2DBL(v), __VA_ARGS__) #define SF_NULLABLE_qreal(_name, ...) INTERNAL_SF(NULLABLE_TYPE(qreal), _name, NULLABLE_INTEGRAL, INTERNAL_N2J(v), INTERNAL_N2DBL(v), __VA_ARGS__) diff --git a/Interfaces/DBM/clsORMField.h b/Interfaces/DBM/clsORMField.h index c4e5af8b..09af353f 100644 --- a/Interfaces/DBM/clsORMField.h +++ b/Interfaces/DBM/clsORMField.h @@ -183,6 +183,16 @@ constexpr enuUpdatableBy::Type UPStatus = enuUpdatableBy::__STATUS__; #define ORM_TABLE_DBPROPERTY_STATUS_FIELD_NAME "StatusFieldName" #define ORM_TABLE_DBPROPERTY_INVALIDATE_AT_FIELD_NAME "InvalidatedAtFieldName" +// used for TAPI_DEFINE_VARIANT_ENABLED_STRUCT +#define SF_ORM_PRIMARYKEY_32(_name) SF_quint32(_name) +#define SF_ORM_PRIMARYKEY_64(_name) SF_quint64(_name) +#define SF_ORM_CREATED_ON(_name) SF_DateTime_t(_name) +#define SF_ORM_CREATED_BY(_name) SF_quint64(_name) +#define SF_ORM_CREATED_BY_NULLABLE(_name) SF_NULLABLE_quint64(_name) +#define SF_ORM_UPDATED_ON(_name) SF_DateTime_t(_name) +#define SF_ORM_UPDATED_BY(_name) SF_NULLABLE_quint64(_name) +#define SF_ORM_STATUS_FIELD(_name, T, Def) SF_Enum(T, _name, Def) + } //namespace DBM } //namespace Targoman::API diff --git a/Interfaces/DBM/clsTable.h b/Interfaces/DBM/clsTable.h index d05759dc..8e9631ee 100644 --- a/Interfaces/DBM/clsTable.h +++ b/Interfaces/DBM/clsTable.h @@ -40,8 +40,8 @@ class clsTable; } //namespace Query { -//extern bool Update(Targoman::API::DBM::clsTable& _table, UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL, const QVariantMap& _extraFilters); -//extern bool DeleteByPks(Targoman::API::DBM::clsTable& _table, DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL, const QVariantMap& _extraFilters, bool _realDelete); +//extern bool Update(Targoman::API::DBM::clsTable& _table, UPDATE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters); +//extern bool DeleteByPks(Targoman::API::DBM::clsTable& _table, DELETE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters, bool _realDelete); //} namespace DBM { @@ -242,8 +242,8 @@ class clsTable //: public intfPureModule friend testQueryBuilders; -// friend bool this->Update(clsTable& _table, UPDATE_METHOD_ARGS_IMPL_INTERNAL_CALL, const QVariantMap& _extraFilters); -// friend bool this->DeleteByPks(clsTable& _table, DELETE_METHOD_ARGS_IMPL_INTERNAL_CALL, const QVariantMap& _extraFilters, bool _realDelete); +// friend bool this->Update(clsTable& _table, UPDATE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters); +// friend bool this->DeleteByPks(clsTable& _table, DELETE_METHOD_ARGS_IMPL_INTERNAL_USER, const QVariantMap& _extraFilters, bool _realDelete); }; } //namespace DBM diff --git a/Interfaces/Interfaces.pro b/Interfaces/Interfaces.pro index 5f95c063..f3cefb70 100644 --- a/Interfaces/Interfaces.pro +++ b/Interfaces/Interfaces.pro @@ -122,8 +122,9 @@ OTHER_FILES += \ migrations/objectstorage/local/*.sh \ migrations/objectstorage/local/.migrations -INCLUDEPATH += $$BASE_PROJECT_PATH/App/ \ - $$BASE_PROJECT_PATH/3rdParty/E4MT/ +INCLUDEPATH += \ + $$BASE_PROJECT_PATH/App/ \ + $$BASE_PROJECT_PATH/3rdParty/E4MT/ ################################################################################ include($$QBUILD_PATH/templates/libConfigs.pri) diff --git a/Interfaces/ORM/intfActionLogs.cpp b/Interfaces/ORM/intfActionLogs.cpp index 71d500f4..3ffe5fef 100644 --- a/Interfaces/ORM/intfActionLogs.cpp +++ b/Interfaces/ORM/intfActionLogs.cpp @@ -54,7 +54,7 @@ QVariant IMPL_ORMGET(intfActionLogs) { // Authorization::checkPriv(_APICALLBOOM.getJWT(), { this->ModuleName + ":ActionLogs:CRUD~0100" }); Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } } //namespace Targoman::API::ORM diff --git a/Interfaces/ORM/intfMigrations.cpp b/Interfaces/ORM/intfMigrations.cpp index 52685290..eaa838ce 100644 --- a/Interfaces/ORM/intfMigrations.cpp +++ b/Interfaces/ORM/intfMigrations.cpp @@ -49,7 +49,7 @@ QVariant IMPL_ANONYMOUSE_ORMGET(intfMigrations) { // Authorization::checkPriv(_APICALLBOOM.getJWT(), { this->ModuleName + ":Migrations:CRUD~0100" }); // Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } } //namespace Targoman::API::ORM diff --git a/Interfaces/ObjectStorage/ORM/ObjectStorage.cpp b/Interfaces/ObjectStorage/ORM/ObjectStorage.cpp index f015afb9..16b9b24a 100644 --- a/Interfaces/ObjectStorage/ORM/ObjectStorage.cpp +++ b/Interfaces/ObjectStorage/ORM/ObjectStorage.cpp @@ -82,7 +82,7 @@ intfUploadFiles::intfUploadFiles( QVariant IMPL_ORMGET(intfUploadFiles) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } /******************************************************************/ @@ -120,7 +120,7 @@ intfUploadQueue::intfUploadQueue( QVariant IMPL_ORMGET(intfUploadQueue) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } /******************************************************************/ @@ -169,7 +169,7 @@ intfUploadGateways::intfUploadGateways( QVariant IMPL_ORMGET(intfUploadGateways) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint32 IMPL_ORMCREATE(intfUploadGateways) { @@ -178,17 +178,17 @@ quint32 IMPL_ORMCREATE(intfUploadGateways) { // if (_createInfo.contains(tblintfUploadGateways::ugwAllowedDomainName)) // _createInfo[tblintfUploadGateways::ugwAllowedDomainName] = URLHelper::domain(_createInfo[tblUploadGateways::ugwAllowedDomainName].toString()); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(intfUploadGateways) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(intfUploadGateways) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::ObjectStorage::ORM diff --git a/Modules/Account/moduleSrc/ORM/APITokenValidIPs.cpp b/Modules/Account/moduleSrc/ORM/APITokenValidIPs.cpp index ca231fad..6bc911ae 100644 --- a/Modules/Account/moduleSrc/ORM/APITokenValidIPs.cpp +++ b/Modules/Account/moduleSrc/ORM/APITokenValidIPs.cpp @@ -37,13 +37,13 @@ QVariant IMPL_ORMGET(APITokenValidIPs) { _query.innerJoin(tblAPITokens::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } quint64 IMPL_ORMCREATE(APITokenValidIPs) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(APITokenValidIPs) { @@ -53,7 +53,7 @@ bool IMPL_ORMUPDATE(APITokenValidIPs) { // this->setSelfFilters({{tblAPITokens::apt_usrID, _APICALLBOOM.getUserID()}}, ExtraFilters); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters); } bool IMPL_ORMDELETE(APITokenValidIPs) { @@ -63,7 +63,7 @@ bool IMPL_ORMDELETE(APITokenValidIPs) { ExtraFilters.insert(tblAPITokens::apt_usrID, _APICALLBOOM.getUserID()); // this->setSelfFilters({{tblAPITokens::apt_usrID, _APICALLBOOM.getUserID()}}, ExtraFilters); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters, true); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters, true); // return this->deleteByPKs(DELETE_METHOD_CALL_ARGS_APICALL, ExtraFilters, true); } diff --git a/Modules/Account/moduleSrc/ORM/APITokens.cpp b/Modules/Account/moduleSrc/ORM/APITokens.cpp index bccd6232..3744849a 100644 --- a/Modules/Account/moduleSrc/ORM/APITokens.cpp +++ b/Modules/Account/moduleSrc/ORM/APITokens.cpp @@ -70,19 +70,19 @@ QVariant IMPL_ORMGET(APITokens) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false) this->setSelfFilters({{tblAPITokens::apt_usrID, _APICALLBOOM.getUserID()}}, _filters); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint64 IMPL_ORMCREATE(APITokens) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(APITokens) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(APITokens) { @@ -91,7 +91,7 @@ bool IMPL_ORMDELETE(APITokens) { ExtraFilters.insert(tblAPITokens::apt_usrID, _APICALLBOOM.getUserID()); // this->setSelfFilters({{tblAPITokens::apt_usrID, _APICALLBOOM.getUserID()}}, ExtraFilters); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters); } } //namespace Targoman::API::AccountModule::ORM diff --git a/Modules/Account/moduleSrc/ORM/ActiveSessions.cpp b/Modules/Account/moduleSrc/ORM/ActiveSessions.cpp index 179926ea..d7462d47 100644 --- a/Modules/Account/moduleSrc/ORM/ActiveSessions.cpp +++ b/Modules/Account/moduleSrc/ORM/ActiveSessions.cpp @@ -61,7 +61,7 @@ QVariant IMPL_ORMGET(ActiveSessions) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false) this->setSelfFilters({{tblActiveSessions::ssn_usrID, _APICALLBOOM.getUserID()}}, _filters); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -78,7 +78,7 @@ bool IMPL_ORMDELETE(ActiveSessions) { ExtraFilters.insert(tblActiveSessions::ssn_usrID, _APICALLBOOM.getUserID()); // this->setSelfFilters({{tblActiveSessions::ssn_usrID, _APICALLBOOM.getUserID()}}, ExtraFilters); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters, true); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters, true); // return this->deleteByPKs(DELETE_METHOD_CALL_ARGS_APICALL, ExtraFilters, true); } diff --git a/Modules/Account/moduleSrc/ORM/ApprovalRequest.cpp b/Modules/Account/moduleSrc/ORM/ApprovalRequest.cpp index 4d979f75..f15a61e6 100644 --- a/Modules/Account/moduleSrc/ORM/ApprovalRequest.cpp +++ b/Modules/Account/moduleSrc/ORM/ApprovalRequest.cpp @@ -87,7 +87,7 @@ ApprovalRequest::ApprovalRequest() : QVariant IMPL_ORMGET(ApprovalRequest) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -97,7 +97,7 @@ QVariant IMPL_ORMGET(ApprovalRequest) { bool IMPL_ORMDELETE(ApprovalRequest) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, {}, true); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, {}, true); // return this->deleteByPKs(DELETE_METHOD_CALL_ARGS_APICALL, {}, true); } diff --git a/Modules/Account/moduleSrc/ORM/BlockingRules.cpp b/Modules/Account/moduleSrc/ORM/BlockingRules.cpp index 41bf35d7..e918286c 100644 --- a/Modules/Account/moduleSrc/ORM/BlockingRules.cpp +++ b/Modules/Account/moduleSrc/ORM/BlockingRules.cpp @@ -53,7 +53,7 @@ BlockingRules::BlockingRules() : QVariant IMPL_ORMGET(BlockingRules) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -63,19 +63,19 @@ QVariant IMPL_ORMGET(BlockingRules) { quint64 IMPL_ORMCREATE(BlockingRules) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(BlockingRules) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(BlockingRules) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::AccountModule::ORM diff --git a/Modules/Account/moduleSrc/ORM/ForgotPassRequest.cpp b/Modules/Account/moduleSrc/ORM/ForgotPassRequest.cpp index 25346640..0ff973e9 100644 --- a/Modules/Account/moduleSrc/ORM/ForgotPassRequest.cpp +++ b/Modules/Account/moduleSrc/ORM/ForgotPassRequest.cpp @@ -52,7 +52,7 @@ ForgotPassRequest::ForgotPassRequest() : QVariant IMPL_ORMGET(ForgotPassRequest) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -62,7 +62,7 @@ QVariant IMPL_ORMGET(ForgotPassRequest) { bool IMPL_ORMDELETE(ForgotPassRequest) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, {}, true); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, {}, true); } } //namespace Targoman::API::AccountModule::ORM diff --git a/Modules/Account/moduleSrc/ORM/IPBin.cpp b/Modules/Account/moduleSrc/ORM/IPBin.cpp index 0dffc105..a1aabd16 100644 --- a/Modules/Account/moduleSrc/ORM/IPBin.cpp +++ b/Modules/Account/moduleSrc/ORM/IPBin.cpp @@ -59,7 +59,7 @@ IPBin::IPBin() : QVariant IMPL_ORMGET(IPBin) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); diff --git a/Modules/Account/moduleSrc/ORM/IPStats.cpp b/Modules/Account/moduleSrc/ORM/IPStats.cpp index 7dfd29d4..4eb9ce33 100644 --- a/Modules/Account/moduleSrc/ORM/IPStats.cpp +++ b/Modules/Account/moduleSrc/ORM/IPStats.cpp @@ -31,7 +31,7 @@ namespace Targoman::API::AccountModule::ORM { QVariant IMPL_ORMGET(IPStats) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); diff --git a/Modules/Account/moduleSrc/ORM/PaymentGateways.cpp b/Modules/Account/moduleSrc/ORM/PaymentGateways.cpp index 1a2d6048..892b86ad 100644 --- a/Modules/Account/moduleSrc/ORM/PaymentGateways.cpp +++ b/Modules/Account/moduleSrc/ORM/PaymentGateways.cpp @@ -79,7 +79,7 @@ PaymentGateways::PaymentGateways() : QVariant IMPL_ORMGET(PaymentGateways) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint32 IMPL_ORMCREATE(PaymentGateways) { @@ -88,17 +88,17 @@ quint32 IMPL_ORMCREATE(PaymentGateways) { if (_createInfo.contains(tblPaymentGateways::pgwAllowedDomainName)) _createInfo[tblPaymentGateways::pgwAllowedDomainName] = URLHelper::domain(_createInfo[tblPaymentGateways::pgwAllowedDomainName].toString()); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(PaymentGateways) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(PaymentGateways) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } QVariantList IMPL_REST_GET_OR_POST(PaymentGateways, availableGatewayTypes, ( diff --git a/Modules/Account/moduleSrc/ORM/Payments.cpp b/Modules/Account/moduleSrc/ORM/Payments.cpp index 079b3a5e..536657e8 100644 --- a/Modules/Account/moduleSrc/ORM/Payments.cpp +++ b/Modules/Account/moduleSrc/ORM/Payments.cpp @@ -75,7 +75,7 @@ QVariant IMPL_ORMGET(OnlinePayments) { _query.innerJoin(tblVoucher::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } /*****************************************************************\ @@ -114,24 +114,24 @@ QVariant IMPL_ORMGET(OfflinePaymentClaims) { _query.innerJoin(tblVoucher::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } //quint32 IMPL_ORMCREATE(OfflinePaymentClaims) { // Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); -// return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); +// return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); //} //bool IMPL_ORMUPDATE(OfflinePaymentClaims) { // Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); -// return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); +// return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); //} //bool IMPL_ORMDELETE(OfflinePaymentClaims) { // Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); -// return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); +// return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); //} /*****************************************************************\ @@ -170,12 +170,12 @@ QVariant IMPL_ORMGET(OfflinePayments) { _query.innerJoin(tblVoucher::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } bool IMPL_ORMUPDATE(OfflinePayments) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } /*****************************************************************/ diff --git a/Modules/Account/moduleSrc/ORM/Roles.cpp b/Modules/Account/moduleSrc/ORM/Roles.cpp index 719ba530..d425ac1f 100644 --- a/Modules/Account/moduleSrc/ORM/Roles.cpp +++ b/Modules/Account/moduleSrc/ORM/Roles.cpp @@ -62,7 +62,7 @@ Roles::Roles() : QVariant IMPL_ORMGET(Roles) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -72,19 +72,19 @@ QVariant IMPL_ORMGET(Roles) { quint32 IMPL_ORMCREATE(Roles) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(Roles) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(Roles) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::AccountModule::ORM diff --git a/Modules/Account/moduleSrc/ORM/Service.cpp b/Modules/Account/moduleSrc/ORM/Service.cpp index ed7d1ec5..76f311d9 100644 --- a/Modules/Account/moduleSrc/ORM/Service.cpp +++ b/Modules/Account/moduleSrc/ORM/Service.cpp @@ -60,22 +60,22 @@ Service::Service() : QVariant IMPL_ORMGET(Service) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint64 IMPL_ORMCREATE(Service) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(Service) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(Service) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::AccountModule::ORM diff --git a/Modules/Account/moduleSrc/ORM/User.cpp b/Modules/Account/moduleSrc/ORM/User.cpp index ab83f1ee..aef58bcb 100644 --- a/Modules/Account/moduleSrc/ORM/User.cpp +++ b/Modules/Account/moduleSrc/ORM/User.cpp @@ -136,7 +136,7 @@ QVariant IMPL_ORMGET(User) { return this->Select( *this, - GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, + GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, [](SelectQuery &_query) { @@ -153,7 +153,7 @@ quint64 IMPL_ORMCREATE(User) { if (_createInfo.value(tblUser::usrEmail).toString().isEmpty() && _createInfo.value(tblUser::usrMobile).toString().isEmpty()) throw exHTTPBadRequest("Either email or mobile must be provided to create user"); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } /* @@ -162,13 +162,13 @@ quint64 IMPL_ORMCREATE(User) { bool IMPL_ORMUPDATE(User) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(User) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } SelectQuery User::getPhotoQuery(quint64 _usrID) { diff --git a/Modules/Account/moduleSrc/ORM/UserWallets.cpp b/Modules/Account/moduleSrc/ORM/UserWallets.cpp index f610b84a..124a38cc 100644 --- a/Modules/Account/moduleSrc/ORM/UserWallets.cpp +++ b/Modules/Account/moduleSrc/ORM/UserWallets.cpp @@ -36,72 +36,44 @@ UserWallets::UserWallets() : intfSQLBasedModule( AAASchema, tblUserWallets::Name, - {///privOn(EHTTP_GET, this->moduleBaseName())) == false) - this->setSelfFilters({ { tblUserWallets::wal_usrID, _APICALLBOOM.getUserID() } }, _filters); + this->setSelfFilters({ { tblUserWallets::Fields::wal_usrID, _APICALLBOOM.getUserID() } }, _filters); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint64 IMPL_ORMCREATE(UserWallets) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())) == false) { - _createInfo.insert(tblUserWallets::walDefault, 0); + _createInfo.insert(tblUserWallets::Fields::walDefault, 0); -// this->setSelfFilters({ { tblUserWallets::wal_usrID, _APICALLBOOM.getUserID() } }, _createInfo); - _createInfo.insert(tblUserWallets::wal_usrID, _APICALLBOOM.getUserID()); +// this->setSelfFilters({ { tblUserWallets::Fields::wal_usrID, _APICALLBOOM.getUserID() } }, _createInfo); + _createInfo.insert(tblUserWallets::Fields::wal_usrID, _APICALLBOOM.getUserID()); } - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(UserWallets) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(UserWallets) { TAPI::ORMFields_t ExtraFilters; if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())) == false) { - ExtraFilters.insert(tblUserWallets::walDefault, 0); - ExtraFilters.insert(tblUserWallets::wal_usrID, _APICALLBOOM.getUserID()); + ExtraFilters.insert(tblUserWallets::Fields::walDefault, 0); + ExtraFilters.insert(tblUserWallets::Fields::wal_usrID, _APICALLBOOM.getUserID()); } - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters); } /** diff --git a/Modules/Account/moduleSrc/ORM/UserWallets.h b/Modules/Account/moduleSrc/ORM/UserWallets.h index e1e9f41c..bbe9beaa 100644 --- a/Modules/Account/moduleSrc/ORM/UserWallets.h +++ b/Modules/Account/moduleSrc/ORM/UserWallets.h @@ -37,30 +37,97 @@ TARGOMAN_DEFINE_ENUM(enuUserWalletStatus, Deactive = 'P', Removed = 'R' ) +} //namespace Targoman::API::AccountModule + +TAPI_DECLARE_METATYPE_ENUM(Targoman::API::AccountModule, enuUserWalletStatus); +namespace Targoman::API::AccountModule { namespace ORM { #pragma GCC diagnostic push #pragma GCC diagnostic ignored "-Wunused-variable" -namespace tblUserWallets{ -constexpr char Name[] = "tblUserWallets"; -TARGOMAN_CREATE_CONSTEXPR(walID); -TARGOMAN_CREATE_CONSTEXPR(wal_usrID); -TARGOMAN_CREATE_CONSTEXPR(walName); -TARGOMAN_CREATE_CONSTEXPR(walDefault); -TARGOMAN_CREATE_CONSTEXPR(walMinBalance); -TARGOMAN_CREATE_CONSTEXPR(walNotTransferableAmount); -TARGOMAN_CREATE_CONSTEXPR(walMaxTransferPerDay); -TARGOMAN_CREATE_CONSTEXPR(walBalance); -TARGOMAN_CREATE_CONSTEXPR(walSumIncome); -TARGOMAN_CREATE_CONSTEXPR(walSumExpense); -TARGOMAN_CREATE_CONSTEXPR(walSumCredit); -TARGOMAN_CREATE_CONSTEXPR(walSumDebit); -TARGOMAN_CREATE_CONSTEXPR(walCreatedBy_usrID); -TARGOMAN_CREATE_CONSTEXPR(walCreationDateTime); -TARGOMAN_CREATE_CONSTEXPR(walUpdatedBy_usrID); -TARGOMAN_CREATE_CONSTEXPR(walStatus); -} +namespace tblUserWallets { + + constexpr char Name[] = "tblUserWallets"; + + namespace Fields { + TARGOMAN_CREATE_CONSTEXPR(walID); + TARGOMAN_CREATE_CONSTEXPR(wal_usrID); + TARGOMAN_CREATE_CONSTEXPR(walName); + TARGOMAN_CREATE_CONSTEXPR(walDefault); + TARGOMAN_CREATE_CONSTEXPR(walMinBalance); + TARGOMAN_CREATE_CONSTEXPR(walNotTransferableAmount); + TARGOMAN_CREATE_CONSTEXPR(walMaxTransferPerDay); + TARGOMAN_CREATE_CONSTEXPR(walBalance); + TARGOMAN_CREATE_CONSTEXPR(walSumIncome); + TARGOMAN_CREATE_CONSTEXPR(walSumExpense); + TARGOMAN_CREATE_CONSTEXPR(walSumCredit); + TARGOMAN_CREATE_CONSTEXPR(walSumDebit); + TARGOMAN_CREATE_CONSTEXPR(walCreatedBy_usrID); + TARGOMAN_CREATE_CONSTEXPR(walCreationDateTime); + TARGOMAN_CREATE_CONSTEXPR(walUpdatedBy_usrID); + TARGOMAN_CREATE_CONSTEXPR(walStatus); + } //namespace Fields + + namespace Private { + const QList ORMFields = { + //ColName Type Validation Default UpBy Sort Filter Self Virt PK + { Fields::walID, ORM_PRIMARYKEY_64 }, + { Fields::wal_usrID, S(quint64), QFV.integer().minValue(1), QRequired, UPNone }, + { Fields::walName, S(QString), QFV.unicodeAlNum().maxLenght(100), "default", UPOwner }, + { Fields::walDefault, S(bool), QFV, false, UPOwner }, + { Fields::walMinBalance, S(qint64), QFV, 0, UPAdmin, false, false }, + { Fields::walNotTransferableAmount, S(qint64), QFV, 0, UPAdmin, false, false }, + { Fields::walMaxTransferPerDay, S(qint64), QFV, 10000000, UPAdmin, false, false }, + { Fields::walBalance, S(qint64), QFV, QInvalid, UPNone, false, false }, + { Fields::walSumIncome, S(qint64), QFV, QInvalid, UPNone, false, false }, + { Fields::walSumExpense, S(qint64), QFV, QInvalid, UPNone, false, false }, + { Fields::walSumCredit, S(qint64), QFV, QInvalid, UPNone, false, false }, + { Fields::walSumDebit, S(qint64), QFV, QInvalid, UPNone, false, false }, + { Fields::walStatus, ORM_STATUS_FIELD(Targoman::API::AccountModule::enuUserWalletStatus, Targoman::API::AccountModule::enuUserWalletStatus::Active) }, + { ORM_INVALIDATED_AT_FIELD }, + { Fields::walCreationDateTime, ORM_CREATED_ON }, + { Fields::walCreatedBy_usrID, ORM_CREATED_BY }, + { Fields::walUpdatedBy_usrID, ORM_UPDATED_BY }, + }; + + const QList Relations = { + //Col Reference Table ForeignCol Rename LeftJoin + { Fields::wal_usrID, R(AAASchema, tblUser::Name), tblUser::usrID }, + ORM_RELATION_OF_CREATOR(Fields::walCreatedBy_usrID), + ORM_RELATION_OF_UPDATER(Fields::walUpdatedBy_usrID), + }; + + const QList Indexes = { + { { + Fields::wal_usrID, + Fields::walName, + ORM_INVALIDATED_AT_FIELD_NAME, + }, enuDBIndex::Unique }, + }; + + } //namespace Private + + TAPI_DEFINE_VARIANT_ENABLED_STRUCT(DTO, + SF_ORM_PRIMARYKEY_64(walID), + SF_quint64 (wal_usrID), + SF_QString (walName), + SF_bool (walDefault), + SF_qint64 (walMinBalance), + SF_qint64 (walNotTransferableAmount), + SF_qint64 (walMaxTransferPerDay), + SF_qint64 (walBalance), + SF_qint64 (walSumIncome), + SF_qint64 (walSumExpense), + SF_qint64 (walSumCredit), + SF_qint64 (walSumDebit), + SF_ORM_STATUS_FIELD (walStatus, Targoman::API::AccountModule::enuUserWalletStatus, Targoman::API::AccountModule::enuUserWalletStatus::Active), + SF_ORM_CREATED_ON (walCreationDateTime), + SF_ORM_CREATED_BY (walCreatedBy_usrID), + SF_ORM_UPDATED_BY (walUpdatedBy_usrID) + ); + +} //namespace tblUserWallets #pragma GCC diagnostic pop class UserWallets : public intfSQLBasedModule @@ -159,6 +226,4 @@ private slots: } //namespace ORM } //namespace Targoman::API::AccountModule -TAPI_DECLARE_METATYPE_ENUM(Targoman::API::AccountModule, enuUserWalletStatus); - #endif // TARGOMAN_API_MODULES_ACCOUNT_ORM_USERWALLETS_H diff --git a/Modules/Account/moduleSrc/ORM/Voucher.cpp b/Modules/Account/moduleSrc/ORM/Voucher.cpp index 234d8706..7e678673 100644 --- a/Modules/Account/moduleSrc/ORM/Voucher.cpp +++ b/Modules/Account/moduleSrc/ORM/Voucher.cpp @@ -56,7 +56,7 @@ QVariant IMPL_ORMGET(Voucher) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false) this->setSelfFilters({{tblVoucher::vch_usrID, _APICALLBOOM.getUserID()}}, _filters); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } bool IMPL_ORMDELETE(Voucher) { @@ -69,7 +69,7 @@ bool IMPL_ORMDELETE(Voucher) { // this->setSelfFilters({{tblVoucher::vch_usrID, _APICALLBOOM.getUserID()}}, ExtraFilters); } - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters); } } //namespace Targoman::API::AccountModule::ORM diff --git a/Modules/Account/moduleSrc/ORM/WalletTransactions.cpp b/Modules/Account/moduleSrc/ORM/WalletTransactions.cpp index b3284a9f..ebd84270 100644 --- a/Modules/Account/moduleSrc/ORM/WalletTransactions.cpp +++ b/Modules/Account/moduleSrc/ORM/WalletTransactions.cpp @@ -46,7 +46,7 @@ WalletTransactions::WalletTransactions() : { tblWalletsTransactions::wltDateTime, ORM_CREATED_ON }, }, {///< Col Reference Table ForeignCol Rename LeftJoin - { tblWalletsTransactions::wlt_walID, R(AAASchema, tblUserWallets::Name), tblUserWallets::walID }, + { tblWalletsTransactions::wlt_walID, R(AAASchema, tblUserWallets::Name), tblUserWallets::Fields::walID }, { tblWalletsTransactions::wlt_vchID, R(AAASchema, tblVoucher::Name), tblVoucher::vchID }, { tblWalletsTransactions::wltID, R(AAASchema, tblWalletsBalanceHistory::Name), tblWalletsBalanceHistory::wbl_wltID }, } @@ -54,13 +54,13 @@ WalletTransactions::WalletTransactions() : QVariant IMPL_ORMGET(WalletTransactions) { if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false) - this->setSelfFilters({{tblUserWallets::wal_usrID, _APICALLBOOM.getUserID()}}, _filters); + this->setSelfFilters({{tblUserWallets::Fields::wal_usrID, _APICALLBOOM.getUserID()}}, _filters); auto QueryLambda = [](SelectQuery &_query) { _query.innerJoin(tblUserWallets::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } WalletsBalanceHistory::WalletsBalanceHistory() : diff --git a/Modules/Advert/moduleSrc/ORM/ActiveAds.cpp b/Modules/Advert/moduleSrc/ORM/ActiveAds.cpp index a62369fb..f2d61827 100644 --- a/Modules/Advert/moduleSrc/ORM/ActiveAds.cpp +++ b/Modules/Advert/moduleSrc/ORM/ActiveAds.cpp @@ -35,7 +35,7 @@ namespace Targoman::API::AdvertModule::ORM { QVariant IMPL_ORMGET(ActiveAds) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); @@ -45,7 +45,7 @@ QVariant IMPL_ORMGET(ActiveAds) { bool IMPL_ORMDELETE(ActiveAds) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } ActiveAds::ActiveAds() : diff --git a/Modules/Advert/moduleSrc/ORM/Bin.cpp b/Modules/Advert/moduleSrc/ORM/Bin.cpp index ae071d90..ff611082 100644 --- a/Modules/Advert/moduleSrc/ORM/Bin.cpp +++ b/Modules/Advert/moduleSrc/ORM/Bin.cpp @@ -56,7 +56,7 @@ Bin::Bin() : QVariant IMPL_ORMGET(Bin) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); // return query.one(); diff --git a/Modules/Advert/moduleSrc/ORM/Clicks.cpp b/Modules/Advert/moduleSrc/ORM/Clicks.cpp index 599ab36c..c140ff2d 100644 --- a/Modules/Advert/moduleSrc/ORM/Clicks.cpp +++ b/Modules/Advert/moduleSrc/ORM/Clicks.cpp @@ -40,7 +40,7 @@ QVariant IMPL_ORMGET(Clicks) { _query.innerJoin(tblBin::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } Clicks::Clicks() : diff --git a/Modules/Advert/moduleSrc/ORM/Locations.cpp b/Modules/Advert/moduleSrc/ORM/Locations.cpp index a0e76be2..3d081c47 100644 --- a/Modules/Advert/moduleSrc/ORM/Locations.cpp +++ b/Modules/Advert/moduleSrc/ORM/Locations.cpp @@ -64,25 +64,25 @@ Locations::Locations() : QVariant IMPL_ORMGET(Locations) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint32 IMPL_ORMCREATE(Locations) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(Locations) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(Locations) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::AdvertModule::ORM diff --git a/Modules/Advert/moduleSrc/ORM/Props.cpp b/Modules/Advert/moduleSrc/ORM/Props.cpp index b7741c3c..e72e5a35 100644 --- a/Modules/Advert/moduleSrc/ORM/Props.cpp +++ b/Modules/Advert/moduleSrc/ORM/Props.cpp @@ -39,7 +39,7 @@ QVariant IMPL_ORMGET(Props) { _query.innerJoin(tblBin::Name); }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, 0, QueryLambda); } quint64 IMPL_ORMCREATE(Props) { @@ -47,7 +47,7 @@ quint64 IMPL_ORMCREATE(Props) { _createInfo.insert(tblBin::binID, _APICALLBOOM.getUserID()); // this->setSelfFilters({{tblBin::binID, _APICALLBOOM.getUserID()}}, _createInfo); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(Props) { @@ -57,7 +57,7 @@ bool IMPL_ORMUPDATE(Props) { ExtraFilters.insert(tblBin::binID, _APICALLBOOM.getUserID()); // this->setSelfFilters({{tblBin::binID, _APICALLBOOM.getUserID()}}, ExtraFilters); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters); } bool IMPL_ORMDELETE(Props) { @@ -66,7 +66,7 @@ bool IMPL_ORMDELETE(Props) { ExtraFilters.insert(tblBin::binID, _APICALLBOOM.getUserID()); // this->setSelfFilters({{tblBin::binID, _APICALLBOOM.getUserID()}}, ExtraFilters); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER, ExtraFilters); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER, ExtraFilters); } Props::Props() : diff --git a/Modules/Common/moduleSrc/ORM/Alerts.cpp b/Modules/Common/moduleSrc/ORM/Alerts.cpp index 2e4cf5bb..3a1624ff 100644 --- a/Modules/Common/moduleSrc/ORM/Alerts.cpp +++ b/Modules/Common/moduleSrc/ORM/Alerts.cpp @@ -42,7 +42,7 @@ Alerts::Alerts() : QVariant IMPL_ORMGET(Alerts) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); -// return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); +// return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); return QVariant(); } diff --git a/Modules/NGT/moduleSrc/moduleSrc.pro b/Modules/NGT/moduleSrc/moduleSrc.pro index 1666b064..08548d01 100644 --- a/Modules/NGT/moduleSrc/moduleSrc.pro +++ b/Modules/NGT/moduleSrc/moduleSrc.pro @@ -15,8 +15,5 @@ HEADERS += \ SOURCES += \ NGTv1.cpp -OTHER_FILES += \ - ORM/Schema.my.sql \ - ################################################################################ include($$QBUILD_PATH/templates/moduleConfigs.pri) diff --git a/Modules/Ticketing/moduleSrc/ORM/Departments.cpp b/Modules/Ticketing/moduleSrc/ORM/Departments.cpp index d58b2ac9..dba64650 100644 --- a/Modules/Ticketing/moduleSrc/ORM/Departments.cpp +++ b/Modules/Ticketing/moduleSrc/ORM/Departments.cpp @@ -49,22 +49,22 @@ Departments::Departments() : QVariant IMPL_ORMGET(Departments) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint32 IMPL_ORMCREATE(Departments) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(Departments) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(Departments) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::TicketingModule::ORM diff --git a/Modules/Ticketing/moduleSrc/ORM/TicketAttachments.cpp b/Modules/Ticketing/moduleSrc/ORM/TicketAttachments.cpp index b406a00a..6dc8a6d1 100644 --- a/Modules/Ticketing/moduleSrc/ORM/TicketAttachments.cpp +++ b/Modules/Ticketing/moduleSrc/ORM/TicketAttachments.cpp @@ -117,7 +117,7 @@ QVariant IMPL_ORMGET(TicketAttachments) { }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, ExtraFilters, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, ExtraFilters, 0, QueryLambda); } } //namespace Targoman::API::TicketingModule::ORM diff --git a/Modules/Ticketing/moduleSrc/ORM/Tickets.cpp b/Modules/Ticketing/moduleSrc/ORM/Tickets.cpp index 69c73bda..6505c65f 100644 --- a/Modules/Ticketing/moduleSrc/ORM/Tickets.cpp +++ b/Modules/Ticketing/moduleSrc/ORM/Tickets.cpp @@ -178,7 +178,7 @@ QVariant Tickets::apiGET( ; }; - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, ExtraFilters, 0, QueryLambda); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM, ExtraFilters, 0, QueryLambda); } /******************************************************************************/ diff --git a/Modules/Ticketing/moduleSrc/ORM/Tickets.h b/Modules/Ticketing/moduleSrc/ORM/Tickets.h index 3831cd78..ff6e714b 100644 --- a/Modules/Ticketing/moduleSrc/ORM/Tickets.h +++ b/Modules/Ticketing/moduleSrc/ORM/Tickets.h @@ -80,7 +80,7 @@ private slots: QVariant REST_GET( , ( -// GET_METHOD_ARGS_HEADER_APICALL, +// GET_METHOD_ARGS_DECL_APICALL, APICALLBOOM_TYPE_JWT_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}, quint64 _pageIndex = 0, diff --git a/Modules/Ticketing/moduleSrc/ORM/Units.cpp b/Modules/Ticketing/moduleSrc/ORM/Units.cpp index a6edfc51..3780f2a3 100644 --- a/Modules/Ticketing/moduleSrc/ORM/Units.cpp +++ b/Modules/Ticketing/moduleSrc/ORM/Units.cpp @@ -52,22 +52,22 @@ Units::Units() : QVariant IMPL_ORMGET(Units) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())); - return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM); + return this->Select(*this, GET_METHOD_ARGS_CALL_INTERNAL_BOOM); } quint32 IMPL_ORMCREATE(Units) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName())); - return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Create(*this, CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMUPDATE(Units) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName())); - return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->Update(*this, UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } bool IMPL_ORMDELETE(Units) { Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName())); - return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER); + return this->DeleteByPks(*this, DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER); } } //namespace Targoman::API::TicketingModule::ORM diff --git a/version.pri b/version.pri index bb985ac5..95a704b0 100644 --- a/version.pri +++ b/version.pri @@ -19,8 +19,8 @@ LIBS += -lTargomanCommon \ -lQFieldValidator \ -lqhttp \ -lcurl \ - -lTargomanTextProcessor \ - -lfasttext + -lfasttext \ + -lTargomanTextProcessor defined(QJsonRPC, var) equals(QJsonRPC, 1) { DEFINES += WITH_QJsonRPC