Skip to content

trigger added for setting approvals as sent #162

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
Jul 17, 2022
Merged

trigger added for setting approvals as sent #162

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
4 changes: 2 additions & 2 deletions Modules/Account/functionalTest/main.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,8 +198,8 @@ int main(int _argc, char *_argv[]) {
try {
FailedTests += QTest::qExec(new testBase(DBPrefix), progArgsCount, progArgs);
if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testAccount(DBPrefix), progArgsCount, progArgs);
if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testAccountFixture(DBPrefix), progArgsCount, progArgs);
if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testJWT(DBPrefix), progArgsCount, progArgs);
// if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testAccountFixture(DBPrefix), progArgsCount, progArgs);
// if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testJWT(DBPrefix), progArgsCount, progArgs);

// if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testActionLogs(DBPrefix), progArgsCount, progArgs);
// if (BreakOnFirstFail && !FailedTests) FailedTests += QTest::qExec(new testActiveSessions(DBPrefix), progArgsCount, progArgs);
Expand Down
6 changes: 3 additions & 3 deletions Modules/Account/functionalTest/testAccount.hpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -303,16 +303,16 @@ private slots:
{ "mobile", "0999-888-1010" },
{ "signupIfNotExists", true },
{ "signupRole", UT_RoleName },
{ "signupEnableEmailAlerts", false },
{ "signupEnableSMSAlerts", false },
{ "signupEnableEmailAlerts", true },
{ "signupEnableSMSAlerts", true },
})
;

qDebug() << Result;

QVERIFY(Result.toBool());
}

private:
void ApproveMobile_And_Login_0999_888_1010() {
clsDAC DAC;
QJsonObject AprInfo = DAC.execQuery("",
Expand Down
35 changes: 35 additions & 0 deletions Modules/Common/migrations/db/m20220717_130957_Common_create_trigget_on_alert_send.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
/* Migration File: m20220717_130957_Common_create_trigget_on_alert_send.sql */
/* CAUTION: don't forget to use {{dbprefix}} for schemas */

USE `{{dbprefix}}{{Schema}}`;

DROP TRIGGER IF EXISTS `tblAlerts_after_update`;
DELIMITER ;;
CREATE TRIGGER `tblAlerts_after_update` AFTER UPDATE ON `tblAlerts` FOR EACH ROW BEGIN
IF (NEW.alrStatus = 'S' AND NEW.alrSentDate IS NOT NULL AND OLD.alrSentDate IS NULL) THEN
-- 1: update tblApprovalRequest
UPDATE {{dbprefix}}AAA.tblApprovalRequest
SET aprStatus = 'S'
, aprSentDate = NEW.alrSentDate
WHERE aprStatus != 'S'
AND aprSentDate IS NULL
AND apr_usrID = NEW.alr_usrID
AND aprRequestedFor = IF(NEW.alr_altCode = 'approveEmail', 'E', 'M')
AND aprApprovalKey = NEW.alrReplacedContactInfo
AND aprApprovalCode = JSON_EXTRACT(NEW.alrReplacements, IF(NEW.alr_altCode = 'approveEmail', '$.UUID', '$.ApprovalCode'))
;

-- 2: update tblForgotPassRequest
UPDATE {{dbprefix}}AAA.tblForgotPassRequest
SET fprStatus = 'S'
-- , fprSentDate = NEW.alrSentDate
WHERE fprStatus != 'S'
-- AND fprSentDate IS NULL
AND fpr_usrID = NEW.alr_usrID
AND fprRequestedVia = IF(NEW.alr_altCode = 'passResetByEmail', 'E', 'M')
AND fprCode = JSON_EXTRACT(NEW.alrReplacements, IF(NEW.alr_altCode = 'passResetByEmail', '$.UUID', '$.ApprovalCode'))
;

END IF;
END;;
DELIMITER ;