Skip to content
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

Igw dev 410 rc3 bugs #621

Open
wants to merge 12 commits into
base: igw-dev-410-rc3
Choose a base branch
from
Open

Igw dev 410 rc3 bugs #621

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
a6710da
INTGW-1027 : Inactivated Per Quota Tier in Edit application
SkNuwanTissera Apr 15, 2020
b0d7d2e
INTGW-1027 : Inactivated Per Quota Tier in Edit application
SkNuwanTissera Apr 15, 2020
139f8e4
INTGW-1027 : Inactivated Per Quota Tier in Edit application
SkNuwanTissera Apr 15, 2020
4c74fe9
INTGW-960 : Incorrect message is showing when creating new user in store
SkNuwanTissera Apr 15, 2020
64f8ea2
INTGW-1047 : Customize admin portal for Apigate theme
SkNuwanTissera Apr 17, 2020
2f346c4
INTGW-1048 : Hide unnecessary and irrelevant tabs and actions from ad…
SkNuwanTissera Apr 17, 2020
7ec3b6a
INTGW-1048 : Hide unnecessary and irrelevant tabs and actions from ad…
SkNuwanTissera Apr 20, 2020
35ffbab
INTGW-1048 : Hide unnecessary and irrelevant tabs and actions from ad…
SkNuwanTissera Apr 20, 2020
1768615
Merge remote-tracking branch 'origin/igw-dev-410-rc3-bugs' into igw-d…
SkNuwanTissera Apr 20, 2020
aacc070
INTGW-960 : Incorrect message is showing when creating new user in store
SkNuwanTissera Apr 22, 2020
957a0de
INTGW-1055 : [410][Adv. Throttling] - Required/correct data are not a…
SkNuwanTissera Apr 27, 2020
cd324a1
Merge branch 'igw-dev-410-rc3' of https://github.com/WSO2Telco/compon…
SkNuwanTissera Apr 27, 2020
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
23 changes: 19 additions & 4 deletions ...n/java/com/wso2telco/hub/workflow/extensions/ApplicationCreationRestWorkflowExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -263,10 +263,25 @@ public WorkflowResponse complete(WorkflowDTO workFlowDTO) throws WorkflowExcepti
throw new WorkflowException(msg, e);
}

String msgOnCompletion = "Application Creation approval process completed. Workflow ID : " + workFlowDTO
.getExternalWorkflowReference() + " Workflow State : " + workFlowDTO.getStatus();
log.info(msgOnCompletion);
auditLog.info(msgOnCompletion);
/**
* Log improvement : Application Approval details
*/
try {
Application application = dao.getApplicationById(Integer.parseInt(workFlowDTO.getWorkflowReference()));

String msgOnCompletion =
" Application Creation approval process completed. Workflow ID : " + workFlowDTO.getExternalWorkflowReference() +
" | Workflow State : " + workFlowDTO.getStatus() +
" | Application name : " + application.getName() +
" | UUID : " + application.getUUID() +
" | Subscriber : " + application.getSubscriber().getName() +
" | Owner : " + application.getOwner() +
" | Approved Tier : " + application.getTier();
log.info(msgOnCompletion);
auditLog.info(msgOnCompletion);
} catch (APIManagementException e) {
e.printStackTrace();
}

return new GeneralWorkflowResponse();
}
Expand Down
25 changes: 21 additions & 4 deletions .../java/com/wso2telco/hub/workflow/extensions/SubscriptionCreationRestWorkflowExecutor.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,11 +306,28 @@ public WorkflowResponse execute(WorkflowDTO workflowDTO) throws WorkflowExceptio
@Override
public WorkflowResponse complete(WorkflowDTO workFlowDTO) throws WorkflowException {
workFlowDTO.setUpdatedTime(System.currentTimeMillis());
ApiMgtDAO dao = ApiMgtDAO.getInstance();
super.complete(workFlowDTO);
String logm = "Subscription Creation [Complete] Workflow Invoked. Workflow ID : " +
workFlowDTO.getExternalWorkflowReference() + "Workflow State : " + workFlowDTO.getStatus();
log.info(logm);
auditLog.info(logm);

/**
* Log improvement : Subscription Approval details
*/
try {
SubscribedAPI subscription = dao.getSubscriptionById(Integer.parseInt(workFlowDTO.getExternalWorkflowReference()));
String logm =
"Subscription Creation [Complete] Workflow Invoked. Workflow ID : " + workFlowDTO.getExternalWorkflowReference() +
" | Workflow State : " + workFlowDTO.getStatus() +
" | API ID : " + subscription.getApiId() +
" | UUID : " + subscription.getUUID() +
" | Subscriber : " + subscription.getSubscriber().getName() +
" | Application : " + subscription.getApplication() +
" | Approved Tier : " + subscription.getTier();
log.info(logm);
auditLog.info(logm);
} catch (APIManagementException e) {
e.printStackTrace();
}


if (WorkflowStatus.APPROVED.equals(workFlowDTO.getStatus()) ||
WorkflowStatus.REJECTED.equals(workFlowDTO.getStatus())) {
Expand Down