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

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

@@ -0,0 +1,20 @@
+package com.example.demo.app.domain.model;
+
+import lombok.AllArgsConstructor;
+import lombok.Getter;
+
+@Getter
+@AllArgsConstructor
+public class CourseInfoModel {
+
+	private Long courseId;
+	
+	private String courseName;
+	
+	private Long categoryId;
+	
+	private String categoryName;
+	
+	private Integer allocationRatio;
+	
+}

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

@@ -24,7 +24,7 @@ public class GoalEntity {
 	@Id
 	@GeneratedValue(strategy = GenerationType.IDENTITY)
 	@Column(name = "goal_id")
-	private Integer goalId;
+	private Long goalId;
 
 	@Column(name = "goal_title", nullable = true)
 	private String goalTitle;

src/main/java/com/example/demo/app/infra/repository/AllocationRepository.java

@@ -13,19 +13,20 @@ public interface AllocationRepository extends JpaRepository<AllocationEntity, Al
 	
 	List<AllocationEntity> findByCourseEntity_CourseId(Long courseId);
 	
-	@Query(" SELECT co.course_id, "
+	@Query(" SELECT new com.example.demo.app.domain.model.CourseInfoModel("
-			+ " co.course_name, "
+			+ "co.courseId, "
-			+ " ca.category_id, "
+			+ " co.courseName, "
-			+ " ca.categpry_name, "
+			+ " ca.categoryId, "
-			+ " a.allocation_ratio "
+			+ " ca.categoryName, "
-			+ " FROM allocation_m a "
+			+ " a.allocationRatio )"
-			+ " INNER JOIN course_m co "
+			+ " FROM AllocationEntity a"
-			+ " ON a.course_id = co.course_id "
+			+ " INNER JOIN CourseEntity co "
-			+ " INNER JOIN category_t ca "
+			+ " ON a.courseEntity.courseId = co.courseId "
-			+ " on a.category_id = ca.category_id "
+			+ " INNER JOIN CategoryEntity ca "
-			+ " WHERE ca.transaction_type = 0 "
+			+ " on a.categoryEntity.categoryId = ca.categoryId "
-			+ " ORDER BY a.course_id ASC, "
+			+ " WHERE ca.transactionType = 0 "
-			+ " a.category_id ASC ")
+			+ " ORDER BY a.courseEntity.courseId ASC, "
+			+ " a.categoryEntity.categoryId ASC ")
 	List<CourseInfoModel> findAllJoinedAllocation();
 	
 }

src/main/java/com/example/demo/app/infra/repository/TransactionRepository.java

@@ -13,13 +13,13 @@ public interface TransactionRepository extends JpaRepository<TransactionEntity,
 	@Query("select t from TransactionEntity t where t.userEntity.userId = :userId and t.transactionDate = :transactionDate")
 	public List<TransactionEntity> findByUserIdAndDate(LocalDate todayDate, Long userId);
 
-	@Query("select t from TransactionEntity t where (t.transactionDate between :startDate and :endDate) and (t.userId = :userId) order by t.transactionDate asc")
+	@Query("select t from TransactionEntity t where (t.transactionDate between :startDate and :endDate) and (t.userEntity.userId = :userId) order by t.transactionDate asc")
 	public List<TransactionEntity> findAllByDateAndUserId(LocalDate startDate, LocalDate endDate, Long userId);
 
-	@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryId = c.categoryId where (t.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 0")
+	@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryEntity.categoryId = c.categoryId where (t.userEntity.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 0")
 	public Integer findTotalExpense(LocalDate startDate, LocalDate endDate, Long userId);
 
-	@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryId = c.categoryId where (t.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 1")
+	@Query("select sum(t.amount) from TransactionEntity t inner join CategoryEntity c on t.categoryEntity.categoryId = c.categoryId where (t.userEntity.userId = :userId and t.transactionDate between :startDate and :endDate) and c.transactionType = 1")
 	public Integer findTotalIncome(LocalDate startDate, LocalDate endDate, Long userId);
 	
 	@Query("select sum(t.amount) from TransactionEntity t where t.userEntity.userId = :userId and t.categoryEntity.categoryId = :categoryId and t.transactionDate between :startDate and :endDate")

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

@@ -66,7 +66,7 @@ public class TransactionController {
 	}
 
 	// 詳細画面
-	@GetMapping()
+	@GetMapping("/transaction/detail")
 	public String findOne(@RequestParam(required = false) LocalDate todayDates, Model model, HttpSession session) {
 
 		LocalDate todayDate = (todayDates == null) ? LocalDate.now() : todayDates;
@@ -93,13 +93,13 @@ public class TransactionController {
 		return "";
 	}
 
-	@GetMapping("")
+	@GetMapping("/transaction/create")
 	public String createOneGet(@ModelAttribute TransactionForm transactionForm) {
 
 		return "";
 	}
 
-	@PostMapping()
+	@PostMapping("/transaction/create")
 	public String createOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
 
 		if (transactionService.createTransaction(TransactionForm.convertTo(transactionForm)) != 0) {
@@ -110,13 +110,13 @@ public class TransactionController {
 
 	}
 
-	@GetMapping("")
+	@GetMapping("/transaction/update")
 	public String updateOneGet(@ModelAttribute TransactionForm transactionForm) {
 
 		return "";
 	}
 
-	@PostMapping()
+	@PostMapping("/transaction/update")
 	public String updateOnePost(@ModelAttribute TransactionForm transactionForm, Model model) {
 
 		if (transactionService.updateTransaction(TransactionForm.convertTo(transactionForm)) != 0) {

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

@@ -0,0 +1,33 @@
+package com.example.demo.app.presentation.form;
+
+import java.util.List;
+
+import com.example.demo.app.domain.model.CourseModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CourseForm {
+	
+	private Long courseId;
+	private String courseName;
+	private String description;
+	
+	
+	public static CourseForm convertFrom(CourseModel courseModel) {
+		return new CourseForm(
+				courseModel.getCourseId(), 
+				courseModel.getCourseName(), 
+				courseModel.getDescription()
+				);
+	}
+	
+	public static List<CourseForm> convertFrom(List<CourseModel> courseModelList){
+		return courseModelList.stream().map(CourseForm::convertFrom).toList();
+	}
+	
+}

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

@@ -0,0 +1,44 @@
+package com.example.demo.app.presentation.form;
+
+import java.util.List;
+
+import com.example.demo.app.domain.model.CourseInfoModel;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class CourseInfoForm {
+
+	private Long courseId;
+	
+	private String courseName;
+	
+	private Long categoryId;
+	
+	private String categoryName;
+	
+	private Integer allocationRatio;
+	
+	
+	public static CourseInfoForm convertFrom(CourseInfoModel courseInfoModel ) {
+		return new CourseInfoForm(courseInfoModel.getCategoryId(), courseInfoModel.getCourseName(), courseInfoModel.getCategoryId(), courseInfoModel.getCategoryName(), courseInfoModel.getAllocationRatio());
+	}
+
+	public static List<CourseInfoForm> convertFrom(List<CourseInfoModel> courseInfoModelList ) {
+		return courseInfoModelList.stream().map(CourseInfoForm::convertFrom).toList();
+	}
+	
+	public static CourseInfoModel convertTo(CourseInfoForm courseInfoForm) {
+		return new CourseInfoModel(
+				courseInfoForm.getCourseId(),
+				courseInfoForm.getCourseName(),
+				courseInfoForm.getCategoryId(),
+				courseInfoForm.getCategoryName(),
+				courseInfoForm.getAllocationRatio());
+	}
+	
+}