diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java index 17a4558..53c4b44 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Account.java @@ -1,4 +1,17 @@ package org.ntlab.acanthus_client.entities; +import java.time.LocalDateTime; +import java.util.HashMap; + +//----------------------------------------------------------------- +// ユーザーアカウント public class Account { + private Integer uid; + private String name; + private String email; + private String password; + private String token; + private HashMap workHashMap = new HashMap<>(); + private Boolean isDummy; + private LocalDateTime lastAccess; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java index 151f9cf..c6728f9 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountJson.java @@ -1,4 +1,8 @@ package org.ntlab.acanthus_client.entities; +//----------------------------------------------------------------- +// 全ユーザー検索時情報 public class AccountJson { + private Integer uid; + private String name; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java index f0967c6..bb76238 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountTokenJson.java @@ -1,4 +1,7 @@ package org.ntlab.acanthus_client.entities; +//----------------------------------------------------------------- +// アカウントに発行されたトークン public class AccountTokenJson { + private String token; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java index 6e2c71d..35d81b9 100644 --- a/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/AccountUidJson.java @@ -1,4 +1,7 @@ package org.ntlab.acanthus_client.entities; +//----------------------------------------------------------------- +// アカウントのUid public class AccountUidJson { + private Integer uid; } diff --git a/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java b/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java new file mode 100644 index 0000000..849e8ac --- /dev/null +++ b/app/src/main/java/org/ntlab/acanthus_client/entities/Work.java @@ -0,0 +1,4 @@ +package org.ntlab.acanthus_client.entities; + +public class Work { +}