Targoman · kambizzandi · May 19, 2022 · May 13, 2022 · May 14, 2022 · May 16, 2022
diff --git a/App/Server/RESTAPIRegistry.cpp b/App/Server/RESTAPIRegistry.cpp
@@ -195,6 +195,7 @@ void RESTAPIRegistry::registerRESTAPI(
                                                         Qt::DirectConnection,
                                                         Q_RETURN_ARG(QString, MethodDoc)
                                                         );
+                MethodDoc = MethodDoc.trimmed();
                 FoundDoc = true;
 //                break;
             }
@@ -659,14 +660,16 @@ void RESTAPIRegistry::dumpAPIs()
 
     TargomanDebug(5).noLabel().noquote().nospace() << endl << Targoman::API::Helpers::ClientConfigs::RESTServerAddress.value();
 
-    int index = 1;
+    int APIsIndex = 1;
+    int MethodsIndex = 1;
     foreach (const QString Name, Keys) {
         bool IsLastAPI = (Name == Keys.last());
 
         TargomanDebug(5).noLabel().noquote().nospace()
                 << "│";
         TargomanDebug(5).noLabel().noquote().nospace()
-                << (IsLastAPI ? "└" : "├") << "── "
+                << (IsLastAPI ? "└" : "├") << "──"
+                << "[" << QString::number(APIsIndex++) << "] "
                 << Name;
 
         QStringList Methods = APIs[Name].keys();
@@ -678,8 +681,8 @@ void RESTAPIRegistry::dumpAPIs()
 
             TargomanDebug(5).noLabel().noquote().nospace()
                     << (IsLastAPI ? " " : "│") << "   "
-                    << (IsLastMethod ? "└" : "├") << "── "
-                    << QString::number(index++) << ") "
+                    << (IsLastMethod ? "└" : "├") << "──"
+                    << "(" << QString::number(MethodsIndex++) << ") "
                     << Method.toUpper(); // << " " << Name;
 
             if (API.APIObject->ParamTypesName.isEmpty() == false) {
@@ -716,7 +719,8 @@ void RESTAPIRegistry::dumpAPIs()
                     TargomanDebug(5).noLabel().noquote().nospace()
                             << (IsLastAPI ? " " : "│") << "   "
                             << (IsLastMethod ? " " : "│") << "   "
-                            << (IsLastParam ?  "└" : "├") << "── "
+                            << (IsLastParam ?  "└" : "├") << "──"
+                            << " " << QString::number(ParamsIndex + 1) << ": "
                             << API.APIObject->ParamTypesName[ParamsIndex].leftJustified(maxLen)
                             << " "
                             << API.APIObject->ParamNames[ParamsIndex]

diff --git a/App/Server/clsAPIObject.cpp b/App/Server/clsAPIObject.cpp
@@ -97,7 +97,7 @@ intfAPIArgManipulator* clsAPIObject::argSpecs(quint8 _paramIndex) const {
 }
 
 QVariant clsAPIObject::invoke(
-    intfAPICallBoom* _APICALLBOOM,
+    INTFAPICALLBOOM_IMPL *_APICALLBOOM,
     bool _isUpdateMethod,
     const QStringList& _args,
 //    /*OUT*/ QVariantMap &_responseHeaders,
@@ -302,7 +302,7 @@ QVariant clsAPIObject::invoke(
 }
 
 void clsAPIObject::invokeMethod(
-    intfAPICallBoom* _APICALLBOOM,
+    INTFAPICALLBOOM_IMPL *_APICALLBOOM,
     const QVariantList& _arguments,
     QGenericReturnArgument _returnArg
 //    /*OUT*/ QVariantMap &_responseHeaders
@@ -320,6 +320,12 @@ void clsAPIObject::invokeMethod(
 
     QVector<void*> ArgStorage(_arguments.size(), {});
 
+#ifdef QT_DEBUG
+    if (this->BaseMethod.name() == "apiPOSTclaimOfflinePayment") {
+        int ii; ii = 0;
+    }
+#endif
+
     auto useArgAt = [=, &_arguments, &ArgStorage](int _i) -> QGenericArgument {
         Targoman::API::Common::intfAPIArgManipulator* ArgMan = (this->ParamTypesID.at(_i) < TAPI_BASE_USER_DEFINED_TYPEID
             ? gOrderedMetaTypeInfo.at(this->ParamTypesID.at(_i))

diff --git a/App/Server/clsAPIObject.h b/App/Server/clsAPIObject.h
@@ -117,7 +117,7 @@ class clsAPIObject : public intfAPIObject, public QObject
     }
 
     QVariant invoke(
-        intfAPICallBoom* _APICALLBOOM,
+        INTFAPICALLBOOM_DECL *_APICALLBOOM,
         bool _isUpdateMethod,
         const QStringList& _args,
 //        /*OUT*/ QVariantMap &_responseHeaders,
@@ -130,7 +130,7 @@ class clsAPIObject : public intfAPIObject, public QObject
     ) const;
 
     void invokeMethod(
-        intfAPICallBoom* _APICALLBOOM,
+        INTFAPICALLBOOM_DECL *_APICALLBOOM,
         const QVariantList& _arguments,
         QGenericReturnArgument _returnArg
 //        /*OUT*/ QVariantMap &_responseHeaders

diff --git a/Interfaces/AAA/Accounting_Defs.hpp b/Interfaces/AAA/Accounting_Defs.hpp
@@ -37,20 +37,31 @@
 namespace Targoman::API::AAA {
 
 TARGOMAN_DEFINE_ENUM(enuVoucherStatus,
-                     New      = 'N',
-                     Canceled = 'C',
-                     Error    = 'E',
-                     Finished = 'F',
-                     Removed  = 'R',
+                     New            = 'N',
+                     Canceled       = 'C',
+                     Error          = 'E',
+                     Finished       = 'F',
+//                     WaitForProcess = 'W',
+                     Removed        = 'R',
                      );
+
 TARGOMAN_DEFINE_ENUM(enuDiscountType,
                      Percent = '%',
                      Currency  = '$',
                      );
+
+TARGOMAN_DEFINE_ENUM(enuVoucherItemProcessStatus,
+                     Canceled   = 'C',
+                     Error      = 'E',
+                     Finished   = 'F',
+                     Removed    = 'R',
+                     );
+
 } //namespace Targoman::API::AAA
 
 TAPI_DECLARE_METATYPE_ENUM(Targoman::API::AAA, enuVoucherStatus)  // -> TAPI_REGISTER_TARGOMAN_ENUM() in Accounting_Interfaces.cpp
 TAPI_DECLARE_METATYPE_ENUM(Targoman::API::AAA, enuDiscountType)   // -> TAPI_REGISTER_TARGOMAN_ENUM() in Accounting_Interfaces.cpp
+TAPI_DECLARE_METATYPE_ENUM(Targoman::API::AAA, enuVoucherItemProcessStatus)   // -> TAPI_REGISTER_TARGOMAN_ENUM() in Accounting_Interfaces.cpp
 
 namespace Targoman::API::AAA {
 
@@ -248,6 +259,11 @@ TAPI_DEFINE_VARIANT_ENABLED_STRUCT(stuVoucher,
     SF_Enum(enuVoucherStatus, Status, enuVoucherStatus::New)
 );
 
+//TAPI_DEFINE_VARIANT_ENABLED_STRUCT(stuVoucherItemProcess,
+//    SF_MD5_t(UUID),
+//    SF_NULLABLE_Enum(enuVoucherItemProcessStatus, Status)
+//);
+
 //bool KKKKKKKKKKKKKKKKKK() {return true;}
 
 typedef QMap<QString, qint32> ServiceUsage_t;

diff --git a/Interfaces/AAA/Accounting_Interfaces.cpp b/Interfaces/AAA/Accounting_Interfaces.cpp
@@ -172,6 +172,7 @@ TAPI_REGISTER_METATYPE(
 
 TAPI_REGISTER_TARGOMAN_ENUM(Targoman::API::AAA, enuVoucherStatus);
 TAPI_REGISTER_TARGOMAN_ENUM(Targoman::API::AAA, enuDiscountType);
+TAPI_REGISTER_TARGOMAN_ENUM(Targoman::API::AAA, enuVoucherItemProcessStatus);
 
 namespace Targoman::API::AAA {
 
@@ -244,29 +245,29 @@ intfAccountProducts::intfAccountProducts(
         }) + _exclusiveIndexes
     ) { ; }
 
-QVariant intfAccountProducts::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
+QVariant IMPL_ORMGET(intfAccountProducts) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName()));
 
     constexpr quint16 CACHE_TIME = 15 * 60;
-    return /*Targoman::API::Query::*/this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL, {}, CACHE_TIME);
+    return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, {}, CACHE_TIME);
 }
 
-quint32 intfAccountProducts::apiCREATE(CREATE_METHOD_ARGS_IMPL_APICALL) {
+quint32 IMPL_ORMCREATE(intfAccountProducts) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountProducts::apiUPDATE(UPDATE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMUPDATE(intfAccountProducts) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountProducts::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMDELETE(intfAccountProducts) {
   Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName()));
 
-  return /*Targoman::API::Query::*/this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
 /******************************************************************/
@@ -326,7 +327,7 @@ intfAccountSaleables::intfAccountSaleables(
         }) + _exclusiveIndexes
     ) { ; }
 
-QVariant intfAccountSaleables::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
+QVariant IMPL_ORMGET(intfAccountSaleables) {
 //    QString ExtraFilters;
 //    if (Authorization::hasPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName())) == false)
 //        ExtraFilters = QString ("%1<=NOW() + ( %2=NULL | %2>=DATE_ADD(NOW(),INTERVAL$SPACE$15$SPACEMIN) )")
@@ -343,25 +344,25 @@ QVariant intfAccountSaleables::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
             );
 
     constexpr quint16 CACHE_TIME = 15 * 60;
-    return /*Targoman::API::Query::*/this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL, ExtraFilters, CACHE_TIME);
+    return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM, ExtraFilters, CACHE_TIME);
 }
 
-quint32 intfAccountSaleables::apiCREATE(CREATE_METHOD_ARGS_IMPL_APICALL) {
+quint32 IMPL_ORMCREATE(intfAccountSaleables) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountSaleables::apiUPDATE(UPDATE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMUPDATE(intfAccountSaleables) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountSaleables::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMDELETE(intfAccountSaleables) {
   Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName()));
 
-  return /*Targoman::API::Query::*/this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
 /******************************************************************/
@@ -415,17 +416,17 @@ intfAccountUserAssets::intfAccountUserAssets(
         }) + _exclusiveIndexes
     ) { ; }
 
-QVariant intfAccountUserAssets::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
+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 /*Targoman::API::Query::*/this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM);
 }
 
-bool intfAccountUserAssets::apiUPDATEsetAsPrefered(
+bool IMPL_REST_UPDATE(intfAccountUserAssets, setAsPrefered, (
     APICALLBOOM_TYPE_JWT_IMPL &APICALLBOOM_PARAM,
     TAPI::PKsByPath_t _pksByPath
-) {
+)) {
   bool Ok;
   quint64 UserPackageID = _pksByPath.toUInt(&Ok);
   if (!Ok || !UserPackageID )
@@ -438,10 +439,10 @@ bool intfAccountUserAssets::apiUPDATEsetAsPrefered(
   return false;
 }
 
-bool intfAccountUserAssets::apiUPDATEdisablePackage(
+bool IMPL_REST_UPDATE(intfAccountUserAssets, disablePackage, (
     APICALLBOOM_TYPE_JWT_IMPL &APICALLBOOM_PARAM,
     TAPI::PKsByPath_t _pksByPath
-) {
+)) {
   bool Ok;
   quint64 UserPackageID = _pksByPath.toUInt(&Ok);
   if (!Ok || !UserPackageID )
@@ -479,11 +480,11 @@ intfSQLBasedModule(
 )
 { ; }
 
-QVariant intfAccountAssetUsage::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
+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 /*Targoman::API::Query::*/this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM);
 }
 
 /******************************************************************/
@@ -535,32 +536,32 @@ intfAccountCoupons::intfAccountCoupons(
         }
     ) { ; }
 
-QVariant intfAccountCoupons::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
+QVariant IMPL_ORMGET(intfAccountCoupons) {
   Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName()));
 
-  return /*Targoman::API::Query::*/this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM);
 
 //  return query.one();
 
 //    return this->selectFromTable({}, {}, GET_METHOD_CALL_ARGS_APICALL);
 }
 
-quint32 intfAccountCoupons::apiCREATE(CREATE_METHOD_ARGS_IMPL_APICALL) {
+quint32 IMPL_ORMCREATE(intfAccountCoupons) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountCoupons::apiUPDATE(UPDATE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMUPDATE(intfAccountCoupons) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountCoupons::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMDELETE(intfAccountCoupons) {
   Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName()));
 
-  return /*Targoman::API::Query::*/this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
 /******************************************************************/
@@ -577,32 +578,32 @@ intfAccountPrizes::intfAccountPrizes(
         _relations
     ) { ; }
 
-QVariant intfAccountPrizes::apiGET(GET_METHOD_ARGS_IMPL_APICALL) {
+QVariant IMPL_ORMGET(intfAccountPrizes) {
   Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_GET, this->moduleBaseName()));
 
-  return /*Targoman::API::Query::*/this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->Select(*this, GET_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM);
 
 //  return query.one();
 
   //  return this->selectFromTable({}, {}, GET_METHOD_CALL_ARGS_APICALL);
 }
 
-quint32 intfAccountPrizes::apiCREATE(CREATE_METHOD_ARGS_IMPL_APICALL) {
+quint32 IMPL_ORMCREATE(intfAccountPrizes) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PUT, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Create(*this, CREATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountPrizes::apiUPDATE(UPDATE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMUPDATE(intfAccountPrizes) {
     Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_PATCH, this->moduleBaseName()));
 
-    return /*Targoman::API::Query::*/this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL);
+    return this->Update(*this, UPDATE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
-bool intfAccountPrizes::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL) {
+bool IMPL_ORMDELETE(intfAccountPrizes) {
   Authorization::checkPriv(_APICALLBOOM.getJWT(), this->privOn(EHTTP_DELETE, this->moduleBaseName()));
 
-  return /*Targoman::API::Query::*/this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL);
+  return this->DeleteByPks(*this, DELETE_METHOD_CALL_ARGS_INTERNAL_CALL_BOOM2USER);
 }
 
 //} //namespace Targoman::API::AAA {

diff --git a/Interfaces/AAA/Authorization.cpp b/Interfaces/AAA/Authorization.cpp
@@ -66,13 +66,13 @@ void checkPriv(const TAPI::JWT_t &_jwt, const QStringList &_requiredAccess, bool
         throw exAuthorization("Not enought privileges: required are <" + _requiredAccess.join("|") + ">");
 }
 
-QVariant getPrivValue(const TAPI::JWT_t &_jwt, QString _accessItem) {
+QVariant getPrivValue(const TAPI::JWT_t &_jwt, QString _accessItem, const QVariant &_defIfNotFoundAndAllIsDefined) {
     QJsonObject Privs = privObjectFromInfo(_jwt);
 
     if (Privs.isEmpty())
         return QVariant();
 
-    return PrivHelpers::getPrivValue(Privs, _accessItem);
+    return PrivHelpers::getPrivValue(Privs, _accessItem, _defIfNotFoundAndAllIsDefined);
 }
 
 QJsonObject privObjectFromInfo(const QJsonObject& _info) {

diff --git a/Interfaces/AAA/Authorization.h b/Interfaces/AAA/Authorization.h
@@ -34,7 +34,7 @@ namespace Targoman::API::AAA::Authorization {
     extern bool hasPriv(const TAPI::JWT_t& _jwt, const QStringList& _requiredAccess, bool _isSelf = false);
     extern void checkPriv(const TAPI::JWT_t& _jwt, const QStringList& _requiredAccess, bool _isSelf = false);
     extern QJsonObject privObjectFromInfo(const QJsonObject& _info);
-    extern QVariant getPrivValue(const TAPI::JWT_t &_jwt, QString _accessItem);
+    extern QVariant getPrivValue(const TAPI::JWT_t &_jwt, QString _accessItem, const QVariant &_defIfNotFoundAndAllIsDefined = {});
 
 } // namespace Targoman::API::AAA::Authorization