diff --git a/.idea/gradle.xml b/.idea/gradle.xml index d8d8714..a20886e 100644 --- a/.idea/gradle.xml +++ b/.idea/gradle.xml @@ -6,12 +6,12 @@ + diff --git a/.idea/misc.xml b/.idea/misc.xml index 4ff842e..bc8d0a3 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,14 +1,7 @@ - - - - - - - - + + \ No newline at end of file diff --git a/.idea/sbt.xml b/.idea/sbt.xml deleted file mode 100644 index 2018743..0000000 --- a/.idea/sbt.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - - \ No newline at end of file diff --git a/src/main/java/com/example/cosmos_serversb/models/Groups.java b/src/main/java/com/example/cosmos_serversb/models/Groups.java index db5cd0b..804a7dd 100644 --- a/src/main/java/com/example/cosmos_serversb/models/Groups.java +++ b/src/main/java/com/example/cosmos_serversb/models/Groups.java @@ -2,6 +2,7 @@ import java.util.*; import javax.inject.Singleton; +import java.util.Date; import com.example.cosmos_serversb.entities.*; import com.example.cosmos_serversb.jsons.*; @@ -105,8 +106,8 @@ //テスト用 String rId = getInstance().createRId(); String uri = baseURI + AppName + "/groups/" + gId + "/requests/" + rId; - Request testRequest = new Request(rId, uri, "1999/01/01/15:00:00", - uId, product, "1999/01/01/15:00:00", 999); + Request testRequest = new Request(rId, uri, new Date(1999,01,01), + uId, product, new Date(1999,12,01), 999); return testRequest; } @@ -117,8 +118,8 @@ public static Request updateRequest(String gId, String rId, String uId, String product, String deadline, int location, boolean done){ //テスト用 - Request testRequest = new Request(rId, "http://test.com", "1999/01/01/15:00:00", - uId, product, "1999/01/01/15:00:00", 999); + Request testRequest = new Request(rId, "http://test.com", new Date(1999,01,01), + uId, product, new Date(1999,12,01), 999); return testRequest; }