diff --git a/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java b/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java index 2bb66cb..e306864 100644 --- a/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java +++ b/src/main/java/org/ntlab/acanthus_server/entities/AccountJson.java @@ -5,10 +5,6 @@ import com.fasterxml.jackson.annotation.JsonPropertyOrder; @JsonInclude(JsonInclude.Include.NON_NULL) -@JsonPropertyOrder({ - "uid", - "token" -}) //----------------------------------------------------------------- // アカウント一覧取得用のJsonクラス @@ -18,12 +14,15 @@ private Integer uid; @JsonProperty("name") private String name; + @JsonProperty("email") + private String email; //----------------------------------------------------------------- //----------------------------------------------------------------- - public AccountJson(Integer uid, String name){ - this.uid = uid; - this.name = name; + public AccountJson(Account account){ + this.uid = account.getUid(); + this.name = account.getName(); + this.email = account.getEmail(); } //----------------------------------------------------------------- }