From 091215f1eb617ac83a74a6a781334e32350ad27f Mon Sep 17 00:00:00 2001
From: atusa17 <alex.j.tusa@gmail.com>
Date: Sun, 7 Apr 2019 17:22:08 -0600
Subject: [PATCH] PAN-11 Fixed integration tests

---
 .../java/edu/msudenver/tsp/services/ServicesTestConfig.java | 6 ------
 services/src/integrationTest/resources/test.properties      | 6 +++---
 .../main/java/edu/msudenver/tsp/services/dto/Account.java   | 4 +++-
 3 files changed, 6 insertions(+), 10 deletions(-)

diff --git a/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java b/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
index 40fd162..4c9e2b4 100644
--- a/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
+++ b/services/src/integrationTest/java/edu/msudenver/tsp/services/ServicesTestConfig.java
@@ -14,10 +14,4 @@ public class ServicesTestConfig {
     public UserService userService(final RestService restService) {
         return new UserService(restService);
     }
-
-    @Bean
-    @Autowired
-    public DefinitionService definitionService(final RestService restService) {
-        return new DefinitionService(restService);
-    }
 }
diff --git a/services/src/integrationTest/resources/test.properties b/services/src/integrationTest/resources/test.properties
index ff86c7e..3690a57 100644
--- a/services/src/integrationTest/resources/test.properties
+++ b/services/src/integrationTest/resources/test.properties
@@ -1,3 +1,3 @@
-persistence.api.connection.timeout.milliseconds = 5000
-persistence.api.socket.timeout.milliseconds = 10000
-persistence.api.base.url = http://localhost:8090/
\ No newline at end of file
+persistence.api.connection.timeout.milliseconds=5000
+persistence.api.socket.timeout.milliseconds=10000
+persistence.api.base.url=http://localhost:8090/
diff --git a/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java b/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
index 54127ba..f04a108 100644
--- a/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
+++ b/services/src/main/java/edu/msudenver/tsp/services/dto/Account.java
@@ -4,6 +4,8 @@ import com.google.gson.annotations.SerializedName;
 import lombok.Data;
 import lombok.EqualsAndHashCode;
 
+import javax.persistence.Temporal;
+import javax.persistence.TemporalType;
 import javax.validation.constraints.NotNull;
 import javax.validation.constraints.Size;
 import java.io.Serializable;
@@ -15,7 +17,7 @@ public class Account extends BaseDto implements Serializable {
     @Size(max = 50) private String username;
     @Size(max = 256) private String password;
     @NotNull private boolean administrator;
-    @SerializedName("last_login") private Date lastLogin;
+    @Temporal(TemporalType.DATE) @SerializedName("last_login") private Date lastLogin;
 
     private static final long serialVersionUID = 7095627971593953734L;
 }