Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into s-morimto

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

@@ -16,7 +16,6 @@ import com.example.demo.app.presentation.form.UserForm;
 
 import lombok.RequiredArgsConstructor;
 
-
 @Service
 @RequiredArgsConstructor
 public class UserServiceImpl implements UserService {
@@ -24,58 +23,55 @@ public class UserServiceImpl implements UserService {
 	private final QuestionRepository questionRepository;
 	private final GoalRepository goalRepository;
 	private final CourseRepository courseRepository;
-	
+
 	@Override
 	public void register(UserForm userForm, Long courseId) {
 
-	UserEntity userEntity = new UserEntity();
+		UserEntity userEntity = new UserEntity();
 
-	userEntity.setUserName(userForm.getUserName());
-	userEntity.setMailAddress(userForm.getMailAddress());
-	userEntity.setPassword(userForm.getPassword());
-	userEntity.setSecretQuestionAnswer(userForm.getSecretAnswer());
-	userEntity.setBirthDate(userForm.getBirthDate());
-	userEntity.setSaving(userForm.getSaving());
-	userEntity.setBirthDate(userForm. getBirthDate());
-	userEntity.setSaving(userForm.getSaving());
-	userEntity.setAnnualIncome(userForm.getAnnualIncome());
-	userEntity.setMonthlyBudget(userForm.getMonthlyBudget());
+		userEntity.setUserName(userForm.getUserName());
+		userEntity.setMailAddress(userForm.getMailAddress());
+		userEntity.setPassword(userForm.getPassword());
+		userEntity.setSecretQuestionAnswer(userForm.getSecretAnswer());
+		userEntity.setBirthDate(userForm.getBirthDate());
+		userEntity.setSaving(userForm.getSaving());
+		userEntity.setBirthDate(userForm.getBirthDate());
+		userEntity.setSaving(userForm.getSaving());
+		userEntity.setAnnualIncome(userForm.getAnnualIncome());
+		userEntity.setMonthlyBudget(userForm.getMonthlyBudget());
 
-	QuestionEntity questionEntity =
-            questionRepository.findById(userForm.getSecretQuestionId()).orElse(null);
+		QuestionEntity questionEntity = questionRepository.findById(userForm.getSecretQuestionId()).orElse(null);
 
-	GoalEntity goalEntity =
-            goalRepository.findById(userForm.getGoalId()).orElse(null);
+		GoalEntity goalEntity = new GoalEntity();
+		goalEntity.setTargetAmount(Integer.parseInt(String.valueOf(userForm.getGoalId())));
 
-	CourseEntity courseEntity =
-            courseRepository.findById(courseId).orElse(null);
+		goalRepository.save(
+				goalEntity);
 
-	userEntity.setQuestionEntity(questionEntity);
-	userEntity.setGoalEntity(goalEntity);
-	userEntity.setCourseEntity(courseEntity);
+		CourseEntity courseEntity = courseRepository.findById(courseId).orElse(null);
 
-	userEntity.setDeleteFlag(0);
+		userEntity.setQuestionEntity(questionEntity);
+		userEntity.setGoalEntity(goalEntity);
+		userEntity.setCourseEntity(courseEntity);
 
-	userRepository.save(userEntity);
+		userEntity.setDeleteFlag(0);
+
+		userRepository.save(userEntity);
 	}
-	
+
 	@Override
 	public void updateCourse(Long userId, Long courseId) {
 		UserEntity userEntity = userRepository.findById(userId).orElseThrow();
-		
+
 		CourseEntity courseEntity = courseRepository.findById(courseId).orElseThrow();
-		
+
 		userEntity.setCourseEntity(courseEntity);
-		
+
 		userRepository.save(userEntity);
 	}
-	
-	
+
 	public UserModel findByUserId(Long userId) {
-		
+
 		return UserModel.convertFrom(userRepository.findById(userId).get());
 	}
 }
-
-
-

src/main/java/com/example/demo/app/infra/entity/GoalEntity.java

@@ -32,14 +32,14 @@ public class GoalEntity {
 	@Column(name = "goal_subtitle", nullable = true)
 	private String goalSubtitle;
 	
-	@Column(name = "target_amount", nullable = false)
+	@Column(name = "target_amount", nullable = true)
 	private Integer targetAmount;
 	
-	@Column(name = "deadline", nullable = false)
-	private LocalDate deadline;
+	@Column(name = "deadline", nullable = true)
+	private LocalDate deadline = LocalDate.now().plusYears(1L);
 	
-	@Column(name = "goal_complete", nullable = true)
-	private Integer goalComplete;
+	@Column(name = "goal_complete", nullable = false)
+	private Integer goalComplete = 0;
 	
 	@OneToOne(mappedBy = "goalEntity")
 	private UserEntity userEntity;