31 Commits

Author SHA1 Message Date
0bec7b3b3b [EDIT]目標モデルの改行 2026-09-17 16:52:56 +09:00
kkazuya
fbec462f65 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:35:42 +09:00
kkazuya
8b9765852b Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:31:50 +09:00
s-choi
830d8a672f Merge remote-tracking branch 'origin/s-morimto' into s-choi 2026-09-17 16:31:50 +09:00
kkazuya
ae53f3e733 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:31:41 +09:00
d87bdfbe91 [EDIT]controllerの修正 2026-09-17 16:28:23 +09:00
s-choi
22191e63ef Merge remote-tracking branch 'origin/s-morimto' into s-choi 2026-09-17 16:27:57 +09:00
kkazuya
e261065a62 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:26:31 +09:00
49ad550839 [EDIT]メールアドレスの追加 2026-09-17 16:25:46 +09:00
s-choi
bd2cad7c34 Merge remote-tracking branch 'origin/n-kawahito' into s-choi
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
2026-09-17 16:18:45 +09:00
s-choi
db7fc1d16d Merge remote-tracking branch 'origin/s-morimto' into s-choi
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
2026-09-17 16:17:50 +09:00
23232954f1 Merge branch 'k-kobayashi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-17 16:08:12 +09:00
4e3477af77 [EDIT]分析値の+-表記と色分けについて記述しました 2026-09-17 16:07:35 +09:00
kkazuya
296bcf8d70 Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:03:38 +09:00
kkazuya
544cbd0ac8 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 16:02:58 +09:00
kkazuya
0eddd7889f Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java
2026-09-17 16:02:22 +09:00
192191d352 [ADD]パスワード再設定の作成 2026-09-17 15:59:33 +09:00
kkazuya
bda791567c [ADD] コース選択画面を作成しました。 2026-09-17 15:50:43 +09:00
kkazuya
1e09463984 [ADD] コース選択画面に遷移するCourseControllerを作成しました。 2026-09-17 15:50:11 +09:00
kkazuya
a89c54f8c0 [ADD] Course, CoureseInfoのサービスとそれを実装したクラスを作成しました。 2026-09-17 15:49:11 +09:00
cbaee01d13 [EDIT]支出分析画面を追記し、作成しました。 2026-09-17 15:48:17 +09:00
2dad64ab10 Merge branch 's-choi' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into n-kawahito 2026-09-17 15:34:38 +09:00
9b51b26b0e [EDIT]AnalysisControllerのform変換コードの追記をしました 2026-09-17 15:33:55 +09:00
646c37ea57 [ADD]認証機能の作成 2026-09-17 15:33:17 +09:00
a5799843d3 [ADD]支出分析画面のためのformクラスを作成しました。 2026-09-17 15:33:02 +09:00
kkazuya
7a13d9cdda Merge branch 'n-kawahito' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 15:31:40 +09:00
kkazuya
0c5f4a8c9b Merge branch 'k-oshita' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi
# Conflicts:
#	src/main/java/com/example/demo/app/infra/repository/GoalRepository.java
2026-09-17 15:31:20 +09:00
kkazuya
c5d1814be4 Merge branch 's-morimto' of https://gitea.it-college.co.jp/2026_09_5H_Spring_KIZAKI/Monegement into k-kobayashi 2026-09-17 15:25:03 +09:00
ca7e93908d [FIX]HOTFIXに合わせて、変数名を変更しました。 2026-09-17 14:43:44 +09:00
a735162974 [EDIT]支出分析のためのサービス実装部分を記述しました。 2026-09-17 14:43:11 +09:00
3d3177bbfa [ADD]新規会員登録機能の作成 2026-09-17 14:23:30 +09:00

View File

@@ -1,58 +0,0 @@
package com.example.demo.app.domain.model;
import java.time.LocalDate;
import com.example.demo.app.infra.entity.GoalEntity;
import com.example.demo.app.presentation.form.GoalForm;
import lombok.AllArgsConstructor;
import lombok.Getter;
@Getter
@AllArgsConstructor
public class GoalModel {
private Long goalId;
private String goalTitle;
private String goalSubtitle;
private Integer targetAmount;
private LocalDate deadline;
private Integer goalComplete;
public static GoalModel convertFrom(GoalEntity goalEntity) {
return new GoalModel(
goalEntity.getGoalId(),
goalEntity.getGoalTitle(),
goalEntity.getGoalSubtitle(),
goalEntity.getTargetAmount(),
goalEntity.getDeadline(),
goalEntity.getGoalComplete());
}
public static GoalEntity convertTo(GoalModel goalModel) {
return new GoalEntity(
goalModel.getGoalId(),
goalModel.getGoalTitle(),
goalModel.getGoalSubtitle(),
goalModel.getTargetAmount(),
goalModel.getDeadline(),
goalModel.getGoalComplete(),
null);
}
public static GoalModel convertFrom(GoalForm goalForm) {
return new GoalModel(
goalForm.getGoalId(),
goalForm.getGoalTitle(),
goalForm.getGoalSubtitle(),
goalForm.getTargetAmount(),
goalForm.getDeadline(),
goalForm.getGoalComplete());
}
}