From 50caa2eef4d95cae77bf9abb1303d6e5a7692a6e Mon Sep 17 00:00:00 2001 From: s-choi Date: Thu, 10 Sep 2026 15:44:31 +0900 Subject: [PATCH] =?UTF-8?q?[STYLE]=20model=E3=81=AE=E7=84=A1=E9=A7=84?= =?UTF-8?q?=E3=81=AA=E6=94=B9=E8=A1=8C=E3=82=84=E3=82=B9=E3=83=9A=E3=83=BC?= =?UTF-8?q?=E3=82=B9=E3=81=AA=E3=81=A9=E3=81=AE=E5=89=8A=E9=99=A4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../rhizome/app/domain/model/Department.java | 13 +---- .../rhizome/app/domain/model/Employee.java | 38 +++---------- .../app/domain/model/EmployeeInfo.java | 20 ++----- .../rhizome/app/domain/model/LoginInfo.java | 16 ++---- .../rhizome/app/domain/model/LoginUser.java | 53 +++++-------------- .../model/SearchConditionDepartment.java | 14 ++--- .../domain/model/SearchConditionEmployee.java | 28 ++-------- 7 files changed, 38 insertions(+), 144 deletions(-) diff --git a/src/main/java/com/example/rhizome/app/domain/model/Department.java b/src/main/java/com/example/rhizome/app/domain/model/Department.java index 360afc8..c63b597 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/Department.java +++ b/src/main/java/com/example/rhizome/app/domain/model/Department.java @@ -3,19 +3,10 @@ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * 部署情報の概念を表現するモデルクラスです。 - */ @Getter @AllArgsConstructor public class Department { - /** - * 部署ID - */ - private final Integer idDepartment; - /** - * 部署名 - */ - private final String nmDepartment; + private final Integer idDepartment; + private final String nmDepartment; } diff --git a/src/main/java/com/example/rhizome/app/domain/model/Employee.java b/src/main/java/com/example/rhizome/app/domain/model/Employee.java index 91f20a5..efc843b 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/Employee.java +++ b/src/main/java/com/example/rhizome/app/domain/model/Employee.java @@ -3,39 +3,15 @@ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * 社員を表現するモデルクラスです - */ @Getter @AllArgsConstructor public class Employee { - /** - * 社員ID - */ - private final Integer idEmployee; - /** - * 社員名 - */ - private final String nmEmployee; - /** - * 社員名カナ - */ - private final String knEmployee; - /** - * メールアドレス - */ - private final String mailAddress; - /** - * パスワード - */ - private final String password; - /** - * 管理者権限 - */ - private final Integer adminAuth; - /** - * 部署ID - */ - private final Integer idDepartment; + private final Integer idEmployee; + private final String nmEmployee; + private final String knEmployee; + private final String mailAddress; + private final String password; + private final Integer adminAuth; + private final Integer idDepartment; } diff --git a/src/main/java/com/example/rhizome/app/domain/model/EmployeeInfo.java b/src/main/java/com/example/rhizome/app/domain/model/EmployeeInfo.java index 49f137f..68f894d 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/EmployeeInfo.java +++ b/src/main/java/com/example/rhizome/app/domain/model/EmployeeInfo.java @@ -1,28 +1,14 @@ -/* - * EmployeeInfo.java - * 作成 IT-College 2016 - *------------------------------------------------------------ - * Copyright(c) Rhizome Inc. All Rights Reserved. - */ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * 社員情報の概念を表現するモデルクラスです。 - */ @Getter @AllArgsConstructor public class EmployeeInfo { - /** - * 社員情報 - */ - private final Employee employee; - /** - * 部署名 - */ - private final Department department; + private final Employee employee; + + private final Department department; } diff --git a/src/main/java/com/example/rhizome/app/domain/model/LoginInfo.java b/src/main/java/com/example/rhizome/app/domain/model/LoginInfo.java index f694a54..5947906 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/LoginInfo.java +++ b/src/main/java/com/example/rhizome/app/domain/model/LoginInfo.java @@ -3,20 +3,12 @@ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * ログインを試みる人を表現するモデルクラスです - */ - @Getter @AllArgsConstructor public class LoginInfo { - /** - * メールアドレス - */ - private String mailAddress; - /** - * パスワード - */ - private String password; + + private String mailAddress; + + private String password; } diff --git a/src/main/java/com/example/rhizome/app/domain/model/LoginUser.java b/src/main/java/com/example/rhizome/app/domain/model/LoginUser.java index d0bd75c..bc2afa0 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/LoginUser.java +++ b/src/main/java/com/example/rhizome/app/domain/model/LoginUser.java @@ -3,49 +3,24 @@ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * ログイン者を表現するクラスです - */ @Getter @AllArgsConstructor public class LoginUser { - /** - * 社員ID - */ - private final Integer idEmployee; - /** - * 社員名 - */ - private final String nmEmployee; - /** - * 社員名カナ - */ - private final String knEmployee; - /** - * メールアドレス - */ - private final String mailAddress; - /** - * パスワード - */ - private final String password; + private final Integer idEmployee; - /** - * 管理者権限 - */ - private final Integer adminAuth; + private final String nmEmployee; - /** - * 部署ID - */ - private final Integer idDepartment; + private final String knEmployee; - /** - * ログインユーザが管理者か - * - * @return true:管理者 false:一般権限 - */ - public boolean isAdminUser() { - return getAdminAuth() == 1; - } + private final String mailAddress; + + private final String password; + + private final Integer adminAuth; + + private final Integer idDepartment; + + public boolean isAdminUser() { + return getAdminAuth() == 1; + } } diff --git a/src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java b/src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java index 1e365eb..b9e1b93 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java +++ b/src/main/java/com/example/rhizome/app/domain/model/SearchConditionDepartment.java @@ -3,19 +3,11 @@ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * 部署情報の検索要件を表現するモデルクラスです。 - */ @Getter @AllArgsConstructor public class SearchConditionDepartment { - /** - * 部署ID - */ - private final Integer idDepartment; - /** - * 部署名 - */ - private final String nmDepartment; + private final Integer idDepartment; + + private final String nmDepartment; } diff --git a/src/main/java/com/example/rhizome/app/domain/model/SearchConditionEmployee.java b/src/main/java/com/example/rhizome/app/domain/model/SearchConditionEmployee.java index 5ab6f4d..affbbf9 100644 --- a/src/main/java/com/example/rhizome/app/domain/model/SearchConditionEmployee.java +++ b/src/main/java/com/example/rhizome/app/domain/model/SearchConditionEmployee.java @@ -3,31 +3,13 @@ package com.example.rhizome.app.domain.model; import lombok.AllArgsConstructor; import lombok.Getter; -/** - * 社員情報の検索条件という概念を表現するモデルクラスです - */ @Getter @AllArgsConstructor public class SearchConditionEmployee { - /** - * 社員ID - */ - private final Integer idEmployee; - /** - * 社員名 - */ - private final String nmEmployee; - /** - * 社員名カナ - */ - private final String knEmployee; - /** - * メールアドレス - */ - private final String mailAddress; - /** - * 部署ID - */ - private final Integer idDepartment; + private final Integer idEmployee; + private final String nmEmployee; + private final String knEmployee; + private final String mailAddress; + private final Integer idDepartment; }