Dark-Alex-17/ptp
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

PAN-48 Added dependency on utilities to the persistence project

Browse Source
This commit is contained in:
atusa17
2019-02-24 20:31:24 -07:00
parent 030e66f516
commit 0734f6ff10
6 changed files with 73 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pandamonium-theorem-prover/build.gradle
+7
View File
@@ -45,6 +45,7 @@ allprojects {
}
subprojects {
apply plugin: 'java'
repositories {
mavenCentral()
}
@@ -108,6 +109,12 @@ dependencies {
apt 'org.projectlombok:lombok:1.18.4'
}
project(':persistence') {
dependencies {
compile project(':utilities')
}
}
test {
if (System.properties['test.profile'] != 'integrationTest') {
exclude '**/*integrationTest*'
pandamonium-theorem-prover/persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java
+12 -12
View File
@@ -1,6 +1,6 @@
package edu.msudenver.tsp.persistence;
import edu.msudenver.tsp.persistence.dto.AccountsDto;
import edu.msudenver.tsp.persistence.dto.AccountDto;
import edu.msudenver.tsp.persistence.repository.AccountsRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -19,8 +19,8 @@ public class AccountsIntegrationTest {
@Test
public void testCRUDFunctionality() {
final AccountsDto accountsDto = createAccount();
final AccountsDto savedAccount = accountsRepository.save(accountsDto);
final AccountDto accountDto = createAccount();
final AccountDto savedAccount = accountsRepository.save(accountDto);
assertNotNull(savedAccount);
assertEquals(Integer.valueOf(0), savedAccount.getVersion());
@@ -33,25 +33,25 @@ public class AccountsIntegrationTest {
savedAccount.setPassword("Test Update");
final AccountsDto updatedAccount = accountsRepository.save(savedAccount);
final AccountDto updatedAccount = accountsRepository.save(savedAccount);
assertEquals("Test username", savedAccount.getUsername());
assertEquals("Test Update", savedAccount.getPassword());
assertTrue(savedAccount.isAdministratorStatus());
assertEquals(updatedAccount.getId(), id);
accountsRepository.delete(accountsDto);
final Optional<AccountsDto> deletedAccount = accountsRepository.findById(id);
accountsRepository.delete(accountDto);
final Optional<AccountDto> deletedAccount = accountsRepository.findById(id);
assertFalse(deletedAccount.isPresent());
}
private AccountsDto createAccount() {
final AccountsDto accountsDto = new AccountsDto();
accountsDto.setUsername("Test username");
accountsDto.setPassword("test password");
accountsDto.setAdministratorStatus(true);
private AccountDto createAccount() {
final AccountDto accountDto = new AccountDto();
accountDto.setUsername("Test username");
accountDto.setPassword("test password");
accountDto.setAdministratorStatus(true);
return accountsDto;
return accountDto;
}
}
pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/controller/AccountController.java
+16 -16
View File
@@ -1,6 +1,6 @@
package edu.msudenver.tsp.persistence.controller;
import edu.msudenver.tsp.persistence.dto.AccountsDto;
import edu.msudenver.tsp.persistence.dto.AccountDto;
import edu.msudenver.tsp.persistence.repository.AccountsRepository;
import edu.msudenver.tsp.utilities.PersistenceUtilities;
import lombok.AllArgsConstructor;
@@ -26,7 +26,7 @@ public class AccountController {
@GetMapping("/")
public @ResponseBody
ResponseEntity<Iterable<AccountsDto>> getListOfAccounts() {
ResponseEntity<Iterable<AccountDto>> getListOfAccounts() {
LOG.info("Received request to list all accounts");
LOG.debug("Querying for list of accounts");
@@ -34,7 +34,7 @@ public class AccountController {
final StopWatch stopWatch = new StopWatch();
stopWatch.start();
final List<AccountsDto> listOfAccounts = (List<AccountsDto>) accountsRepository.findAll();
final List<AccountDto> listOfAccounts = (List<AccountDto>) accountsRepository.findAll();
stopWatch.stop();
@@ -46,7 +46,7 @@ public class AccountController {
@GetMapping("/{id}")
public @ResponseBody
ResponseEntity<AccountsDto> getAccountById(@PathVariable("id") final Integer id) {
ResponseEntity<AccountDto> getAccountById(@PathVariable("id") final Integer id) {
LOG.info("Received request to query for account with id " + id);
if (id == null) {
LOG.error("ERROR: ID was null");
@@ -57,7 +57,7 @@ public class AccountController {
final StopWatch stopWatch = new StopWatch();
stopWatch.start();
final Optional<AccountsDto> account = accountsRepository.findById(id);
final Optional<AccountDto> account = accountsRepository.findById(id);
stopWatch.stop();
@@ -74,9 +74,9 @@ public class AccountController {
}
@PostMapping("/")
@Validated({AccountsDto.Insert.class, Default.class})
public @ResponseBody ResponseEntity<AccountsDto> insertAccount(
@Valid @RequestBody final AccountsDto accountsDto, final BindingResult bindingResult) {
@Validated({AccountDto.Insert.class, Default.class})
public @ResponseBody ResponseEntity<AccountDto> insertAccount(
@Valid @RequestBody final AccountDto accountDto, final BindingResult bindingResult) {
LOG.info("Received request to insert a new account");
if (bindingResult.hasErrors()) {
@@ -84,7 +84,7 @@ public class AccountController {
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
}
if (accountsDto == null) {
if (accountDto == null) {
LOG.error("Passed account is unprocessable");
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
}
@@ -94,7 +94,7 @@ public class AccountController {
final StopWatch stopWatch = new StopWatch();
stopWatch.start();
final AccountsDto savedAccount = accountsRepository.save(accountsDto);
final AccountDto savedAccount = accountsRepository.save(accountDto);
stopWatch.stop();
@@ -104,9 +104,9 @@ public class AccountController {
}
@PatchMapping("/{id}")
public @ResponseBody ResponseEntity<AccountsDto> updateAccount(
public @ResponseBody ResponseEntity<AccountDto> updateAccount(
@PathVariable("id") final Integer id,
@RequestBody final AccountsDto accountsDto, final BindingResult bindingResult) {
@RequestBody final AccountDto accountDto, final BindingResult bindingResult) {
LOG.info("Received request to update an account");
if (bindingResult.hasErrors()) {
@@ -114,7 +114,7 @@ public class AccountController {
return new ResponseEntity<>(HttpStatus.UNPROCESSABLE_ENTITY);
}
if (accountsDto == null) {
if (accountDto == null) {
LOG.error("Passed entity is null");
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
}
@@ -129,7 +129,7 @@ public class AccountController {
final StopWatch stopWatch = new StopWatch();
stopWatch.start();
final Optional<AccountsDto> existingAccount = accountsRepository.findById(id);
final Optional<AccountDto> existingAccount = accountsRepository.findById(id);
stopWatch.stop();
@@ -140,7 +140,7 @@ public class AccountController {
return new ResponseEntity<>(HttpStatus.BAD_REQUEST);
}
PersistenceUtilities.copyNonNullProperties(accountsDto, existingAccount.get());
PersistenceUtilities.copyNonNullProperties(accountDto, existingAccount.get());
existingAccount.get().setVersion(existingAccount.get().getVersion()+ 1);
LOG.info("Updating account with id " + id);
@@ -148,7 +148,7 @@ public class AccountController {
stopWatch.start();
final AccountsDto updatedAccount = accountsRepository.save(existingAccount.get());
final AccountDto updatedAccount = accountsRepository.save(existingAccount.get());
stopWatch.stop();
pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountsDto.java → pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/dto/AccountDto.java
+1 -1
View File
@@ -19,7 +19,7 @@ import java.util.Date;
@EntityListeners(AuditingEntityListener.class)
@Data
@EqualsAndHashCode(callSuper = true)
public class AccountsDto extends BaseDto implements Serializable {
public class AccountDto extends BaseDto implements Serializable {
@NotBlank(groups = Insert.class, message = "A username must be specified") @Size(max = 50) private String username;
@NotBlank(groups = Insert.class, message = "A password must be specified") @Size(max = 256) private String password;
@NotNull @JsonProperty("administrator_status") private boolean administratorStatus;
pandamonium-theorem-prover/persistence/src/main/java/edu/msudenver/tsp/persistence/repository/AccountsRepository.java
+2 -2
View File
@@ -1,9 +1,9 @@
package edu.msudenver.tsp.persistence.repository;
import edu.msudenver.tsp.persistence.dto.AccountsDto;
import edu.msudenver.tsp.persistence.dto.AccountDto;
import org.springframework.data.repository.CrudRepository;
import org.springframework.stereotype.Repository;
@Repository
public interface AccountsRepository extends CrudRepository<AccountsDto, Integer> {
public interface AccountsRepository extends CrudRepository<AccountDto, Integer> {
}
pandamonium-theorem-prover/persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java
+35 -35
View File
@@ -1,6 +1,6 @@
package edu.msudenver.tsp.persistence.controller;
import edu.msudenver.tsp.persistence.dto.AccountsDto;
import edu.msudenver.tsp.persistence.dto.AccountDto;
import edu.msudenver.tsp.persistence.repository.AccountsRepository;
import org.junit.Test;
import org.junit.runner.RunWith;
@@ -33,35 +33,35 @@ public class AccountControllerTest {
@Test
public void testGetAllAccounts() {
final AccountsDto accountsDto = createAccount();
final List<AccountsDto> accountsDtoList = new ArrayList<>();
accountsDtoList.add(accountsDto);
accountsDtoList.add(accountsDto);
final AccountDto accountDto = createAccount();
final List<AccountDto> accountDtoList = new ArrayList<>();
accountDtoList.add(accountDto);
accountDtoList.add(accountDto);
when(accountsRepository.findAll()).thenReturn(accountsDtoList);
when(accountsRepository.findAll()).thenReturn(accountDtoList);
final ResponseEntity<Iterable<AccountsDto>> responseEntity = accountController.getListOfAccounts();
final ResponseEntity<Iterable<AccountDto>> responseEntity = accountController.getListOfAccounts();
assertNotNull(responseEntity);
assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
assertTrue(responseEntity.hasBody());
assertNotNull(responseEntity.getBody());
responseEntity.getBody().forEach(account -> assertEquals(account, accountsDto));
responseEntity.getBody().forEach(account -> assertEquals(account, accountDto));
}
@Test
public void testGetAccountById() {
final AccountsDto accountsDto = createAccount();
when(accountsRepository.findById(anyInt())).thenReturn(Optional.ofNullable(accountsDto));
final AccountDto accountDto = createAccount();
when(accountsRepository.findById(anyInt())).thenReturn(Optional.ofNullable(accountDto));
final ResponseEntity<AccountsDto> responseEntity = accountController.getAccountById(1);
final ResponseEntity<AccountDto> responseEntity = accountController.getAccountById(1);
assertNotNull(responseEntity);
assertTrue(responseEntity.hasBody());
assertNotNull(responseEntity.getBody());
assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
assertEquals(accountsDto, responseEntity.getBody());
assertEquals(accountDto, responseEntity.getBody());
verify(accountsRepository).findById(anyInt());
}
@@ -89,17 +89,17 @@ public class AccountControllerTest {
@Test
public void testInsertAccount() {
final AccountsDto accountsDto = createAccount();
when(accountsRepository.save(any(AccountsDto.class))).thenReturn(accountsDto);
final AccountDto accountDto = createAccount();
when(accountsRepository.save(any(AccountDto.class))).thenReturn(accountDto);
final ResponseEntity<AccountsDto> responseEntity = accountController.insertAccount(accountsDto, bindingResult);
final ResponseEntity<AccountDto> responseEntity = accountController.insertAccount(accountDto, bindingResult);
assertNotNull(responseEntity);
assertTrue(responseEntity.hasBody());
assertNotNull(responseEntity.getBody());
assertEquals(HttpStatus.CREATED, responseEntity.getStatusCode());
assertEquals(accountsDto, responseEntity.getBody());
verify(accountsRepository).save(any(AccountsDto.class));
assertEquals(accountDto, responseEntity.getBody());
verify(accountsRepository).save(any(AccountDto.class));
}
@Test
@@ -114,7 +114,7 @@ public class AccountControllerTest {
@Test
public void testInsertAccount_bindingResultHasErrors() {
final AccountsDto definitionDto = createAccount();
final AccountDto definitionDto = createAccount();
when(bindingResult.hasErrors()).thenReturn(true);
final ResponseEntity responseEntity = accountController.insertAccount(definitionDto, bindingResult);
@@ -127,31 +127,31 @@ public class AccountControllerTest {
@Test
public void testUpdateAccount() {
final AccountsDto existingAccount = createAccount();
final AccountDto existingAccount = createAccount();
existingAccount.setId(1);
existingAccount.setVersion(1);
final AccountsDto accountUpdate = new AccountsDto();
final AccountDto accountUpdate = new AccountDto();
accountUpdate.setUsername("Test Update");
final AccountsDto updatedAccount = existingAccount;
final AccountDto updatedAccount = existingAccount;
updatedAccount.setUsername("Test Update");
when(accountsRepository.findById(anyInt())).thenReturn(Optional.of(existingAccount));
when(accountsRepository.save(any(AccountsDto.class))).thenReturn(updatedAccount);
when(accountsRepository.save(any(AccountDto.class))).thenReturn(updatedAccount);
final ResponseEntity<AccountsDto> responseEntity = accountController.updateAccount(1, accountUpdate, bindingResult);
final ResponseEntity<AccountDto> responseEntity = accountController.updateAccount(1, accountUpdate, bindingResult);
assertNotNull(responseEntity);
assertTrue(responseEntity.hasBody());
assertEquals(HttpStatus.OK, responseEntity.getStatusCode());
assertEquals(updatedAccount, responseEntity.getBody());
verify(accountsRepository).findById(anyInt());
verify(accountsRepository).save(any(AccountsDto.class));
verify(accountsRepository).save(any(AccountDto.class));
}
@Test
public void testUpdateAccount_bindingResultHasErrors() {
when(bindingResult.hasErrors()).thenReturn(true);
final ResponseEntity<AccountsDto> responseEntity = accountController.updateAccount(1, createAccount(), bindingResult);
final ResponseEntity<AccountDto> responseEntity = accountController.updateAccount(1, createAccount(), bindingResult);
assertNotNull(responseEntity);
assertFalse(responseEntity.hasBody());
@@ -161,7 +161,7 @@ public class AccountControllerTest {
@Test
public void testUpdateAccount_accountsDtoIsNull() {
final ResponseEntity<AccountsDto> responseEntity = accountController.updateAccount(1, null, bindingResult);
final ResponseEntity<AccountDto> responseEntity = accountController.updateAccount(1, null, bindingResult);
assertNotNull(responseEntity);
assertFalse(responseEntity.hasBody());
@@ -171,7 +171,7 @@ public class AccountControllerTest {
@Test
public void testUpdateAccount_idIsNull() {
final ResponseEntity<AccountsDto> responseEntity = accountController.updateAccount(null, createAccount(), bindingResult);
final ResponseEntity<AccountDto> responseEntity = accountController.updateAccount(null, createAccount(), bindingResult);
assertNotNull(responseEntity);
assertFalse(responseEntity.hasBody());
@@ -183,12 +183,12 @@ public class AccountControllerTest {
public void testUpdateAccount_accountDoesNotExist() {
when(accountsRepository.findById(anyInt())).thenReturn(Optional.empty());
final ResponseEntity<AccountsDto> responseEntity = accountController.updateAccount(1, createAccount(), bindingResult);
final ResponseEntity<AccountDto> responseEntity = accountController.updateAccount(1, createAccount(), bindingResult);
assertNotNull(responseEntity);
assertFalse(responseEntity.hasBody());
assertEquals(HttpStatus.BAD_REQUEST, responseEntity.getStatusCode());
verify(accountsRepository, times(0)).save(any(AccountsDto.class));
verify(accountsRepository, times(0)).save(any(AccountDto.class));
}
@Test
@@ -213,12 +213,12 @@ public class AccountControllerTest {
verifyZeroInteractions(accountsRepository);
}
private AccountsDto createAccount() {
final AccountsDto accountsDto = new AccountsDto();
accountsDto.setUsername("Test username");
accountsDto.setPassword("test password");
accountsDto.setAdministratorStatus(true);
private AccountDto createAccount() {
final AccountDto accountDto = new AccountDto();
accountDto.setUsername("Test username");
accountDto.setPassword("test password");
accountDto.setAdministratorStatus(true);
return accountsDto;
return accountDto;
}
}