diff --git a/UpdatePTUDevCtrl/worker.h b/UpdatePTUDevCtrl/worker.h index 77ff901..654bf3a 100644 --- a/UpdatePTUDevCtrl/worker.h +++ b/UpdatePTUDevCtrl/worker.h @@ -864,43 +864,89 @@ private: .arg(instance->m_customerRepository) .arg(instance->m_gc.branchName()), instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A")); - break; - case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE: + } break; + case UPDATE_STEP::CHECKOUT_REPOSITORY_FAILURE: { ismasClient.setProgressInPercent(_CHECKOUT_REPOSITORY_FAILURE); - break; - case UPDATE_STEP::CHECK_ISMAS_TRIGGER: + QString const &ismasUpdateNews = + QString("#M=APISM#C=CMD_EVENT#J=") + + ismasClient.updateNewsToIsmas( + _ISMAS_CONTINUE, // U0010 -> even on error: U0002/3 are sent only once + _CHECKOUT_REPOSITORY_FAILURE, + IsmasClient::RESULT_CODE::GIT_SWITCH_BRANCH_ERROR, + smap[UPDATE_STEP::CHECKOUT_REPOSITORY], + QString("%1: CHECKING OUT BRANCH %2 FAILED") + .arg(instance->m_customerRepository) + .arg(instance->m_gc.branchName()).toStdString().c_str(), + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); + ismasClient.sendRequestReceiveResponse( + IsmasClient::APISM::DB_PORT, ismasUpdateNews); + } break; + case UPDATE_STEP::CHECK_ISMAS_TRIGGER: { ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER); - break; - case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS: + } break; + case UPDATE_STEP::CHECK_ISMAS_TRIGGER_SUCCESS: { ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_SUCCESS); ismasClient.sendRequestReceiveResponse(IsmasClient::APISM::DB_PORT, QString("#M=APISM#C=CMD_EVENT#J=") + ismasClient.updateTriggerSet("ISMAS TRIGGER SET", instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A")); - break; - case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE: + } break; + case UPDATE_STEP::CHECK_ISMAS_TRIGGER_WRONG_VALUE: { ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_WRONG_VALUE); - break; - case UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE: { - ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_FAILURE); QString const &ismasUpdateNews = QString("#M=APISM#C=CMD_EVENT#J=") + ismasClient.updateNewsToIsmas( - "U0003", - _CHECK_ISMAS_TRIGGER_FAILURE, - IsmasClient::RESULT_CODE::INSTALL_ERROR, + _ISMAS_TEST_TRIGGER, // U0099 + _CHECK_ISMAS_TRIGGER_WRONG_VALUE, + IsmasClient::RESULT_CODE::ISMAS_TRIGGER_ERROR, smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER], instance->m_ismasMsg.join(' ').toStdString().c_str(), instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); ismasClient.sendRequestReceiveResponse( IsmasClient::APISM::DB_PORT, ismasUpdateNews); } break; - case UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER: + case UPDATE_STEP::CHECK_ISMAS_TRIGGER_FAILURE: { + ismasClient.setProgressInPercent(_CHECK_ISMAS_TRIGGER_FAILURE); + QString const &ismasUpdateNews = + QString("#M=APISM#C=CMD_EVENT#J=") + + ismasClient.updateNewsToIsmas( + _ISMAS_TEST_TRIGGER, // U0099 + _CHECK_ISMAS_TRIGGER_FAILURE, + IsmasClient::RESULT_CODE::ISMAS_TRIGGER_ERROR, + smap[UPDATE_STEP::CHECK_ISMAS_TRIGGER], + instance->m_ismasMsg.join(' ').toStdString().c_str(), + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); + ismasClient.sendRequestReceiveResponse( + IsmasClient::APISM::DB_PORT, ismasUpdateNews); + } break; + case UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER: { ismasClient.setProgressInPercent(_INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER); - break; - case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER: + QString const &ismasUpdateNews = + QString("#M=APISM#C=CMD_EVENT#J=") + + ismasClient.updateNewsToIsmas( + _ISMAS_CONTINUE, // U0010 + _INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER, + IsmasClient::RESULT_CODE::SUCCESS, + smap[UPDATE_STEP::INITIAL_CLONE_WITHOUT_ACTIVE_ISMAS_TRIGGER], + instance->m_ismasMsg.join(' ').toStdString().c_str(), + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); + ismasClient.sendRequestReceiveResponse( + IsmasClient::APISM::DB_PORT, ismasUpdateNews); + } break; + case UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER: { ismasClient.setProgressInPercent(_INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER); - break; + QString const &ismasUpdateNews = + QString("#M=APISM#C=CMD_EVENT#J=") + + ismasClient.updateNewsToIsmas( + _ISMAS_CONTINUE, // U0010 + _INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER, + IsmasClient::RESULT_CODE::SUCCESS, + smap[UPDATE_STEP::INITIAL_CLONE_WITH_ACTIVE_ISMAS_TRIGGER], + instance->m_ismasMsg.join(' ').toStdString().c_str(), + instance->m_versionInfo.size() >= 1 ? instance->m_versionInfo.at(0).toUtf8().constData() : "N/A"); + ismasClient.sendRequestReceiveResponse( + IsmasClient::APISM::DB_PORT, ismasUpdateNews); + } break; case UPDATE_STEP::PULL_NEW_BRANCH: { ismasClient.setProgressInPercent(_PULL_NEW_BRANCH); QString const &ismasUpdateNews =