[ADD]プロフィール編集の作成

src/main/java/com/example/demo/aop/aspect/SessionCheck.java

@@ -0,0 +1,11 @@
+package com.example.demo.aop.aspect;
+
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface SessionCheck {
+}

src/main/java/com/example/demo/aop/aspect/SessionCheckAspect.java

@@ -0,0 +1,41 @@
+package com.example.demo.aop.aspect;
+
+
+import jakarta.servlet.http.HttpServletRequest;
+import jakarta.servlet.http.HttpSession;
+
+import org.aspectj.lang.annotation.Aspect;
+import org.aspectj.lang.annotation.Before;
+import org.aspectj.lang.annotation.Pointcut;
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.stereotype.Component;
+
+import com.example.demo.exception.NoSessionException;
+
+
+@Aspect
+@Component
+public class SessionCheckAspect {
+
+	HttpServletRequest request;
+
+	@Autowired
+	public SessionCheckAspect(HttpServletRequest request) {
+		this.request = request;
+	}
+
+	@Pointcut("@annotation(com.example.demo.aop.aspect.SessionCheck)")
+	public void sessionCheckMethod() {
+	}
+
+	@Before("sessionCheckMethod()")
+	public void checkSession() {
+		HttpSession session = request.getSession(false);
+
+		if (session == null || session.getAttribute("loginUser") == null) {
+			throw new NoSessionException("不正なログインです");
+		}
+
+	}
+
+}

src/main/java/com/example/demo/aop/handler/GlobalExceptionHandler.java

@@ -0,0 +1,61 @@
+package com.example.demo.aop.handler;
+
+
+import java.util.logging.Level;
+import java.util.logging.Logger;
+
+import org.springframework.http.HttpStatus;
+import org.springframework.ui.Model;
+import org.springframework.web.HttpRequestMethodNotSupportedException;
+import org.springframework.web.bind.annotation.ControllerAdvice;
+import org.springframework.web.bind.annotation.ExceptionHandler;
+
+import com.example.demo.exception.NoSessionException;
+
+@ControllerAdvice
+public class GlobalExceptionHandler {
+
+	private final static Logger LOGGER = Logger.getLogger(GlobalExceptionHandler.class.getName());
+
+	private final String SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION = "不正な遷移です。";
+	private final String SEVERE_ERROR_MESSAGE_BAD_REQUEST = "不正なリクエストです。";
+
+	@ExceptionHandler(NoSessionException.class)
+	public String handleNoSessionException(Model model, Exception e) {
+
+		e.printStackTrace();
+
+		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
+
+		model.addAttribute(
+                "errorMessage",
+                "システムエラーが発生しました。"
+                + "初めからやり直してください。");
+
+        return "error";
+		
+	}
+
+	@ExceptionHandler(HttpRequestMethodNotSupportedException.class)
+	public String handleBadRequestException(Model model, Exception e) {
+		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
+		model.addAttribute("status", HttpStatus.BAD_REQUEST.value());
+
+		e.printStackTrace();
+
+		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
+
+		return "error";
+	}
+
+	@ExceptionHandler(Exception.class)
+	public String AllException(Model model, Exception e) {
+		model.addAttribute("error", SEVERE_ERROR_MESSAGE_BAD_REQUEST);
+
+		e.printStackTrace();
+
+		LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
+
+		return "error";
+	}
+}

src/main/java/com/example/demo/app/domain/service/ProfileService.java

@@ -1,8 +1,10 @@
 package com.example.demo.app.domain.service;
 
 import com.example.demo.app.domain.model.ProfileModel;
+import com.example.demo.app.presentation.form.ProfileEditForm;
 
 public interface ProfileService {
 	ProfileModel findOne(Long userId);
 	void withdraw(Long userId);
+	void update(Long userId, ProfileEditForm profileEditForm);
 }

src/main/java/com/example/demo/app/domain/service/impl/PasswordResetServiceImpl.java

@@ -0,0 +1,42 @@
+package com.example.demo.app.domain.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.service.PasswordResetService;
+import com.example.demo.app.infra.entity.UserEntity;
+import com.example.demo.app.infra.repository.UserRepository;
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class PasswordResetServiceImpl implements PasswordResetService {
+
+    private final UserRepository userRepository;
+
+    @Override
+    public boolean resetPassword(
+            Long userId,
+            PasswordResetForm passwordResetForm) {
+
+        if (!passwordResetForm.getPassword()
+                .equals(passwordResetForm.getPasswordConfirm())) {
+            return false;
+        }
+
+        UserEntity userEntity =
+                userRepository.findById(userId).orElse(null);
+
+        if (userEntity == null) {
+            return false;
+        }
+
+        userEntity.setPassword(
+                passwordResetForm.getPassword());
+
+        userRepository.save(userEntity);
+
+        return true;
+    }
+}

src/main/java/com/example/demo/app/domain/service/impl/ProfileServiceImpl.java

@@ -6,6 +6,7 @@ import com.example.demo.app.domain.model.ProfileModel;
 import com.example.demo.app.domain.service.ProfileService;
 import com.example.demo.app.infra.entity.UserEntity;
 import com.example.demo.app.infra.repository.UserRepository;
+import com.example.demo.app.presentation.form.ProfileEditForm;
 
 import lombok.RequiredArgsConstructor;
 
@@ -43,4 +44,20 @@ public class ProfileServiceImpl implements ProfileService{
 	userEntity.setDeleteFlag(1);
 	userRepository.save(userEntity);
 	}
+	
+	@Override
+	public void update(Long userId, ProfileEditForm profileEditForm) {
+	    UserEntity userEntity = userRepository.findById(userId).orElse(null);
+
+	    if (userEntity == null) {
+	        return;
+	    }
+
+	    userEntity.setUserName(profileEditForm.getUserName());
+	    userEntity.setMailAddress(profileEditForm.getMailAddress());
+	    userEntity.setSaving(profileEditForm.getSaving());
+	    userEntity.setAnnualIncome(profileEditForm.getAnnualIncome());
+	    userEntity.setMonthlyBudget(profileEditForm.getMonthlyBudget());
+	    userRepository.save(userEntity);
+	}
 }

src/main/java/com/example/demo/app/presentation/controller/PasswordResetController.java

@@ -0,0 +1,53 @@
+package com.example.demo.app.presentation.controller;
+
+import jakarta.servlet.http.HttpSession;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.PostMapping;
+
+import com.example.demo.app.domain.service.PasswordResetService;
+import com.example.demo.app.presentation.form.PasswordResetForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+public class PasswordResetController {
+	private final PasswordResetService passwordResetService;
+	
+	@GetMapping("/password/reset")
+	public String showPasswordReset(Model model) {
+		model.addAttribute("passwordResetForm", new PasswordResetForm());
+		return "password_reset";
+	}
+
+	@PostMapping("/password/reset")
+	public String resetPassword(
+	PasswordResetForm passwordResetForm,
+	Model model,
+	HttpSession session){
+		
+		Long userId = 
+				(Long) session.getAttribute("passwordResetUserId");
+		
+		if(userId == null) {
+			return "redirect:/login";
+		}
+		
+		boolean isReset = 
+				passwordResetService.resetPassword(userId, passwordResetForm);
+		
+		if(!isReset) {
+			model.addAttribute("Message", "パスワードが一致しません。");
+			return "password_reset";
+		}
+		
+		session.removeAttribute("passwordResetUserId");
+		
+		return "redirect:/login";
+	}
+}
+
+

src/main/java/com/example/demo/app/presentation/controller/ProfileController.java

@@ -5,11 +5,13 @@ import jakarta.servlet.http.HttpSession;
 import org.springframework.stereotype.Controller;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.ModelAttribute;
 import org.springframework.web.bind.annotation.PostMapping;
 
 import com.example.demo.app.domain.model.LoginModel;
 import com.example.demo.app.domain.model.ProfileModel;
 import com.example.demo.app.domain.service.ProfileService;
+import com.example.demo.app.presentation.form.ProfileEditForm;
 import com.example.demo.app.presentation.form.ProfileForm;
 
 import lombok.RequiredArgsConstructor;
@@ -32,10 +34,43 @@ public class ProfileController {
 	}
 	
 	@GetMapping("/profile/edit")
-	public String showEditProfile() {
+	public String showEditProfile(
+	        Model model,
+	        HttpSession session) {
+
+	    LoginModel loginUser =
+	            (LoginModel) session.getAttribute("loginUser");
+
+	    ProfileModel profileModel =
+	            profileService.findOne(loginUser.getUserId());
+
+	    ProfileEditForm profileEditForm =
+	            new ProfileEditForm(
+	                    profileModel.getUserName(),
+	                    profileModel.getMailAddress(),
+	                    profileModel.getSaving(),
+	                    profileModel.getAnnualIncome(),
+	                    profileModel.getMonthlyBudget());
+
+	    model.addAttribute("profileEditForm", profileEditForm);
 	    return "profile_edit";
 	}
 	
+	@PostMapping("/profile/edit")
+	public String updateProfile(
+			@ModelAttribute ProfileEditForm profileEditForm,
+	        HttpSession session) {
+
+	    LoginModel loginUser =
+	            (LoginModel) session.getAttribute("loginUser");
+
+	    profileService.update(
+	            loginUser.getUserId(),
+	            profileEditForm);
+
+	    return "redirect:/profile";
+	}
+	
 	@PostMapping("/withdraw")
 	public String withdraw(HttpSession session) {
 

src/main/java/com/example/demo/app/presentation/form/ProfileEditForm.java

@@ -0,0 +1,16 @@
+package com.example.demo.app.presentation.form;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class ProfileEditForm {
+	private String userName;
+	private String mailAddress;
+	private Integer saving;
+	private Integer annualIncome;
+	private Integer monthlyBudget;
+}

src/main/java/com/example/demo/exception/GlobalExceptionHandler.java

@@ -1,22 +0,0 @@
-package com.example.demo.exception;
-
-import org.springframework.ui.Model;
-import org.springframework.web.bind.annotation.ControllerAdvice;
-import org.springframework.web.bind.annotation.ExceptionHandler;
-
-@ControllerAdvice
-public class GlobalExceptionHandler {
-
-    @ExceptionHandler(Exception.class)
-    public String handleException(
-            Exception e,
-            Model model) {
-
-        model.addAttribute(
-                "errorMessage",
-                "システムエラーが発生しました。"
-                + "初めからやり直してください。");
-
-        return "error";
-    }
-}

src/main/java/com/example/demo/exception/InsufficientPermissionException.java

@@ -0,0 +1,9 @@
+package com.example.demo.exception;
+
+public class InsufficientPermissionException extends RuntimeException {
+
+	public InsufficientPermissionException(String message) {
+		super(message);
+	}
+
+}

src/main/java/com/example/demo/exception/NoSessionException.java

@@ -0,0 +1,9 @@
+package com.example.demo.exception;
+
+public class NoSessionException extends RuntimeException {
+
+	public NoSessionException(String message) {
+		super(message);
+	}
+
+}

src/main/resources/templates/profile.html

@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html>
+<html xmlns:th="http://www.thymeleaf.org">
 <head>
 <meta charset="UTF-8">
 <title>プロフィール</title>

src/main/resources/templates/profile_edit.html

@@ -0,0 +1,72 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>プロフィール編集</title>
+</head>
+<body class="pb-5 pt-5">
+	
+	<div th:replace="~{header :: header}">
+		</div>
+	
+	<main>
+		<h1>プロフィール編集</h1>
+		
+		<form th:action="@{/profile/edit}"th:object="${profileEditForm}"method="post">
+			<div>
+				<label>氏名</label>
+				<input type="text"
+				th:field="*{userName}"
+				maxlength="100"
+				required>
+			</div>
+			
+			<div>
+				<label>メールアドレス</label>
+				<input type="email"
+				th:field="*{mailAddress}"
+				maxlength="255"
+				required>
+			</div>
+			
+			<div>
+				<label>パスワード</label>
+				<input type="password"
+				value="********"
+				disabled>
+			</div>
+			
+			<div>
+				<label>貯蓄金</label>
+				<input type="number"
+				th:field="*{saving}"
+				min="0"
+				required>
+			</div>
+			
+			<div>
+				<label>年収</label>
+				<input type="number"
+				th:field="*{annualIncome}"
+				min="0"
+				required>
+			</div>
+			
+			<div>
+				<label>月別使用可能額</label>
+				<input type="number"
+				th:field="*{monthlyBudget}"
+				min="0"
+				required>
+			</div>
+			
+			<div>
+				<button type="submit">確認</button>
+			</div>
+		</form>
+	</main>
+	
+	<div th:replace="~{footer :: footer}">
+	</div>
+</body>
+</html>