Skip to content

Product sprint6 staging #92

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
merged 3 commits into from
Sep 18, 2020
Merged

Product sprint6 staging #92

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
66c1da3
Issue 173: Provide confirmation after submitting idea or issue
kaladay Sep 1, 2020
72753a7
Issue 173: update related tests
kaladay Sep 2, 2020
689cffc
Merge pull request #91 from TAMULib/product-sprint6-173
kaladay Sep 8, 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
8 changes: 6 additions & 2 deletions src/main/java/edu/tamu/app/controller/ServiceController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,7 +94,11 @@ public ApiResponse submitIssueRequest(@RequestBody ServiceRequest request, @Weav
Service service = serviceRepo.findOne(request.getService());
issueRequest.setService(service.getName());
issueRequest.setCredentials(credentials);
return productService.submitIssueRequest(issueRequest);
ApiResponse response = productService.submitIssueRequest(issueRequest);
if (response.getMeta().getStatus().equals(ApiStatus.SUCCESS)) {
return new ApiResponse(SUCCESS, String.format("Your issue for %s has been submitted!", service.getName()), response.getPayload());
}
return response;
}

@RequestMapping("/feature")
Expand All @@ -104,7 +108,7 @@ public ApiResponse submitFeatureRequest(@RequestBody ServiceRequest request, @We
Idea idea = new Idea(request);
idea.setService(service);
ideaRepo.create(idea, credentials);
return new ApiResponse(ApiStatus.SUCCESS, "Your feature request for " + service.getName() + " has been submitted as an idea!");
return new ApiResponse(ApiStatus.SUCCESS, String.format("Your feature request for %s has been submitted as an idea!", service.getName()));
}

}
4 changes: 2 additions & 2 deletions src/test/java/edu/tamu/app/controller/ServiceControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,15 +192,15 @@ public void submitIssueRequest() {
ServiceRequest request = new ServiceRequest(AbstractRequest.RequestType.ISSUE, "Test feature request", "This is a test issue request on product 1", 1L);
ApiResponse response = serviceController.submitIssueRequest(request, credentials);
assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus());
assertEquals("Response message was not correct!", "Successfully submitted " + request.getType().getName() + " request!", response.getMeta().getMessage());
assertEquals("Response message was not correct!", String.format("Your issue for %s has been submitted!", TEST_SERVICE1_NAME), response.getMeta().getMessage());
}

@Test
public void submitFeatureRequest() throws UserNotFoundException {
ServiceRequest request = new ServiceRequest(AbstractRequest.RequestType.FEATURE, "Test issue request", "This is a test issue request on product 1", 1L);
ApiResponse response = serviceController.submitFeatureRequest(request, credentials);
assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus());
assertEquals("Response message was not correct!", "Your feature request for " + TEST_SERVICE1_NAME + " has been submitted as an idea!", response.getMeta().getMessage());
assertEquals("Response message was not correct!", String.format("Your feature request for %s has been submitted as an idea!", TEST_SERVICE1_NAME), response.getMeta().getMessage());
}

@After
Expand Down