質問編集履歴

該当のソースコードの修正。

2021/01/29 02:48

投稿

shunji2740

スコア4

test CHANGED Viewed

File without changes

test CHANGED Viewed

@@ -226,73 +226,115 @@
 ```
+```UserService
+package mrs.domain.service.user;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.dao.DataAccessException;
+import org.springframework.stereotype.Service;
+import mrs.domain.model.User;
+import mrs.domain.repository.user.EditUserRepositoryJdbc;
+import mrs.domain.repository.user.UserRepository;
+@Service
+public class UserService {
+	@Autowired
+	EditUserRepositoryJdbc userRepositoryJdbc;
+	@Autowired
+	UserRepository userRepository;
+	public void saveOrUpdate(User user, String userId) throws DataAccessException {
+		System.out.println("beforeFix: " + userId);
+		System.out.println("fixed: " + user.getUserId());
+		userRepositoryJdbc.update(user, userId);
+	}
+	public boolean checkDuplicate(String userId) {
+		if (userRepository.countByUserId(userId) != 0) {
+			return false;
+		}
+		return true;
+	}
+}
 ```
+```UserRepository
-package mrs.domain.service.user;
+package mrs.domain.repository.user;
+import javax.persistence.LockModeType;
-import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.dao.DataAccessException;
+import org.springframework.data.jpa.repository.Lock;
-import org.springframework.stereotype.Service;
+import org.springframework.stereotype.Repository;
 import mrs.domain.model.User;
-import mrs.domain.repository.user.EditUserRepositoryJdbc;
-import mrs.domain.repository.user.UserRepository;
-@Service
-public class UserService {
-	@Autowired
+@Repository
-	EditUserRepositoryJdbc userRepositoryJdbc;
-	@Autowired
-	UserRepository userRepository;
-	public void saveOrUpdate(User user, String userId) throws DataAccessException {
+public interface UserRepository extends JpaRepository<User, String> {
-		System.out.println("beforeFix: " + userId);
+	@Lock(LockModeType.PESSIMISTIC_WRITE)
-		System.out.println("fixed: " + user.getUserId());
-		userRepositoryJdbc.update(user, userId);
+	User findOneForUpdateByUserId(String userId);
-	}
-	public boolean checkDuplicate(String userId) {
+	long countByUserId(String userId);
-		if (userRepository.countByUserId(userId) != 0) {
-			return false;
-		}
-		return true;
-	}
 }
@@ -300,39 +342,255 @@
 ```
-```UserRepository
-package mrs.domain.repository.user;
-import javax.persistence.LockModeType;
-import org.springframework.data.jpa.repository.JpaRepository;
-import org.springframework.data.jpa.repository.Lock;
-import org.springframework.stereotype.Repository;
-import mrs.domain.model.User;
-@Repository
-public interface UserRepository extends JpaRepository<User, String> {
-	@Lock(LockModeType.PESSIMISTIC_WRITE)
-	User findOneForUpdateByUserId(String userId);
-	long countByUserId(String userId);
+```User
+package mrs.domain.model;
+import java.io.Serializable;
+import javax.persistence.Entity;
+import javax.persistence.Id;
+import javax.persistence.Table;
+import javax.validation.constraints.Email;
+import javax.validation.constraints.NotBlank;
+import javax.validation.constraints.Pattern;
+import javax.validation.constraints.Size;
+import org.hibernate.validator.constraints.Length;
+import mrs.app.user.UserIdDuplicateCheck;
+//会議室予約システムを利用するユーザー情報を格納するテーブル
+//Userエンティティー
+@Entity
+@Table(name = "usr")
+@UserIdDuplicateCheck(message="このユーザーIDは既に登録されています")
+public class User implements Serializable {
+	@Id
+	@NotBlank(groups=ValidGroup1.class)
+	@Email(groups=ValidGroup2.class)
+	private String userId;
+	@NotBlank(groups=ValidGroup1.class)
+	@Length(min=4, max=100, groups=ValidGroup2.class)
+	private String password;
+	@NotBlank(groups=ValidGroup1.class)
+	private String firstName;
+	@NotBlank(groups=ValidGroup1.class)
+	private String lastName;
+	/**
+	* 電話番号
+	*/
+	@NotBlank(groups=ValidGroup1.class)
+	@Pattern(regexp = "0\d{1,4}\d{1,4}\d{4}", groups=ValidGroup2.class)
+	private String phoneNumber;
+	@NotBlank(groups=ValidGroup1.class)
+	private String zipCode;
+	/**
+	* 住所
+	*/
+	@NotBlank(groups=ValidGroup1.class)
+	@Size(max = 200, groups=ValidGroup2.class)
+	private String address;
+	//@Enumerated(EnumType.STRING)
+	@NotBlank(groups=ValidGroup1.class)
+	private String roleName;
+	public String getUserId() {
+		return userId;
+	}
+	public void setUserId(String userId) {
+		this.userId = userId;
+	}
+	public String getPassword() {
+		return password;
+	}
+	public void setPassword(String password) {
+		this.password = password;
+	}
+	public String getFirstName() {
+		return firstName;
+	}
+	public void setFirstName(String firstName) {
+		this.firstName = firstName;
+	}
+	public String getLastName() {
+		return lastName;
+	}
+	public void setLastName(String lastName) {
+		this.lastName = lastName;
+	}
+	public String getRoleName() {
+		return roleName;
+	}
+	public void setRoleName(String roleName) {
+		this.roleName = roleName;
+	}
+	public String getPhoneNumber() {
+		return phoneNumber;
+	}
+	public void setPhoneNumber(String phoneNumber) {
+		this.phoneNumber = phoneNumber;
+	}
+	public String getZipCode() {
+		return zipCode;
+	}
+	public void setZipCode(String zipCode) {
+		this.zipCode = zipCode;
+	}
+	public String getAddress() {
+		return address;
+	}
+	public void setAddress(String address) {
+		this.address = address;
+	}
@@ -342,264 +600,6 @@
 ```
-```User
-package mrs.domain.model;
-import java.io.Serializable;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.persistence.Table;
-import javax.validation.constraints.Email;
-import javax.validation.constraints.NotBlank;
-import javax.validation.constraints.Pattern;
-import javax.validation.constraints.Size;
-import org.hibernate.validator.constraints.Length;
-import mrs.app.user.UserIdDuplicateCheck;
-//会議室予約システムを利用するユーザー情報を格納するテーブル
-//Userエンティティー
-@Entity
-@Table(name = "usr")
-@UserIdDuplicateCheck(message="このユーザーIDは既に登録されています")
-public class User implements Serializable {
-	@Id
-	@NotBlank(groups=ValidGroup1.class)
-	@Email(groups=ValidGroup2.class)
-	private String userId;
-	@NotBlank(groups=ValidGroup1.class)
-	@Length(min=4, max=100, groups=ValidGroup2.class)
-	private String password;
-	@NotBlank(groups=ValidGroup1.class)
-	private String firstName;
-	@NotBlank(groups=ValidGroup1.class)
-	private String lastName;
-	/**
-	* 電話番号
-	*/
-	@NotBlank(groups=ValidGroup1.class)
-	@Pattern(regexp = "0\d{1,4}\d{1,4}\d{4}", groups=ValidGroup2.class)
-	private String phoneNumber;
-	@NotBlank(groups=ValidGroup1.class)
-	private String zipCode;
-	/**
-	* 住所
-	*/
-	@NotBlank(groups=ValidGroup1.class)
-	@Size(max = 200, groups=ValidGroup2.class)
-	private String address;
-	//@Enumerated(EnumType.STRING)
-	@NotBlank(groups=ValidGroup1.class)
-	private String roleName;
-	public String getUserId() {
-		return userId;
-	}
-	public void setUserId(String userId) {
-		this.userId = userId;
-	}
-	public String getPassword() {
-		return password;
-	}
-	public void setPassword(String password) {
-		this.password = password;
-	}
-	public String getFirstName() {
-		return firstName;
-	}
-	public void setFirstName(String firstName) {
-		this.firstName = firstName;
-	}
-	public String getLastName() {
-		return lastName;
-	}
-	public void setLastName(String lastName) {
-		this.lastName = lastName;
-	}
-	public String getRoleName() {
-		return roleName;
-	}
-	public void setRoleName(String roleName) {
-		this.roleName = roleName;
-	}
-	public String getPhoneNumber() {
-		return phoneNumber;
-	}
-	public void setPhoneNumber(String phoneNumber) {
-		this.phoneNumber = phoneNumber;
-	}
-	public String getZipCode() {
-		return zipCode;
-	}
-	public void setZipCode(String zipCode) {
-		this.zipCode = zipCode;
-	}
-	public String getAddress() {
-		return address;
-	}
-	public void setAddress(String address) {
-		this.address = address;
-	}
-}
-```
 ### 試したこと