PAN-46 Merged with Master

persistence/scripts/mysql/local_development.sql

@@ -5,11 +5,11 @@ create table accounts (
 id int not null auto_increment primary key unique,
 username varchar(50) not null unique,
 password varchar(256) not null,
-administrator_status boolean default false,
+administrator boolean default false,
 last_login date,
 version int default 1
 );
-insert into accounts (username, password, administrator_status)
+insert into accounts (username, password, administrator)
 values ('admin', 'secret', true),
 ('atusa', 'secret', true),
 ('dantanxiaotian', 'secret', true),
@@ -34,17 +34,17 @@ referenced_theorems json,
 proven_status boolean default false,
 version int default 1
 );
-CREATE TABLE proofs
+create table proofs
 (
-  id        INT NOT NULL AUTO_INCREMENT,
+  id int not null auto_increment,
-  theorem_name      VARCHAR(512) NOT NULL,
+  theorem_name varchar(512) not null,
-  proof VARCHAR(4096) NOT NULL,
+  proof varchar(4096) not null,
-  branch    VARCHAR(512) NOT NULL,
+  branch varchar(512) not null,
-  theorem   INT NOT NULL,
+  theorem int not null,
-  referenced_definitions JSON,
+  referenced_definitions json,
-  referenced_theorems JSON,
+  referenced_theorems json,
-  date_added DATE,
+  date_added date,
-  last_updated DATE,
+  last_updated date,
-  version INT DEFAULT 1,
+  version int default 1,
-  PRIMARY KEY (id)
+  primary key (id)
 );

persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/AccountsIntegrationTest.java

@@ -29,7 +29,7 @@ public class AccountsIntegrationTest {
 
         assertEquals("Test username", savedAccount.getUsername());
         assertEquals("test password", savedAccount.getPassword());
-        assertTrue(savedAccount.getAdministratorStatus());
+        assertTrue(savedAccount.isAdministrator());
 
         savedAccount.setPassword("Test Update");
 
@@ -37,7 +37,7 @@ public class AccountsIntegrationTest {
 
         assertEquals("Test username", savedAccount.getUsername());
         assertEquals("Test Update", savedAccount.getPassword());
-        assertTrue(savedAccount.getAdministratorStatus());
+        assertTrue(savedAccount.isAdministrator());
         assertEquals(updatedAccount.getId(), id);
 
         accountsRepository.delete(account);
@@ -49,7 +49,7 @@ public class AccountsIntegrationTest {
         final Account account = new Account();
         account.setUsername("Test username");
         account.setPassword("test password");
-        account.setAdministratorStatus(true);
+        account.setAdministrator(true);
 
         return account;
     }

persistence/src/integrationTest/java/edu/msudenver/tsp/persistence/ProofsIntegrationTest.java

@@ -18,8 +18,7 @@ import static org.junit.Assert.*;
 @RunWith(SpringJUnit4ClassRunner.class)
 @ContextConfiguration(classes = PersistenceTestConfig.class)
 public class ProofsIntegrationTest {
-    @Autowired
+    @Autowired private ProofRepository proofRepository;
-    private ProofRepository proofRepository;
 
     @Test
     public void testCRUDFunctionality() {

persistence/src/main/java/edu/msudenver/tsp/persistence/dto/Account.java

@@ -19,21 +19,11 @@ import java.util.Date;
 public class Account 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 @Column(name = "administrator_status") private boolean administratorStatus;
+    @NotNull private boolean administrator;
     @Temporal(TemporalType.DATE) @Column(name = "last_login") private Date lastLogin;
 
     private static final long serialVersionUID = 7095627971593953734L;
 
-    @JsonProperty("administrator_status")
-    public boolean getAdministratorStatus() {
-        return administratorStatus;
-    }
-
-    @JsonProperty("administrator_status")
-    public void setAdministratorStatus(final boolean administratorStatus) {
-        this.administratorStatus = administratorStatus;
-    }
-
     @JsonProperty("last_login")
     public Date getLastLogin() {
         return lastLogin;

persistence/src/test/java/edu/msudenver/tsp/persistence/controller/AccountControllerTest.java

@@ -236,7 +236,7 @@ public class AccountControllerTest {
         final Account account = new Account();
         account.setUsername("Test username");
         account.setPassword("test password");
-        account.setAdministratorStatus(true);
+        account.setAdministrator(true);
 
         return account;
     }

services/build.gradle

@@ -18,10 +18,12 @@ repositories {
 }
 
 dependencies {
-    compile project(':persistence')
     compile group: 'org.apache.httpcomponents', name: 'httpcore', version: '4.4.11'
     compile group: 'org.apache.httpcomponents', name: 'fluent-hc', version: '4.5.7'
     compile group: 'com.google.code.gson', name: 'gson', version: '2.7'
+    compile group: 'org.springframework.boot', name: 'spring-boot-devtools', version: '2.0.5.RELEASE'
+    compile group: 'org.springframework.boot', name: 'spring-boot-starter-web', version: '2.0.5.RELEASE'
+    compile group: 'javax.persistence', name: 'javax.persistence-api', version: '2.2'
     compile fileTree(dir: 'lib', include: '**/*.jar')
 
     testCompile "org.springframework:spring-test:5.0.9.RELEASE"

services/src/integrationTest/java/edu/msudenver/tsp/services/UserServiceIntegrationTest.java

@@ -23,7 +23,7 @@ public class UserServiceIntegrationTest {
     private UserService userService;
 
     @Test
-    public void testUserService(){
+    public void testCRUD() {
         final Account testAccount = createAccount();
 
         final Optional<Account> testCreatedAccount = userService.createAccount(testAccount);
@@ -31,21 +31,21 @@ public class UserServiceIntegrationTest {
         final Account returnedAccount = testCreatedAccount.get();
         assertEquals("test_user", returnedAccount.getUsername());
         assertEquals("test_password", returnedAccount.getPassword());
-        assertFalse(returnedAccount.isAdministratorStatus());
+        assertFalse(returnedAccount.isAdministrator());
 
         final Optional<Account> getAccountById = userService.findAccountById(returnedAccount.getId());
         assertTrue(getAccountById.isPresent());
         final Account returnedAccountById = getAccountById.get();
         assertEquals("test_user", returnedAccountById.getUsername());
         assertEquals("test_password", returnedAccountById.getPassword());
-        assertFalse(returnedAccountById.isAdministratorStatus());
+        assertFalse(returnedAccountById.isAdministrator());
 
         final Optional<Account> getAccountByUsername = userService.findAccountByUsername(returnedAccount.getUsername());
         assertTrue(getAccountByUsername.isPresent());
         final Account returnedAccountByUsername = getAccountByUsername.get();
         assertEquals("test_user", returnedAccountByUsername.getUsername());
         assertEquals("test_password", returnedAccountByUsername.getPassword());
-        assertFalse(returnedAccountById.isAdministratorStatus());
+        assertFalse(returnedAccountById.isAdministrator());
 
         returnedAccount.setUsername("test_updatedUser");
         returnedAccount.setPassword("test_updatedPassword");
@@ -55,7 +55,7 @@ public class UserServiceIntegrationTest {
         final Account returnedUpdatedAccount = updatedAccount.get();
         assertEquals("test_updatedUser", returnedUpdatedAccount.getUsername());
         assertEquals("test_updatedPassword", returnedUpdatedAccount.getPassword());
-        assertFalse(returnedUpdatedAccount.isAdministratorStatus());
+        assertFalse(returnedUpdatedAccount.isAdministrator());
 
         final boolean result = userService.deleteAccount(returnedUpdatedAccount);
         assertTrue(result);
@@ -65,7 +65,7 @@ public class UserServiceIntegrationTest {
         final Account testAccount = new Account();
         testAccount.setUsername("test_user");
         testAccount.setPassword("test_password");
-        testAccount.setAdministratorStatus(false);
+        testAccount.setAdministrator(false);
         testAccount.setLastLogin(new Date());
 
         return testAccount;

services/src/main/java/edu/msudenver/tsp/services/dto/Account.java

@@ -16,7 +16,7 @@ import java.util.Date;
 public class Account extends BaseDto implements Serializable {
     @Size(max = 50) private String username;
     @Size(max = 256) private String password;
-    @NotNull @SerializedName("administrator_status") private boolean administratorStatus;
+    @NotNull private boolean administrator;
     @Temporal(TemporalType.DATE) @SerializedName("last_login") private Date lastLogin;
 
     private static final long serialVersionUID = 7095627971593953734L;

services/src/test/java/edu/msudenver/tsp/services/UserServiceTest.java

@@ -306,7 +306,7 @@ public class UserServiceTest {
         final Account account = new Account();
         account.setUsername("Test username");
         account.setPassword("test password");
-        account.setAdministratorStatus(true);
+        account.setAdministrator(true);
         account.setLastLogin(new Date());
         return account;
     }