3 Commits

7 changed files with 23 additions and 26 deletions

BIN
Monegement.war Normal file

Binary file not shown.

View File

@@ -49,7 +49,7 @@ public class GlobalExceptionHandler {
LOGGER.log(Level.SEVERE, SEVERE_ERROR_MESSAGE_ILLEGAL_TRANSITION, e);
System.out.println("session invalidated method not supported exception");
System.out.println("session invalidated");
session.invalidate();
return TransitionTargetPageNameKeyword.ERROR_HTML;
@@ -61,7 +61,7 @@ public class GlobalExceptionHandler {
e.printStackTrace();
System.out.println("session invalidated exception");
session.invalidate();
// session.invalidate();
return TransitionTargetPageNameKeyword.ERROR_HTML;
}
}

View File

@@ -130,19 +130,14 @@ public class CourseServiceImpl implements CourseService {
public String deleteCourse(Long courseId, Long userId) {
UserEntity userEntity = userRepository.findById(userId).orElse(null);
System.out.println("***********************ここでエラー1");
if (userEntity.getCourseEntity().getCourseId() == courseId) {
return "selected";
} else if (courseId <= 6) {
return "original";
}
System.out.println("***********************ここでエラー2");
allocationRepository.deleteByCourseId(courseId);
System.out.println("***********************ここでエラー3");
courseOwnerRepository.deleteByCourseId(courseId);
System.out.println("***********************ここでエラー4");
courseRepository.deleteById(courseId);
System.out.println("***********************ここでエラー5");
return "ok";
}

View File

@@ -132,7 +132,7 @@ public class CourseController {
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
System.out.println("**********************cousrId: " + courseId);
// System.out.println("**********************cousrId: " + courseId);
String condition = courseService.deleteCourse(courseId, loginUser.getUserId());
if (condition.equals("selected")) {

View File

@@ -275,7 +275,7 @@ public class GoalController {
int currentAmount = goalService.getCurrentAmount(userId);
System.out.println("************************currentAmount : " + currentAmount);
// System.out.println("************************currentAmount : " + currentAmount);
session.setAttribute(PageReturnAttributeKeyword.CURRENT_AMOUNT, currentAmount);

View File

@@ -372,29 +372,29 @@ public class TransactionController {
@RequestParam(required = false, defaultValue = "0") String months) {
LoginModel loginUser = (LoginModel) session.getAttribute(SessionKeyword.LOGIN_USER);
LocalDate today = LocalDate.now();
int year = (years.equals("0")) ? today.getYear() : Integer.parseInt(years);
int month = (months.equals("0")) ? today.getMonthValue() : Integer.parseInt(months);
YearMonth yearMonth = YearMonth.of(year, month);
int lastDay = yearMonth.lengthOfMonth();
int firstDayOfWeek = yearMonth.atDay(1).getDayOfWeek().getValue() % 7;
YearMonth previousYearMonth = yearMonth.minusMonths(1);
int previousYear = previousYearMonth.getYear();
int previousMonth = previousYearMonth.getMonthValue();
YearMonth nextYearMonth = yearMonth.plusMonths(1);
int nextYear = nextYearMonth.getYear();
int nextMonth = nextYearMonth.getMonthValue();
model.addAttribute(PageReturnAttributeKeyword.YEAR, year);
model.addAttribute(PageReturnAttributeKeyword.MONTH, month);
model.addAttribute(PageReturnAttributeKeyword.DAY, today.getDayOfMonth());
@@ -410,27 +410,26 @@ public class TransactionController {
LocalDate startDate = yearMonth.atDay(1);
LocalDate endDate = yearMonth.atEndOfMonth();
List<Income> incomeList = transactionService.findTotalIncomeList(startDate, endDate, loginUser.getUserId());
List<Expense> expenseList = transactionService.findTotalExpenseList(startDate, endDate, loginUser.getUserId());
model.addAttribute(PageReturnAttributeKeyword.INCOME_LIST, incomeList);
model.addAttribute(PageReturnAttributeKeyword.EXPENSE_LIST, expenseList);
int totalIncome = transactionService.findTotalIncome(startDate, endDate, loginUser.getUserId());
int totalExpense = transactionService.findTotalExpense(startDate, endDate, loginUser.getUserId());
model.addAttribute(PageReturnAttributeKeyword.TOTAL_INCOME, totalIncome);
model.addAttribute(PageReturnAttributeKeyword.TOTAL_EXPENSE, totalExpense);
List<GoalForm> goalForm = GoalForm.convertFrom(goalService.getGoalByUserId(loginUser.getUserId()));
UserForm userForm = UserForm.convertFrom(userService.findByUserId(loginUser.getUserId()));
List<GoalForm> resultList = goalForm.stream().filter(goal -> goal.getGoalComplete() == 0 && goal.getDeadline().isAfter(today) )
.collect(Collectors.toList());
if (!resultList.isEmpty()) {

View File

@@ -0,0 +1,3 @@
Manifest-Version: 1.0
Class-Path: