Skip to content

fix extrafilters bug #180

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kambizzandi merged 1 commit into from
Aug 3, 2022
Merged

fix extrafilters bug #180

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
54 changes: 27 additions & 27 deletions Interfaces/AAA/Accounting_Interfaces.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,25 +160,25 @@ ORMSelectQuery intfAccountUnits::GetSelectQuery(INTFAPICALLBOOM_IMPL &APICALLBOO

QVariant IMPL_ANONYMOUSE_ORMGET(intfAccountUnits) {
constexpr quint16 CACHE_TIME = 15 * 60;
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, CACHE_TIME);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL, {}, CACHE_TIME);
}

quint32 IMPL_ORMCREATE(intfAccountUnits) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PUT, this->moduleBaseName()));

return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMUPDATE(intfAccountUnits) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PATCH, this->moduleBaseName()));

return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMDELETE(intfAccountUnits) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_DELETE, this->moduleBaseName()));

return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand Down Expand Up @@ -263,25 +263,25 @@ QVariant IMPL_ANONYMOUSE_ORMGET(intfAccountProducts) {

constexpr quint16 CACHE_TIME = 15 * 60;

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, CACHE_TIME);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL, {}, CACHE_TIME);
}

quint32 IMPL_ORMCREATE(intfAccountProducts) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PUT, this->moduleBaseName()));

return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMUPDATE(intfAccountProducts) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PATCH, this->moduleBaseName()));

return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMDELETE(intfAccountProducts) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_DELETE, this->moduleBaseName()));

return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand Down Expand Up @@ -390,25 +390,25 @@ QVariant IMPL_ANONYMOUSE_ORMGET(intfAccountSaleables) {
));
};

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM, ExtraFilters, CACHE_TIME, fnTouchQuery);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL, ExtraFilters, CACHE_TIME, fnTouchQuery);
}

quint32 IMPL_ORMCREATE(intfAccountSaleables) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PUT, this->moduleBaseName()));

return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMUPDATE(intfAccountSaleables) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PATCH, this->moduleBaseName()));

return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMDELETE(intfAccountSaleables) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_DELETE, this->moduleBaseName()));

return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand All @@ -432,25 +432,25 @@ intfAccountSaleablesFiles::intfAccountSaleablesFiles(

QVariant IMPL_ANONYMOUSE_ORMGET(intfAccountSaleablesFiles) {
constexpr quint16 CACHE_TIME = 15 * 60;
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM, {}, CACHE_TIME);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL, {}, CACHE_TIME);
}

quint32 IMPL_ORMCREATE(intfAccountSaleablesFiles) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PUT, this->moduleBaseName()));

return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMUPDATE(intfAccountSaleablesFiles) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PATCH, this->moduleBaseName()));

return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMDELETE(intfAccountSaleablesFiles) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_DELETE, this->moduleBaseName()));

return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand Down Expand Up @@ -593,7 +593,7 @@ QVariant IMPL_ORMGET(intfAccountUserAssets) {
if (Authorization::hasPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_GET, this->moduleBaseName())) == false)
this->setSelfFilters({{tblAccountUserAssetsBase::Fields::uas_usrID, APICALLBOOM_PARAM.getUserID() }}, _filters);

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_REST_UPDATE(intfAccountUserAssets, setAsPrefered, (
Expand Down Expand Up @@ -654,7 +654,7 @@ intfAccountUserAssetsFiles::intfAccountUserAssetsFiles(
QVariant IMPL_ORMGET(intfAccountUserAssetsFiles) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_GET, this->moduleBaseName()));

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand All @@ -678,7 +678,7 @@ QVariant IMPL_ORMGET(intfAccountAssetUsage) {
if (Authorization::hasPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_GET, this->moduleBaseName())) == false)
this->setSelfFilters({{tblAccountUserAssetsBase::Fields::uas_usrID, APICALLBOOM_PARAM.getUserID()}}, _filters);

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand All @@ -701,7 +701,7 @@ intfAccountCoupons::intfAccountCoupons(
QVariant IMPL_ORMGET(intfAccountCoupons) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_GET, this->moduleBaseName()));

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL);

// return query.one();

Expand All @@ -711,19 +711,19 @@ QVariant IMPL_ORMGET(intfAccountCoupons) {
quint32 IMPL_ORMCREATE(intfAccountCoupons) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PUT, this->moduleBaseName()));

return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMUPDATE(intfAccountCoupons) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PATCH, this->moduleBaseName()));

return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMDELETE(intfAccountCoupons) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_DELETE, this->moduleBaseName()));

return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL);
}

/******************************************************************/
Expand All @@ -746,7 +746,7 @@ intfAccountPrizes::intfAccountPrizes(
QVariant IMPL_ORMGET(intfAccountPrizes) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_GET, this->moduleBaseName()));

return this->Select(GET_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Select(GET_METHOD_ARGS_CALL_INTERNAL);

// return query.one();

Expand All @@ -756,19 +756,19 @@ QVariant IMPL_ORMGET(intfAccountPrizes) {
quint32 IMPL_ORMCREATE(intfAccountPrizes) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PUT, this->moduleBaseName()));

return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Create(CREATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMUPDATE(intfAccountPrizes) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_PATCH, this->moduleBaseName()));

return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->Update(UPDATE_METHOD_ARGS_CALL_INTERNAL);
}

bool IMPL_ORMDELETE(intfAccountPrizes) {
Authorization::checkPriv(APICALLBOOM_PARAM, this->privOn(EHTTP_DELETE, this->moduleBaseName()));

return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM);
return this->DeleteByPks(DELETE_METHOD_ARGS_CALL_INTERNAL);
}

//} //namespace Targoman::API::AAA {
Expand Down
45 changes: 12 additions & 33 deletions Interfaces/API/intfPureModule.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,10 +99,10 @@ using namespace Targoman::API::Server;
QString docOfGET##_name() { return _doc; }

//used by intfSQLBasedModule
#define GET_METHOD_ARGS_DECL_INTERNAL_BOOM INTERNAL_GET_METHOD_ARGS_DECL_APICALL(INTFAPICALLBOOM_DECL)
#define GET_METHOD_ARGS_IMPL_INTERNAL_BOOM INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(INTFAPICALLBOOM_IMPL)
#define GET_METHOD_ARGS_DECL_INTERNAL INTERNAL_GET_METHOD_ARGS_DECL_APICALL(INTFAPICALLBOOM_DECL)
#define GET_METHOD_ARGS_IMPL_INTERNAL INTERNAL_GET_METHOD_ARGS_IMPL_APICALL(INTFAPICALLBOOM_IMPL)

#define GET_METHOD_ARGS_CALL_INTERNAL_BOOM \
#define GET_METHOD_ARGS_CALL_INTERNAL \
APICALLBOOM_PARAM, \
_pksByPath, \
_pageIndex, \
Expand All @@ -126,16 +126,9 @@ using namespace Targoman::API::Server;

#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

#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_PARAM, _createInfo

//#define CREATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER APICALLBOOM_PARAM.getUserID(), _createInfo
#define CREATE_METHOD_ARGS_DECL_INTERNAL INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo = {}
#define CREATE_METHOD_ARGS_IMPL_INTERNAL INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::ORMFields_t _createInfo
#define CREATE_METHOD_ARGS_CALL_INTERNAL APICALLBOOM_PARAM, _createInfo

/**********************************************************************\
|** UPDATE ************************************************************|
Expand All @@ -150,16 +143,9 @@ using namespace Targoman::API::Server;

#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

#define UPDATE_METHOD_ARGS_DECL_INTERNAL_BOOM INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}, TAPI::ORMFields_t _updateInfo = {}
#define UPDATE_METHOD_ARGS_IMPL_INTERNAL_BOOM INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath, TAPI::ORMFields_t _updateInfo
#define UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM APICALLBOOM_PARAM, _pksByPath, _updateInfo

//#define UPDATE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER APICALLBOOM_PARAM.getUserID(), _pksByPath, _updateInfo
#define UPDATE_METHOD_ARGS_DECL_INTERNAL INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}, TAPI::ORMFields_t _updateInfo = {}
#define UPDATE_METHOD_ARGS_IMPL_INTERNAL INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath, TAPI::ORMFields_t _updateInfo
#define UPDATE_METHOD_ARGS_CALL_INTERNAL APICALLBOOM_PARAM, _pksByPath, _updateInfo

/**********************************************************************\
|** DELETE ************************************************************|
Expand All @@ -174,16 +160,9 @@ using namespace Targoman::API::Server;

#define IMPL_ORMDELETE(_module) _module::apiDELETE(DELETE_METHOD_ARGS_IMPL_APICALL)

//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_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_PARAM, _pksByPath

//#define DELETE_METHOD_ARGS_CALL_INTERNAL_BOOM2USER APICALLBOOM_PARAM.getUserID(), _pksByPath
#define DELETE_METHOD_ARGS_DECL_INTERNAL INTFAPICALLBOOM_DECL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath = {}
#define DELETE_METHOD_ARGS_IMPL_INTERNAL INTFAPICALLBOOM_IMPL &APICALLBOOM_PARAM, TAPI::PKsByPath_t _pksByPath
#define DELETE_METHOD_ARGS_CALL_INTERNAL APICALLBOOM_PARAM, _pksByPath

/**********************************************************************/
namespace TAPI {
Expand Down
Loading