Skip to content

Add more files to ticket #178

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 2 commits into from
Aug 1, 2022
Merged

Add more files to ticket #178

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1d84da0
add more files fot ticket
kambizzandi Aug 1, 2022
78b5c69
add more files fot ticket
kambizzandi Aug 1, 2022
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
12 changes: 8 additions & 4 deletions Interfaces/Common/GenericTypes.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -132,13 +132,15 @@ struct stuFileInfo {
static stuFileInfo fromVariant(const QVariant& _value, const QByteArray& _paramName = {});
};

class Files_t : public QList<stuFileInfo>{
class Files_t : public QList<stuFileInfo>
{
public:
QVariant toVariant() const;
Files_t& fromVariant(const QVariant& _value, const QByteArray& _paramName = {});
};

class RawData_t {
class RawData_t
{
public:
RawData_t() = default;
~RawData_t() = default;
Expand All @@ -154,7 +156,8 @@ class RawData_t {
QByteArray Data;
};

class FileData_t {
class FileData_t
{
public:
FileData_t() = default;
~FileData_t() = default;
Expand All @@ -170,7 +173,8 @@ class FileData_t {
// QString Mime;
};

class ResponseRedirect_t {
class ResponseRedirect_t
{
public:
ResponseRedirect_t() = default;
~ResponseRedirect_t() = default;
Expand Down
13 changes: 13 additions & 0 deletions Modules/Account/moduleSrc/ORM/WalletTransactions.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,19 @@ TAPI_REGISTER_TARGOMAN_ENUM(Targoman::API::AccountModule, enuWalletTransactionSt

namespace Targoman::API::AccountModule::ORM {

/*
SELECT *
FROM tblWalletsTransactions
LEFT JOIN tblWalletsBalanceHistory
ON tblWalletsBalanceHistory.wbl_wltID = tblWalletsTransactions.wltID
LEFT JOIN tblVoucher
ON tblVoucher.vchID = tblWalletsTransactions.wlt_vchID
LEFT JOIN tblUserWallets
ON tblUserWallets.walID = tblWalletsTransactions.wlt_walID
ORDER BY wlt_walID, wltID -- , wltDateTime
-- wlt_walID, wltID
*/

/*****************************************************************\
|* WalletTransactions ********************************************|
\*****************************************************************/
Expand Down
6 changes: 3 additions & 3 deletions Modules/Ticketing/functionalTest/testTicketing.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -169,7 +169,7 @@ private slots:
{ "body", "this is ticket body" },
},
{
{ "file", "../../README.md" },
{ "file_1", "../../README.md" },
}
);

Expand Down Expand Up @@ -198,7 +198,7 @@ private slots:
{ "inReplyTicketID", this->MainTicketID },
},
{
{ "file", "../../README.md" },
{ "file_1", "../../README.md" },
}
);

Expand Down Expand Up @@ -227,7 +227,7 @@ private slots:
{ "inReplyTicketID", this->Reply1TicketID },
},
{
{ "file", "../../README.md" },
{ "file_1", "../../README.md" },
}
);

Expand Down
28 changes: 19 additions & 9 deletions Modules/Ticketing/moduleSrc/Ticketing.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -142,13 +142,18 @@ QVariantMap IMPL_REST_PUT(Ticketing, newMessage, (
quint32 _serviceID,
quint64 _targetUserID,
quint32 _unitID,
const TAPI::stuFileInfo &_file
const TAPI::stuFileInfo &_file_1,
const TAPI::stuFileInfo &_file_2,
const TAPI::stuFileInfo &_file_3,
const TAPI::stuFileInfo &_file_4
)) {
// Authorization::checkPriv(APICALLBOOM_PARAM, { this->moduleBaseName() + ":canPUTNewMessage" });

TAPI::Files_t Files;
if (_file.Size > 0)
Files.append(_file);
if (_file_1.Size > 0) Files.append(_file_1);
if (_file_2.Size > 0) Files.append(_file_2);
if (_file_3.Size > 0) Files.append(_file_3);
if (_file_4.Size > 0) Files.append(_file_4);

quint64 ID = this->insertTicket(
APICALLBOOM_PARAM,
Expand All @@ -174,7 +179,10 @@ QVariantMap IMPL_REST_PUT(Ticketing, newFeedback, (
Targoman::API::TicketingModule::enuTicketType::Type _ticketType,
quint32 _serviceID,
quint64 _inReplyTicketID,
const TAPI::stuFileInfo &_file
const TAPI::stuFileInfo &_file_1,
const TAPI::stuFileInfo &_file_2,
const TAPI::stuFileInfo &_file_3,
const TAPI::stuFileInfo &_file_4
)) {
Authorization::checkPriv(APICALLBOOM_PARAM, {});

Expand All @@ -186,8 +194,10 @@ QVariantMap IMPL_REST_PUT(Ticketing, newFeedback, (
throw exHTTPBadRequest("Message and Broadcast tickets must be sent via newMessage method");

TAPI::Files_t Files;
if (_file.Size > 0)
Files.append(_file);
if (_file_1.Size > 0) Files.append(_file_1);
if (_file_2.Size > 0) Files.append(_file_2);
if (_file_3.Size > 0) Files.append(_file_3);
if (_file_4.Size > 0) Files.append(_file_4);

quint64 ID = this->insertTicket(
APICALLBOOM_PARAM,
Expand Down Expand Up @@ -290,7 +300,7 @@ QVariant IMPL_REST_POST(Ticketing, fixtureSetup, (
{ "body", FixtureHelper::MakeRandomizeName(_random, " ", "ticket", "body") },
},
{
// { "file", "../../README.md" },
// { "file_1", "../../README.md" },
}
);
quint32 TicketID = res.toMap().value("id").toUInt();
Expand All @@ -310,7 +320,7 @@ QVariant IMPL_REST_POST(Ticketing, fixtureSetup, (
{ "inReplyTicketID", TicketID },
},
{
// { "file", "../../README.md" },
// { "file_1", "../../README.md" },
}
);
quint32 Reply1TicketID = res.toMap().value("id").toUInt();
Expand All @@ -330,7 +340,7 @@ QVariant IMPL_REST_POST(Ticketing, fixtureSetup, (
{ "inReplyTicketID", Reply1TicketID },
},
{
// { "file", "../../README.md" },
// { "file_1", "../../README.md" },
}
);
// quint32 Reply2TicketID = res.toMap().value("id").toUInt();
Expand Down
10 changes: 8 additions & 2 deletions Modules/Ticketing/moduleSrc/Ticketing.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,10 @@ private slots:
quint32 _serviceID,
quint64 _targetUserID = 0,
quint32 _unitID = 0,
const TAPI::stuFileInfo &_file = {}
const TAPI::stuFileInfo &_file_1 = {},
const TAPI::stuFileInfo &_file_2 = {},
const TAPI::stuFileInfo &_file_3 = {},
const TAPI::stuFileInfo &_file_4 = {}
),
"create new message targeting a user or all users (if target user is 0)"
)
Expand All @@ -90,7 +93,10 @@ private slots:
Targoman::API::TicketingModule::enuTicketType::Type _ticketType,
quint32 _serviceID,
quint64 _inReplyTicketID = 0,
const TAPI::stuFileInfo &_file = {}
const TAPI::stuFileInfo &_file_1 = {},
const TAPI::stuFileInfo &_file_2 = {},
const TAPI::stuFileInfo &_file_3 = {},
const TAPI::stuFileInfo &_file_4 = {}
),
"create a new/reply feedback with"
)
Expand Down