diff --git a/src/main/java/edu/tamu/app/controller/IdeaController.java b/src/main/java/edu/tamu/app/controller/IdeaController.java index e37f22c..ab15184 100644 --- a/src/main/java/edu/tamu/app/controller/IdeaController.java +++ b/src/main/java/edu/tamu/app/controller/IdeaController.java @@ -18,7 +18,7 @@ import edu.tamu.app.model.repo.IdeaRepo; import edu.tamu.app.model.request.FilteredPageRequest; import edu.tamu.app.model.request.IssueRequest; -import edu.tamu.app.service.ProjectService; +import edu.tamu.app.service.ProductService; import edu.tamu.weaver.auth.annotation.WeaverCredentials; import edu.tamu.weaver.auth.model.Credentials; import edu.tamu.weaver.response.ApiResponse; @@ -33,7 +33,7 @@ public class IdeaController { private IdeaRepo ideaRepo; @Autowired - private ProjectService projectService; + private ProductService productService; @RequestMapping("/page") @PreAuthorize("hasRole('SERVICE_MANAGER')") @@ -78,7 +78,7 @@ public ApiResponse helpdesk(@WeaverValidatedModel Idea idea, @WeaverCredentials idea.setState(IdeaState.SENT_TO_HELPDESK); idea = ideaRepo.update(idea); IssueRequest request = new IssueRequest(idea, credentials); - return projectService.submitIssueRequest(request); + return productService.submitIssueRequest(request); } @Transactional diff --git a/src/main/java/edu/tamu/app/controller/ProjectController.java b/src/main/java/edu/tamu/app/controller/ProductController.java similarity index 82% rename from src/main/java/edu/tamu/app/controller/ProjectController.java rename to src/main/java/edu/tamu/app/controller/ProductController.java index 1440857..0644688 100644 --- a/src/main/java/edu/tamu/app/controller/ProjectController.java +++ b/src/main/java/edu/tamu/app/controller/ProductController.java @@ -14,33 +14,33 @@ import edu.tamu.app.exception.UserNotFoundException; import edu.tamu.app.model.FeatureProposal; -import edu.tamu.app.service.ProjectService; +import edu.tamu.app.service.ProductService; import edu.tamu.weaver.response.ApiResponse; import edu.tamu.weaver.validation.aspect.annotation.WeaverValidatedModel; @RestController -@RequestMapping("/projects") -public class ProjectController { +@RequestMapping("/products") +public class ProductController { @Autowired - private ProjectService projectService; + private ProductService productService; @RequestMapping @PreAuthorize("hasRole('USER')") public ApiResponse getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - return projectService.getAll(); + return productService.getAll(); } @RequestMapping("/{id}") @PreAuthorize("hasRole('ANONYMOUS')") public ApiResponse getById(@PathVariable Long id) throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - return projectService.getById(id); + return productService.getById(id); } @RequestMapping("/feature") @PreAuthorize("hasRole('SERVICE_MANAGER')") public ApiResponse submitFeatureRequest(@WeaverValidatedModel FeatureProposal proposal) throws UserNotFoundException { - return projectService.submitFeatureRequest(proposal); + return productService.submitFeatureRequest(proposal); } } diff --git a/src/main/java/edu/tamu/app/controller/ServiceController.java b/src/main/java/edu/tamu/app/controller/ServiceController.java index 6f0f8de..0473f5e 100644 --- a/src/main/java/edu/tamu/app/controller/ServiceController.java +++ b/src/main/java/edu/tamu/app/controller/ServiceController.java @@ -20,7 +20,7 @@ import edu.tamu.app.model.request.FilteredPageRequest; import edu.tamu.app.model.request.IssueRequest; import edu.tamu.app.model.request.ServiceRequest; -import edu.tamu.app.service.ProjectService; +import edu.tamu.app.service.ProductService; import edu.tamu.weaver.auth.annotation.WeaverCredentials; import edu.tamu.weaver.auth.model.Credentials; import edu.tamu.weaver.response.ApiResponse; @@ -39,7 +39,7 @@ public class ServiceController { private IdeaRepo ideaRepo; @Autowired - private ProjectService projectService; + private ProductService productService; @RequestMapping @PreAuthorize("hasRole('ANONYMOUS')") @@ -94,7 +94,7 @@ public ApiResponse submitIssueRequest(@RequestBody ServiceRequest request, @Weav Service service = serviceRepo.findOne(request.getService()); issueRequest.setService(service.getName()); issueRequest.setCredentials(credentials); - return projectService.submitIssueRequest(issueRequest); + return productService.submitIssueRequest(issueRequest); } @RequestMapping("/feature") diff --git a/src/main/java/edu/tamu/app/mock/controller/MockProjectManagementController.java b/src/main/java/edu/tamu/app/mock/controller/MockProductManagementController.java similarity index 70% rename from src/main/java/edu/tamu/app/mock/controller/MockProjectManagementController.java rename to src/main/java/edu/tamu/app/mock/controller/MockProductManagementController.java index 008170a..5498df6 100644 --- a/src/main/java/edu/tamu/app/mock/controller/MockProjectManagementController.java +++ b/src/main/java/edu/tamu/app/mock/controller/MockProductManagementController.java @@ -9,36 +9,36 @@ import org.springframework.web.bind.annotation.RequestMapping; import org.springframework.web.bind.annotation.RestController; -import edu.tamu.app.mock.projects.MockProjects; +import edu.tamu.app.mock.products.MockProducts; import edu.tamu.app.model.request.FeatureRequest; import edu.tamu.weaver.response.ApiResponse; @RestController @Profile("test") -@RequestMapping("/mock/projects") -public class MockProjectManagementController { +@RequestMapping("/mock/products") +public class MockProductManagementController { @Autowired - private MockProjects mockProjects; + private MockProducts mockProducts; @RequestMapping public ApiResponse getAll() { - return new ApiResponse(SUCCESS, mockProjects.getAllProjects()); + return new ApiResponse(SUCCESS, mockProducts.getAllProducts()); } @RequestMapping("/{id}") public ApiResponse getById(@PathVariable Long id) { - return new ApiResponse(SUCCESS, mockProjects.getProjectById(id)); + return new ApiResponse(SUCCESS, mockProducts.getProductById(id)); } @RequestMapping("/issue") public ApiResponse submitIssue(@RequestBody FeatureRequest request) { - return new ApiResponse(SUCCESS, mockProjects.submitRequest(request)); + return new ApiResponse(SUCCESS, mockProducts.submitRequest(request)); } @RequestMapping("/feature") public ApiResponse submitFeature(@RequestBody FeatureRequest request) { - return new ApiResponse(SUCCESS, mockProjects.submitRequest(request)); + return new ApiResponse(SUCCESS, mockProducts.submitRequest(request)); } } diff --git a/src/main/java/edu/tamu/app/mock/projects/MockProjects.java b/src/main/java/edu/tamu/app/mock/products/MockProducts.java similarity index 64% rename from src/main/java/edu/tamu/app/mock/projects/MockProjects.java rename to src/main/java/edu/tamu/app/mock/products/MockProducts.java index dbe679c..5a38ec9 100644 --- a/src/main/java/edu/tamu/app/mock/projects/MockProjects.java +++ b/src/main/java/edu/tamu/app/mock/products/MockProducts.java @@ -1,4 +1,4 @@ -package edu.tamu.app.mock.projects; +package edu.tamu.app.mock.products; import java.io.IOException; import java.util.ArrayList; @@ -19,41 +19,41 @@ import com.fasterxml.jackson.databind.ObjectMapper; import edu.tamu.app.model.request.FeatureRequest; -import edu.tamu.app.model.response.Project; +import edu.tamu.app.model.response.Product; @Service @Profile("test") -public class MockProjects { +public class MockProducts { - private static List projects = new ArrayList(); + private static List products = new ArrayList(); - @Value("classpath:mock/projects.json") + @Value("classpath:mock/products.json") private Resource resource; @Autowired private ObjectMapper objectMapper; @PostConstruct - private void loadProjects() throws JsonParseException, JsonMappingException, IOException { - projects = objectMapper.readValue(resource.getFile(), new TypeReference>() {}); + private void loadProducts() throws JsonParseException, JsonMappingException, IOException { + products = objectMapper.readValue(resource.getFile(), new TypeReference>() {}); } - public List getAllProjects() { - return projects; + public List getAllProducts() { + return products; } - public Project getProjectById(Long id) { - Project project = null; - for (Project currentProject : projects) { - Optional currentId = Optional.ofNullable(Long.valueOf(currentProject.getId())); + public Product getProductById(Long id) { + Product product = null; + for (Product currentProduct : products) { + Optional currentId = Optional.ofNullable(Long.valueOf(currentProduct.getId())); if (currentId.isPresent()) { if (currentId.get().equals(id)) { - project = currentProject; + product = currentProduct; break; } } } - return project; + return product; } public String submitRequest(FeatureRequest request) { diff --git a/src/main/java/edu/tamu/app/model/Service.java b/src/main/java/edu/tamu/app/model/Service.java index 1bbda0d..204dc7b 100644 --- a/src/main/java/edu/tamu/app/model/Service.java +++ b/src/main/java/edu/tamu/app/model/Service.java @@ -51,7 +51,7 @@ public class Service extends AbstractScheduler { private String software; @Column(nullable = true) - private Long projectId; + private Long productId; public Service() { super(); @@ -150,12 +150,12 @@ public void setSoftware(String software) { this.software = software; } - public Long getProjectId() { - return projectId; + public Long getProductId() { + return productId; } - public void setProjectId(Long projectId) { - this.projectId = projectId; + public void setProductId(Long productId) { + this.productId = productId; } @Override diff --git a/src/main/java/edu/tamu/app/model/request/FeatureRequest.java b/src/main/java/edu/tamu/app/model/request/FeatureRequest.java index 610f4c7..657f526 100644 --- a/src/main/java/edu/tamu/app/model/request/FeatureRequest.java +++ b/src/main/java/edu/tamu/app/model/request/FeatureRequest.java @@ -6,7 +6,7 @@ public class FeatureRequest extends AbstractRequest { private static final long serialVersionUID = -6953745180846929244L; - private Long projectId; + private Long productId; public FeatureRequest() { super(); @@ -20,21 +20,21 @@ public FeatureRequest(RequestType type, String title, String description) { super(type, title, description); } - public FeatureRequest(RequestType type, String title, String description, Long projectId) { + public FeatureRequest(RequestType type, String title, String description, Long productId) { this(type, title, description); - this.projectId = projectId; + this.productId = productId; } public FeatureRequest(FeatureProposal proposal) { - this(RequestType.FEATURE, proposal.getTitle(), proposal.getDescription(), proposal.getService().getProjectId()); + this(RequestType.FEATURE, proposal.getTitle(), proposal.getDescription(), proposal.getService().getProductId()); } - public Long getProjectId() { - return projectId; + public Long getProductId() { + return productId; } - public void setProjectId(Long projectId) { - this.projectId = projectId; + public void setProductId(Long productId) { + this.productId = productId; } } diff --git a/src/main/java/edu/tamu/app/model/response/Project.java b/src/main/java/edu/tamu/app/model/response/Product.java similarity index 82% rename from src/main/java/edu/tamu/app/model/response/Project.java rename to src/main/java/edu/tamu/app/model/response/Product.java index 4f8adc8..b1e782e 100644 --- a/src/main/java/edu/tamu/app/model/response/Project.java +++ b/src/main/java/edu/tamu/app/model/response/Product.java @@ -2,7 +2,7 @@ import java.io.Serializable; -public class Project implements Serializable { +public class Product implements Serializable { private static final long serialVersionUID = -6339048161691523620L; @@ -10,11 +10,11 @@ public class Project implements Serializable { private String name; - public Project() { + public Product() { super(); } - public Project(Long id, String name) { + public Product(Long id, String name) { this(); this.id = id; this.name = name; diff --git a/src/main/java/edu/tamu/app/service/ProjectService.java b/src/main/java/edu/tamu/app/service/ProductService.java similarity index 85% rename from src/main/java/edu/tamu/app/service/ProjectService.java rename to src/main/java/edu/tamu/app/service/ProductService.java index 959cde5..151eec7 100644 --- a/src/main/java/edu/tamu/app/service/ProjectService.java +++ b/src/main/java/edu/tamu/app/service/ProductService.java @@ -25,10 +25,10 @@ import edu.tamu.weaver.response.ApiStatus;; @Service -public class ProjectService { +public class ProductService { - @Value("${app.projects.url}") - private String projectsUrl; + @Value("${app.products.url}") + private String productsUrl; @Autowired private ObjectMapper objectMapper; @@ -43,15 +43,15 @@ public class ProjectService { private SimpMessagingTemplate simpMessagingTemplate; public ApiResponse getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - return objectMapper.readValue(new URL(projectsUrl), ApiResponse.class); + return objectMapper.readValue(new URL(productsUrl), ApiResponse.class); } public ApiResponse getById(Long id) throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - return objectMapper.readValue(new URL(projectsUrl + "/" + id), ApiResponse.class); + return objectMapper.readValue(new URL(productsUrl + "/" + id), ApiResponse.class); } public ApiResponse submitFeatureRequest(FeatureProposal proposal) { - ApiResponse response = restTemplate.postForObject(projectsUrl + "/feature", new FeatureRequest(proposal), ApiResponse.class); + ApiResponse response = restTemplate.postForObject(productsUrl + "/feature", new FeatureRequest(proposal), ApiResponse.class); if (response.getMeta().getStatus().equals(ApiStatus.SUCCESS)) { proposal.setState(FeatureProposalState.SUBMITTED); proposal = featureProposalRepo.save(proposal); @@ -61,7 +61,7 @@ public ApiResponse submitFeatureRequest(FeatureProposal proposal) { } public ApiResponse submitIssueRequest(IssueRequest request) { - return restTemplate.postForObject(projectsUrl + "/issue", request, ApiResponse.class); + return restTemplate.postForObject(productsUrl + "/issue", request, ApiResponse.class); } diff --git a/src/main/resources/application.yaml b/src/main/resources/application.yaml index 0c1b71c..00cccd8 100644 --- a/src/main/resources/application.yaml +++ b/src/main/resources/application.yaml @@ -46,7 +46,7 @@ spring: --- app: - projects.url: http://localhost:9001/projects + products.url: http://localhost:9001/products whitelist: 127.0.0.1 diff --git a/src/main/resources/mock/projects.json b/src/main/resources/mock/products.json similarity index 100% rename from src/main/resources/mock/projects.json rename to src/main/resources/mock/products.json diff --git a/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java b/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java index 2d38687..92829ca 100644 --- a/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/IdeaControllerTest.java @@ -36,7 +36,7 @@ import edu.tamu.app.model.repo.specification.IdeaSpecification; import edu.tamu.app.model.request.FilteredPageRequest; import edu.tamu.app.model.request.IssueRequest; -import edu.tamu.app.service.ProjectService; +import edu.tamu.app.service.ProductService; import edu.tamu.weaver.auth.model.Credentials; import edu.tamu.weaver.response.ApiResponse; @@ -91,7 +91,7 @@ public class IdeaControllerTest { private ServiceRepo serviceRepo; @Mock - private ProjectService projectService; + private ProductService productService; @Mock private SimpMessagingTemplate simpMessagingTemplate; @@ -117,7 +117,7 @@ public void setup() throws UserNotFoundException { when(ideaRepo.update(any(Idea.class))).thenReturn(TEST_MODIFIED_IDEA); when(ideaRepo.reject(TEST_IDEA1)).thenReturn(rejectedIdea); when(serviceRepo.findOne(any(Long.class))).thenReturn(TEST_SERVICE); - when(projectService.submitIssueRequest(any(IssueRequest.class))).thenReturn(new ApiResponse(SUCCESS, TEST_ISSUE_REQUEST)); + when(productService.submitIssueRequest(any(IssueRequest.class))).thenReturn(new ApiResponse(SUCCESS, TEST_ISSUE_REQUEST)); doNothing().when(ideaRepo).delete(any(Idea.class)); doNothing().when(ideaRepo).delete(any(Idea.class)); } diff --git a/src/test/java/edu/tamu/app/controller/ProjectControllerTest.java b/src/test/java/edu/tamu/app/controller/ProductControllerTest.java similarity index 59% rename from src/test/java/edu/tamu/app/controller/ProjectControllerTest.java rename to src/test/java/edu/tamu/app/controller/ProductControllerTest.java index 980fd91..3cef1fd 100644 --- a/src/test/java/edu/tamu/app/controller/ProjectControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/ProductControllerTest.java @@ -29,68 +29,68 @@ import edu.tamu.app.exception.UserNotFoundException; import edu.tamu.app.model.FeatureProposal; -import edu.tamu.app.model.response.Project; -import edu.tamu.app.service.ProjectService; +import edu.tamu.app.model.response.Product; +import edu.tamu.app.service.ProductService; import edu.tamu.weaver.response.ApiResponse; import edu.tamu.weaver.response.ApiStatus; @RunWith(SpringRunner.class) -public class ProjectControllerTest { +public class ProductControllerTest { private static String TEST_FEATURE_PROPOSAL_NAME = "Test FP name"; private static String TEST_FEATURE_PROPOSAL_DESCRIPTION = "Test FP name"; private static FeatureProposal TEST_FEATURE_PROPOSAL = new FeatureProposal(TEST_FEATURE_PROPOSAL_NAME, TEST_FEATURE_PROPOSAL_DESCRIPTION); - private static List projects = new ArrayList(); + private static List products = new ArrayList(); - @Value("classpath:mock/projects.json") + @Value("classpath:mock/products.json") private Resource resource; @Spy private ObjectMapper objectMapper; @Mock - private ProjectService projectService; + private ProductService productService; @InjectMocks - private ProjectController projectController; + private ProductController productController; @Before public void setup() throws JsonParseException, JsonMappingException, IOException { MockitoAnnotations.initMocks(this); - projects = objectMapper.readValue(resource.getFile(), new TypeReference>() { + products = objectMapper.readValue(resource.getFile(), new TypeReference>() { }); - when(projectService.getAll()).thenReturn(new ApiResponse(SUCCESS, projects)); - when(projectService.getById(any(Long.class))).thenReturn(new ApiResponse(SUCCESS, projects.get(0))); - when(projectService.submitFeatureRequest(any(FeatureProposal.class))).thenReturn(new ApiResponse(SUCCESS, TEST_FEATURE_PROPOSAL)); + when(productService.getAll()).thenReturn(new ApiResponse(SUCCESS, products)); + when(productService.getById(any(Long.class))).thenReturn(new ApiResponse(SUCCESS, products.get(0))); + when(productService.submitFeatureRequest(any(FeatureProposal.class))).thenReturn(new ApiResponse(SUCCESS, TEST_FEATURE_PROPOSAL)); } @Test @SuppressWarnings("unchecked") public void getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - ApiResponse response = projectController.getAll(); + ApiResponse response = productController.getAll(); assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus()); - List projects = (List) response.getPayload().get("ArrayList"); - assertEquals("Projects response size was not as expected!", projects.size(), projects.size()); - for (int i = 0; i < projects.size(); i++) { - Project project = projects.get(i); - assertEquals(i + " project did not have the correct id!", projects.get(i).getId(), project.getId()); - assertEquals(i + " project did not have the correct name!", projects.get(i).getName(), project.getName()); + List products = (List) response.getPayload().get("ArrayList"); + assertEquals("Products response size was not as expected!", products.size(), products.size()); + for (int i = 0; i < products.size(); i++) { + Product product = products.get(i); + assertEquals(i + " Product did not have the correct id!", products.get(i).getId(), product.getId()); + assertEquals(i + " Product did not have the correct name!", products.get(i).getName(), product.getName()); } } @Test public void getById() throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - ApiResponse response = projectController.getById(1L); + ApiResponse response = productController.getById(1L); assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus()); - Project project = (Project) response.getPayload().get("Project"); - assertNotNull("Project is null!", project); - assertEquals("Project did not have the correct id!", projects.get(0).getId(), project.getId()); - assertEquals("Project did not have the correct name!", projects.get(0).getName(), project.getName()); + Product product = (Product) response.getPayload().get("Product"); + assertNotNull("Product is null!", product); + assertEquals("Product did not have the correct id!", products.get(0).getId(), product.getId()); + assertEquals("Product did not have the correct name!", products.get(0).getName(), product.getName()); } @Test public void testSubmitFeatureRequest() throws UserNotFoundException { - ApiResponse response = projectController.submitFeatureRequest(TEST_FEATURE_PROPOSAL); + ApiResponse response = productController.submitFeatureRequest(TEST_FEATURE_PROPOSAL); assertEquals("Request was not successfull", SUCCESS, response.getMeta().getStatus()); } diff --git a/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java b/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java index 0db014b..3894591 100644 --- a/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java +++ b/src/test/java/edu/tamu/app/controller/ServiceControllerTest.java @@ -38,7 +38,7 @@ import edu.tamu.app.model.request.FilteredPageRequest; import edu.tamu.app.model.request.IssueRequest; import edu.tamu.app.model.request.ServiceRequest; -import edu.tamu.app.service.ProjectService; +import edu.tamu.app.service.ProductService; import edu.tamu.app.service.SystemMonitorService; import edu.tamu.weaver.auth.model.Credentials; import edu.tamu.weaver.response.ApiResponse; @@ -81,7 +81,7 @@ public class ServiceControllerTest { private IdeaRepo ideaRepo; @Mock - private ProjectService projectService; + private ProductService productService; @Mock private SystemMonitorService systemMonitorService; @@ -188,8 +188,8 @@ public void testRemove() { @Test public void submitIssueRequest() { - when(projectService.submitIssueRequest(any(IssueRequest.class))).thenReturn(new ApiResponse(SUCCESS, "Successfully submitted issue request!")); - ServiceRequest request = new ServiceRequest(AbstractRequest.RequestType.ISSUE, "Test feature request", "This is a test issue request on project 1", 1L); + when(productService.submitIssueRequest(any(IssueRequest.class))).thenReturn(new ApiResponse(SUCCESS, "Successfully submitted issue request!")); + 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()); @@ -197,7 +197,7 @@ public void submitIssueRequest() { @Test public void submitFeatureRequest() throws UserNotFoundException { - ServiceRequest request = new ServiceRequest(AbstractRequest.RequestType.FEATURE, "Test issue request", "This is a test issue request on project 1", 1L); + 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()); diff --git a/src/test/java/edu/tamu/app/model/ServiceTest.java b/src/test/java/edu/tamu/app/model/ServiceTest.java index d65b11b..7fa893a 100644 --- a/src/test/java/edu/tamu/app/model/ServiceTest.java +++ b/src/test/java/edu/tamu/app/model/ServiceTest.java @@ -122,14 +122,14 @@ public void testDelete() { } @Test - public void testAssociateProject() { + public void testAssociateProduct() { Service newService = serviceRepo.create(new Service(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_DESCRIPTION)); Long serviceId = newService.getId(); - Long projectId = 1L; - newService.setProjectId(projectId); + Long productId = 1L; + newService.setProductId(productId); serviceRepo.save(newService); - Service serviceWithProjectId = serviceRepo.findOne(serviceId); - assertEquals("The service had the incorrect project id!", projectId, serviceWithProjectId.getProjectId()); + Service serviceWithProductId = serviceRepo.findOne(serviceId); + assertEquals("The service had the incorrect product id!", productId, serviceWithProductId.getProductId()); } @After diff --git a/src/test/java/edu/tamu/app/service/ProjectServiceTest.java b/src/test/java/edu/tamu/app/service/ProductServiceTest.java similarity index 76% rename from src/test/java/edu/tamu/app/service/ProjectServiceTest.java rename to src/test/java/edu/tamu/app/service/ProductServiceTest.java index d43ee7d..16d1247 100644 --- a/src/test/java/edu/tamu/app/service/ProjectServiceTest.java +++ b/src/test/java/edu/tamu/app/service/ProductServiceTest.java @@ -24,7 +24,7 @@ import edu.tamu.app.enums.Role; import edu.tamu.app.enums.Status; import edu.tamu.app.exception.UserNotFoundException; -import edu.tamu.app.mock.projects.MockProjects; +import edu.tamu.app.mock.products.MockProducts; import edu.tamu.app.model.FeatureProposal; import edu.tamu.app.model.Service; import edu.tamu.app.model.User; @@ -34,14 +34,14 @@ import edu.tamu.app.model.request.AbstractRequest; import edu.tamu.app.model.request.AbstractRequest.RequestType; import edu.tamu.app.model.request.IssueRequest; -import edu.tamu.app.model.response.Project; +import edu.tamu.app.model.response.Product; import edu.tamu.weaver.auth.model.Credentials; import edu.tamu.weaver.response.ApiResponse; import edu.tamu.weaver.response.ApiStatus; @RunWith(SpringRunner.class) @SpringBootTest(classes = { StatusApplication.class }, webEnvironment = WebEnvironment.DEFINED_PORT) -public class ProjectServiceTest { +public class ProductServiceTest { private static final String TEST_SERVICE_NAME = "Test Service Name"; private static final String TEST_SERVICE_URL = "https://library.tamu.edu"; @@ -64,10 +64,10 @@ public class ProjectServiceTest { } @Autowired - private MockProjects mockReader; + private MockProducts mockReader; @Autowired - private ProjectService projectService; + private ProductService productService; @Autowired private ObjectMapper objectMapper; @@ -83,29 +83,29 @@ public class ProjectServiceTest { @Test public void getAll() throws JsonParseException, JsonMappingException, MalformedURLException, IOException { - ApiResponse response = projectService.getAll(); + ApiResponse response = productService.getAll(); assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus()); - List projects = objectMapper.convertValue(response.getPayload().get("ArrayList"), new TypeReference>() { + List products = objectMapper.convertValue(response.getPayload().get("ArrayList"), new TypeReference>() { }); - List mockProjects = mockReader.getAllProjects(); - assertEquals("Projects response size was not as expected!", mockProjects.size(), projects.size()); - for (int i = 0; i < projects.size(); i++) { - Project project = projects.get(i); - assertEquals(i + " project did not have the correct id!", mockProjects.get(i).getId(), project.getId()); - assertEquals(i + " project did not have the correct name!", mockProjects.get(i).getName(), project.getName()); + List mockProducts = mockReader.getAllProducts(); + assertEquals("Products response size was not as expected!", mockProducts.size(), products.size()); + for (int i = 0; i < products.size(); i++) { + Product product = products.get(i); + assertEquals(i + " Product did not have the correct id!", mockProducts.get(i).getId(), product.getId()); + assertEquals(i + " Product did not have the correct name!", mockProducts.get(i).getName(), product.getName()); } } @Test public void getById() throws JsonParseException, JsonMappingException, MalformedURLException, IOException { Long id = 1L; - ApiResponse response = projectService.getById(id); + ApiResponse response = productService.getById(id); assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus()); - Project project = objectMapper.convertValue(response.getPayload().get("Project"), Project.class); - assertNotNull("Project is null!", project); - Project mockProject = mockReader.getProjectById(id); - assertEquals("Project did not have the correct id!", mockProject.getId(), project.getId()); - assertEquals("Project did not have the correct name!", mockProject.getName(), project.getName()); + Product product = objectMapper.convertValue(response.getPayload().get("Product"), Product.class); + assertNotNull("Product is null!", product); + Product mockProduct = mockReader.getProductById(id); + assertEquals("Product did not have the correct id!", mockProduct.getId(), product.getId()); + assertEquals("Product did not have the correct name!", mockProduct.getName(), product.getName()); } @Test @@ -113,7 +113,7 @@ public void submitFeatureRequest() throws UserNotFoundException { User testUser = userRepo.create(TEST_CREDENTIALS.getUin(), TEST_CREDENTIALS.getEmail(), TEST_CREDENTIALS.getFirstName(), TEST_CREDENTIALS.getLastName(), Role.valueOf(TEST_CREDENTIALS.getRole())); Service service = serviceRepo.create(new Service(TEST_SERVICE_NAME, TEST_SERVICE_STATUS, TEST_IS_AUTO, TEST_IS_PUBLIC, TEST_ON_SHORT_LIST, TEST_SERVICE_URL, TEST_SERVICE_DESCRIPTION)); FeatureProposal newFeatureProposal = featureProposalRepo.create(new FeatureProposal(TEST_FEATURE_PROPOSAL_TITLE, TEST_FEATURE_PROPOSAL_DESCRIPTION, testUser, service), TEST_CREDENTIALS); - ApiResponse response = projectService.submitFeatureRequest(newFeatureProposal); + ApiResponse response = productService.submitFeatureRequest(newFeatureProposal); assertEquals("Response was not a success!", ApiStatus.SUCCESS, response.getMeta().getStatus()); assertEquals("Response message was not correct!", "Successfully submitted " + RequestType.FEATURE.getName() + " request!", response.getMeta().getMessage()); } @@ -121,7 +121,7 @@ public void submitFeatureRequest() throws UserNotFoundException { @Test public void submitIssueRequest() { IssueRequest request = new IssueRequest(AbstractRequest.RequestType.ISSUE, "Test issue request", "This is a test issue request on service Cap!", "Cap", new Credentials()); - ApiResponse response = projectService.submitIssueRequest(request); + ApiResponse response = productService.submitIssueRequest(request); 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()); } diff --git a/src/test/resources/application.yaml b/src/test/resources/application.yaml index c59fe83..a996cc7 100644 --- a/src/test/resources/application.yaml +++ b/src/test/resources/application.yaml @@ -42,7 +42,7 @@ spring: --- app: - projects.url: http://localhost:${server.port}/mock/projects + products.url: http://localhost:${server.port}/mock/products whitelist: 127.0.0.1 @@ -94,4 +94,4 @@ shib: uin: tamuuin lastName: tdl-sn firstName: tdl-givenname - email: tdl-mail \ No newline at end of file + email: tdl-mail