From 34e9a1727339ef9f24e7b71d6fac8258eb4708c7 Mon Sep 17 00:00:00 2001
From: s-choi <choi-suyeong@iij.ad.jp>
Date: Fri, 18 Sep 2026 15:05:44 +0900
Subject: [PATCH] =?UTF-8?q?[FIX]=20user=E3=81=AE=E6=95=B4=E5=90=88?=
 =?UTF-8?q?=E6=80=A7=E3=82=92=E4=BF=AE=E6=AD=A3=E3=83=BB=E5=A4=89=E6=8F=9B?=
 =?UTF-8?q?=E3=83=A1=E3=82=BD=E3=83=83=E3=83=89=E3=82=92=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../demo/app/domain/model/UserModel.java      | 22 ++++++++++++++++++-
 .../demo/app/domain/service/UserService.java  |  3 +++
 .../demo/app/presentation/form/UserForm.java  | 19 ++++++++++++++++
 3 files changed, 43 insertions(+), 1 deletion(-)

diff --git a/src/main/java/com/example/demo/app/domain/model/UserModel.java b/src/main/java/com/example/demo/app/domain/model/UserModel.java
index 1f79b0c..05cb388 100644
--- a/src/main/java/com/example/demo/app/domain/model/UserModel.java
+++ b/src/main/java/com/example/demo/app/domain/model/UserModel.java
@@ -2,6 +2,8 @@ package com.example.demo.app.domain.model;
 
 import java.time.LocalDate;
 
+import com.example.demo.app.infra.entity.UserEntity;
+
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -12,7 +14,7 @@ public class UserModel {
     private String userName;
     private String mailAddress;
     private String password;
-    private Integer secretQuestionId;
+    private Long secretQuestionId;
     private String secretAnswer;
     private LocalDate brithDate;
     private Integer saving;
@@ -21,4 +23,22 @@ public class UserModel {
     private Long goalId;
     private Long courseId;
     private Integer deleteFlag;
+    
+    public static UserModel convertFrom(UserEntity userEntity) {
+		return new UserModel(
+				userEntity.getUserId(),
+				userEntity.getUserName(),
+				userEntity.getMailAddress(),
+				userEntity.getPassword(),
+				userEntity.getQuestionEntity().getSecretQuestionId(),
+				userEntity.getSecretQuestionAnswer(),
+				userEntity.getBirthDate(),
+				userEntity.getSaving(),
+				userEntity.getAnnualIncome(),
+				userEntity.getMonthlyBudget(),
+				userEntity.getGoalEntity().getGoalId(),
+				userEntity.getCourseEntity().getCourseId(),
+				userEntity.getDeleteFlag()
+				);
+	}
 }
diff --git a/src/main/java/com/example/demo/app/domain/service/UserService.java b/src/main/java/com/example/demo/app/domain/service/UserService.java
index 6ad3c04..f61fa9e 100644
--- a/src/main/java/com/example/demo/app/domain/service/UserService.java
+++ b/src/main/java/com/example/demo/app/domain/service/UserService.java
@@ -1,5 +1,6 @@
 package com.example.demo.app.domain.service;
 
+import com.example.demo.app.domain.model.UserModel;
 import com.example.demo.app.presentation.form.UserForm;
 
 public interface UserService {
@@ -7,4 +8,6 @@ public interface UserService {
 	void register(UserForm userForm);
     
     public void updateCourse(Long userId, Long courseId);
+
+    public UserModel findByUserId(Long userId);
 }
diff --git a/src/main/java/com/example/demo/app/presentation/form/UserForm.java b/src/main/java/com/example/demo/app/presentation/form/UserForm.java
index dd8f655..f5401c6 100644
--- a/src/main/java/com/example/demo/app/presentation/form/UserForm.java
+++ b/src/main/java/com/example/demo/app/presentation/form/UserForm.java
@@ -2,6 +2,8 @@ package com.example.demo.app.presentation.form;
 
 import java.time.LocalDate;
 
+import com.example.demo.app.domain.model.UserModel;
+
 import lombok.AllArgsConstructor;
 import lombok.Data;
 import lombok.NoArgsConstructor;
@@ -21,4 +23,21 @@ public class UserForm {
 	private Integer monthlyBudget;
 	private Long goalId;
 	private Long courseId;
+
+	
+	public static UserForm convertFrom(UserModel userModel) {
+		return new UserForm(
+				userModel.getUserName(),
+				userModel.getMailAddress(),
+				userModel.getPassword(),
+				userModel.getSecretQuestionId(),
+				userModel.getSecretAnswer(),
+				userModel.getBrithDate(),
+				userModel.getSaving(),
+				userModel.getAnnualIncome(),
+				userModel.getMonthlyBudget(),
+				userModel.getGoalId(),
+				userModel.getCourseId()
+				);
+	}
 }