Compare commits
3 Commits
7e2017a341
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
48ba386c88 | ||
| a10a4053cf | |||
|
|
a811b0d261 |
BIN
Monegement.war
Normal file
BIN
Monegement.war
Normal file
Binary file not shown.
@@ -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;
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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";
|
||||
|
||||
}
|
||||
|
||||
@@ -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")) {
|
||||
|
||||
@@ -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);
|
||||
|
||||
|
||||
@@ -430,7 +430,6 @@ public class TransactionController {
|
||||
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()) {
|
||||
|
||||
3
src/main/webapp/META-INF/MANIFEST.MF
Normal file
3
src/main/webapp/META-INF/MANIFEST.MF
Normal file
@@ -0,0 +1,3 @@
|
||||
Manifest-Version: 1.0
|
||||
Class-Path:
|
||||
|
||||
Reference in New Issue
Block a user