s-choiブランチとのマージ完了

src/main/java/com/example/demo/app/domain/model/GoalModel.java

@@ -0,0 +1,58 @@
+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());
+	}
+
+}

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

@@ -0,0 +1,15 @@
+package com.example.demo.app.domain.service;
+
+import com.example.demo.app.domain.model.GoalModel;
+
+public interface GoalService {
+
+	GoalModel getGoalById(Long goalId);
+
+	GoalModel createGoal(GoalModel goalModel);
+
+	GoalModel updateGoal(GoalModel goalModel);
+
+//	void deleteGoal(Long goalId);
+
+}

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

@@ -0,0 +1,49 @@
+package com.example.demo.app.domain.service.impl;
+
+import org.springframework.stereotype.Service;
+
+import com.example.demo.app.domain.model.GoalModel;
+import com.example.demo.app.domain.service.GoalService;
+import com.example.demo.app.infra.entity.GoalEntity;
+import com.example.demo.app.infra.repository.GoalRepository;
+
+import lombok.RequiredArgsConstructor;
+
+@Service
+@RequiredArgsConstructor
+public class GoalServiceImpl implements GoalService {
+
+	private final GoalRepository goalRepository;
+
+	@Override
+	public GoalModel getGoalById(Long goalId) {
+
+		GoalEntity goalEntity = goalRepository.findById(goalId).orElse(null);
+
+		return GoalModel.convertFrom(goalEntity);
+
+	}
+
+	@Override
+	public GoalModel createGoal(GoalModel goalModel) {
+
+		GoalEntity goalEntity = GoalModel.convertTo(goalModel);
+
+		GoalEntity savedGoalEntity = goalRepository.save(goalEntity);
+
+		return GoalModel.convertFrom(savedGoalEntity);
+
+	}
+
+	@Override
+	public GoalModel updateGoal(GoalModel goalModel) {
+
+		GoalEntity goalEntity = GoalModel.convertTo(goalModel);
+
+		GoalEntity updatedGoalEntity = goalRepository.save(goalEntity);
+
+		return GoalModel.convertFrom(updatedGoalEntity);
+
+	}
+
+}

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

@@ -8,7 +8,6 @@ import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
 import jakarta.persistence.OneToMany;
-import jakarta.persistence.OneToOne;
 import jakarta.persistence.Table;
 
 import com.example.demo.app.domain.model.CourseModel;
@@ -39,10 +38,6 @@ public class CourseEntity {
 	 @OneToMany(mappedBy = "courseEntity")
 	 private List<UserEntity> userEntity;
 	 
-	 @OneToOne(mappedBy = "courseEntity")
-	 private AllocationEntity allocationEntity;
-	 
-	 
 	 public static List<CourseModel> createCourseModelList(List<CourseEntity> courseEntityList) {
 
 	        return courseEntityList

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

@@ -0,0 +1,52 @@
+package com.example.demo.app.presentation.controller;
+
+import java.util.logging.Logger;
+
+import org.springframework.stereotype.Controller;
+import org.springframework.ui.Model;
+import org.springframework.web.bind.annotation.GetMapping;
+
+import com.example.demo.app.domain.service.CourseInfoService;
+import com.example.demo.app.domain.service.CourseService;
+import com.example.demo.app.presentation.form.CourseForm;
+import com.example.demo.app.presentation.form.CourseInfoForm;
+
+import lombok.RequiredArgsConstructor;
+
+
+@Controller
+@RequiredArgsConstructor
+public class CourseController {
+	
+	private final static Logger LOGGER = Logger.getLogger(CourseController.class.getName());
+    // エラーメッセージ用の定数フィールド
+    private final static String SEVERE_ERROR_MESSAGE = "エラーが発生しました！";
+
+    // private final HttpSession httpSession;
+    private final CourseService courseService;
+    private final CourseInfoService courseInfoService;
+    
+    
+    
+    @GetMapping("/select-course")
+    public String select(Model model) {
+    	
+    	//try {
+    		model.addAttribute("courseList", CourseForm.convertFrom(courseService.findAll()));
+    		model.addAttribute("courseInfoList", CourseInfoForm.convertFrom(courseInfoService.findAll()));
+    		
+    		return "select_course";
+    		
+    	//} catch (Exception e) {
+//    		// ログイン情報の破棄
+//            httpSession.invalidate();
+//
+//            e.printStackTrace();
+//
+//            // エラーログ出力
+//            LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE, e);
+//            // エラー画面遷移
+//            return null;
+//    	}
+    }
+}

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

@@ -0,0 +1,61 @@
+package com.example.demo.app.presentation.controller;
+
+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.PathVariable;
+import org.springframework.web.bind.annotation.PostMapping;
+import org.springframework.web.bind.annotation.RequestMapping;
+
+import com.example.demo.app.domain.model.GoalModel;
+import com.example.demo.app.domain.service.GoalService;
+import com.example.demo.app.presentation.form.GoalForm;
+
+import lombok.RequiredArgsConstructor;
+
+@Controller
+@RequiredArgsConstructor
+@RequestMapping("/goal")
+public class GoalController {
+
+	private final GoalService goalService;
+
+	@GetMapping("/{goalId}")
+	public String getGoal(@PathVariable Long goalId, Model model) {
+
+		GoalModel goalModel = goalService.getGoalById(goalId);
+
+		GoalForm goalForm = GoalForm.convertFrom(goalModel);
+
+		model.addAttribute("goalForm", goalForm);
+
+		return "goal_view";
+
+	}
+
+	@GetMapping("/{goalId}/edit")
+	public String editGoal(@PathVariable Long goalId, Model model) {
+
+		GoalModel goalModel = goalService.getGoalById(goalId);
+
+		GoalForm goalForm = GoalForm.convertFrom(goalModel);
+
+		model.addAttribute("goalForm", goalForm);
+
+		return "goal_edit";
+
+	}
+
+	@PostMapping("/update")
+	public String updateGoal(@ModelAttribute GoalForm goalForm) {
+
+		GoalModel goalModel = GoalModel.convertFrom(goalForm);
+
+		goalService.updateGoal(goalModel);
+
+		return "redirect:/goal/" + goalForm.getGoalId();
+
+	}
+
+}

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

@@ -0,0 +1,42 @@
+package com.example.demo.app.presentation.form;
+
+import java.time.LocalDate;
+
+import com.example.demo.app.domain.model.GoalModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class GoalForm {
+
+	private Long goalId;
+
+	private String goalTitle;
+
+	private String goalSubtitle;
+
+	private Integer targetAmount;
+
+	private LocalDate deadline;
+
+	private Integer goalComplete;
+
+	public static GoalForm convertFrom(GoalModel goalModel) {
+		return new GoalForm(
+				goalModel.getGoalId(),
+				goalModel.getGoalTitle(),
+				goalModel.getGoalSubtitle(),
+				goalModel.getTargetAmount(),
+				goalModel.getDeadline(),
+				goalModel.getGoalComplete());
+	}
+
+//	public static List<GoalForm> convertFrom(List<GoalModel> goalModelList) {
+//		return goalModelList.stream().map(GoalForm::convertFrom).toList();
+//	}
+
+}

src/main/resources/templates/goal_edit.html

@@ -0,0 +1,41 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+	<meta charset="UTF-8">
+	<title>目標編集</title>
+</head>
+<body>
+
+	<h1>目標編集</h1>
+
+	<form th:action="@{/goal/update}" th:object="${goalForm}" method="post">
+
+		<input type="hidden" th:field="*{goalId}">
+
+		<div>
+			<label>目標名</label>
+			<input type="text" th:field="*{goalTitle}">
+		</div>
+
+		<div>
+			<label>目標補足説明</label>
+			<textarea th:field="*{goalSubtitle}"></textarea>
+		</div>
+
+		<div>
+			<label>目標金額</label>
+			<input type="number" th:field="*{targetAmount}">
+		</div>
+
+		<div>
+			<label>目標達成期限</label>
+			<input type="date" th:field="*{deadline}">
+		</div>
+
+
+		<button type="submit">更新する</button>
+
+	</form>
+
+</body>
+</html>

src/main/resources/templates/goal_view.html

@@ -0,0 +1,33 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+	<meta charset="UTF-8">
+	<title>目標詳細</title>
+</head>
+<body>
+
+	<h1>目標詳細</h1>
+
+	<table>
+		<tr>
+			<th>目標名</th>
+			<td th:text="${goalForm.goalTitle}"></td>
+		</tr>
+		<tr>
+			<th>目標補足説明</th>
+			<td th:text="${goalForm.goalSubtitle}"></td>
+		</tr>
+		<tr>
+			<th>目標金額</th>
+			<td th:text="${goalForm.targetAmount}"></td>
+		</tr>
+		<tr>
+			<th>目標達成期限</th>
+			<td th:text="${goalForm.deadline}"></td>
+		</tr>
+	</table>
+
+	<a th:href="@{/goal/{goalId}/edit(goalId=${goalForm.goalId})}">編集する</a>
+
+</body>
+</html>

src/main/resources/templates/select_course.html

@@ -0,0 +1,35 @@
+<!DOCTYPE html>
+<html xmlns:th="http://www.thymeleaf.org">
+<head>
+<meta charset="UTF-8">
+<title>コース選択</title>
+</head>
+<body>
+	
+	<div class="accordion" id="accordionExample">
+	  <div class="accordion-item" th:each="course:${courseList}">
+	    <h2 class="accordion-header">
+	      <button class="accordion-button" type="button" data-bs-toggle="collapse" data-bs-target="#collapseOne" aria-expanded="true" aria-controls="collapseOne">
+	        <span th:text="${course.courseName}"></span>
+	      </button>
+	    </h2>
+	    <div id="collapseOne" class="accordion-collapse collapse show" data-bs-parent="#accordionExample">
+	      <div class="accordion-body">
+	        <span th:text="${course.description}"></span>
+			<table border="1">
+				<tr>
+					<th>カテゴリ名</th><tr>配分(%)</tr>
+				</tr>
+				<tr th:each="courseInfo:${courseInfoList}" th:if="course.courseId == courseInfo.courseId">
+					<td th:text="${courseInfo.categoryName}"></td>
+					<td th:text="${courseInfo.allocationRatio}"></td>
+				</tr>
+			</table>
+	      </div>
+	    </div>
+	  </div>
+	</div>
+	
+	
+</body>
+</html>