Skip to content

fix update course and chpayer #93

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
RyanNeTw merged 1 commit into from
Apr 28, 2026
Merged

fix update course and chpayer #93

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions src/main/java/moneybuddy/fr/moneybuddy/dtos/course/UpdateCourseRequest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,14 @@ public class UpdateCourseRequest {
@PositiveOrZero(message = "Readtime has to be > 0")
private int readTime;

@PositiveOrZero(message = "Level has to be >= 0")
private int level;

@PositiveOrZero(message = "Order has to be >= 0")
private int order;

@PositiveOrZero(message = "coinReward has to be >= 0")
private int coinReward;

private MultipartFile file;
}
11 changes: 8 additions & 3 deletions src/main/java/moneybuddy/fr/moneybuddy/service/ChapterService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -121,9 +121,6 @@ public Chapter updateCourse(String chapterId, UpdateChapterRequest req)
throws FileUploadException, JsonMappingException, JsonProcessingException {
Chapter chapter = getTotalChapter(chapterId);

chapter.setOrder(Optional.ofNullable(req.getOrder()).orElse(chapter.getOrder()));
chapter.setLevel(Optional.ofNullable(req.getLevel()).orElse(chapter.getLevel()));
chapter.setCoinReward(Optional.ofNullable(req.getCoinReward()).orElse(chapter.getCoinReward()));
chapter.setLocked(Optional.ofNullable(req.isLocked()).orElse(chapter.isLocked()));

if (!req.getTitle().isEmpty()) chapter.setTitle(req.getTitle());
Expand All @@ -136,6 +133,14 @@ public Chapter updateCourse(String chapterId, UpdateChapterRequest req)
cloudflareService.remove(chapter.getImage_url());
chapter.setImage_url(image_url);
}

if (req.getSubAccountRole().equals(SubAccountRole.CHILD)) {
chapter.setOrder(Optional.ofNullable(req.getOrder()).orElse(chapter.getOrder()));
chapter.setLevel(Optional.ofNullable(req.getLevel()).orElse(chapter.getLevel()));
chapter.setCoinReward(
Optional.ofNullable(req.getCoinReward()).orElse(chapter.getCoinReward()));
}

return chapterRepository.save(chapter);
}
}
5 changes: 4 additions & 1 deletion src/main/java/moneybuddy/fr/moneybuddy/service/CourseService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,6 @@ public Course updateCourse(String courseId, UpdateCourseRequest req)
Course course = getById(courseId);

course.setReadTime(Optional.ofNullable(req.getReadTime()).orElse(course.getReadTime()));
course.setOrder(Optional.ofNullable(req.getOrder()).orElse(course.getOrder()));
course.setLocked(Optional.ofNullable(req.isLocked()).orElse(course.isLocked()));

if (!req.getTitle().isEmpty()) course.setTitle(req.getTitle());
Expand All @@ -115,6 +114,10 @@ public Course updateCourse(String courseId, UpdateCourseRequest req)
course.setImage_url(image_url);
}

course.setOrder(Optional.ofNullable(req.getOrder()).orElse(course.getOrder()));
course.setLevel(Optional.ofNullable(req.getLevel()).orElse(course.getLevel()));
course.setCoinReward(Optional.ofNullable(req.getCoinReward()).orElse(course.getCoinReward()));

courseRepository.save(course);
return course;
}
Expand Down
Loading