3 Commits

8 changed files with 12 additions and 14 deletions

View File

@@ -57,7 +57,7 @@ public class GoalModel {
goalModel.getTargetAmount(), goalModel.getTargetAmount(),
goalModel.getDeadline(), goalModel.getDeadline(),
0, 0,
userEntity, 0); userEntity);
} }
public static GoalModel convertFrom(GoalForm goalForm) { public static GoalModel convertFrom(GoalForm goalForm) {

View File

@@ -53,13 +53,13 @@ public class UserServiceImpl implements UserService {
userEntity.setQuestionEntity(questionEntity); userEntity.setQuestionEntity(questionEntity);
userEntity.setCourseEntity(courseEntity); userEntity.setCourseEntity(courseEntity);
userEntity.setDeleteFlag(0); userEntity.setDeleteFlag(0);
userRepository.save(userEntity); goalEntity.setUserEntity(userRepository.save(userEntity));
goalRepository.save(goalEntity);
} }
@Override @Override

View File

@@ -29,7 +29,7 @@ public class CategoryEntity {
@Column(name = "category_id") @Column(name = "category_id")
private Long categoryId; private Long categoryId;
@Column(name = "category_name", nullable = false) @Column(name = "category_name", nullable = false, length = 50)
private String categoryName; private String categoryName;
@Column(name = "transaction_type", nullable = false) @Column(name = "transaction_type", nullable = false)

View File

@@ -27,7 +27,7 @@ public class CourseEntity {
@Column(name = "course_id") @Column(name = "course_id")
private Long courseId; private Long courseId;
@Column(name = "course_name", nullable = false) @Column(name = "course_name", nullable = false, length = 50)
private String courseName; private String courseName;

View File

@@ -34,7 +34,7 @@ public class FixedCostEntity {
@JoinColumn(name = "category_id") @JoinColumn(name = "category_id")
private CategoryEntity categoryEntity; private CategoryEntity categoryEntity;
@Column(name = "fixed_cost_name", nullable = false) @Column(name = "fixed_cost_name", nullable = false, length = 50)
private String fixedCostName; private String fixedCostName;
@Column(name = "amount", nullable = false) @Column(name = "amount", nullable = false)

View File

@@ -29,10 +29,10 @@ public class GoalEntity {
private Long goalId; private Long goalId;
@Column(name = "goal_title", nullable = true) @Column(name = "goal_title", nullable = true)
private String goalTitle; private String goalTitle = "名前を設定してください";
@Column(name = "goal_subtitle", nullable = true) @Column(name = "goal_subtitle", nullable = true)
private String goalSubtitle; private String goalSubtitle = "説明を書いてください";
@Column(name = "target_amount", nullable = true) @Column(name = "target_amount", nullable = true)
private Integer targetAmount; private Integer targetAmount;
@@ -47,6 +47,4 @@ public class GoalEntity {
@JoinColumn(name = "user_id") @JoinColumn(name = "user_id")
private UserEntity userEntity; private UserEntity userEntity;
private Integer deleteFlag;
} }

View File

@@ -30,7 +30,7 @@ public class UserEntity {
@Column(name = "user_id") @Column(name = "user_id")
private Long userId; private Long userId;
@Column(name = "user_name", nullable = false) @Column(name = "user_name", nullable = false, length = 100)
private String userName; private String userName;
@Column(name = "mail_address", nullable = false) @Column(name = "mail_address", nullable = false)
@@ -39,7 +39,7 @@ public class UserEntity {
@Column(name = "password", nullable = false) @Column(name = "password", nullable = false)
private String password; private String password;
@Column(name = "secret_answer", nullable = false) @Column(name = "secret_answer", nullable = false, length = 100)
private String secretQuestionAnswer; private String secretQuestionAnswer;
@Column(name = "birth_date", nullable = false) @Column(name = "birth_date", nullable = false)

View File

@@ -80,7 +80,7 @@
</div> </div>
<div class="mb-3"> <div class="mb-3">
<label for="goalId" class="form-label">目標</label> <label for="goalId" class="form-label">目標貯金額</label>
<input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0" required> <input type="number" id="goalId" class="form-control" th:field="*{goalId}" min="0" required>
</div> </div>