seeseemelk/allowance_planner_2000
1
0
Fork 0
Code Issues 11 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

switch-to-spring #147

Open
seeseemelk wants to merge 9 commits from switch-to-spring into main
pull from: switch-to-spring
merge into: seeseemelk:main
Conversation 2 Commits 9 Files Changed 54 +2348 -2719
37 changed files with 2348 additions and 2719 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit e316d99453 - Show all commits

10
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/AllowancePlannerApplication.java
View File

@@ -4,10 +4,8 @@ import org.springframework.boot.SpringApplication;
import org.springframework.boot.autoconfigure.SpringBootApplication;
@SpringBootApplication
public class AllowancePlannerApplication
{
public static void main(String[] args)
{
SpringApplication.run(AllowancePlannerApplication.class, args);
}
public class AllowancePlannerApplication {
static void main(String[] args) {
SpringApplication.run(AllowancePlannerApplication.class, args);
}
}

768
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/controller/ApiController.java
View File

@@ -1,11 +1,7 @@
package be.seeseepuff.allowanceplanner.controller;
import be.seeseepuff.allowanceplanner.dto.*;
import be.seeseepuff.allowanceplanner.service.AllowanceService;
import be.seeseepuff.allowanceplanner.service.MigrationService;
import be.seeseepuff.allowanceplanner.service.TaskService;
import be.seeseepuff.allowanceplanner.service.TransferService;
import be.seeseepuff.allowanceplanner.service.UserService;
import be.seeseepuff.allowanceplanner.service.*;
import org.springframework.http.HttpStatus;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.*;
@@ -16,504 +12,394 @@ import java.util.Optional;
@RestController
@RequestMapping("/api")
@CrossOrigin(origins = "*")
public class ApiController
{
private final UserService userService;
private final AllowanceService allowanceService;
private final TaskService taskService;
private final TransferService transferService;
private final MigrationService migrationService;
public class ApiController {
seeseemelk commented 2026-03-01 16:26:20 +01:00
Outdated
Review
Copy Link

Split this into multiple controllers

Split this into multiple controllers
private final UserService userService;
private final AllowanceService allowanceService;
private final TaskService taskService;
private final TransferService transferService;
private final MigrationService migrationService;
public ApiController(UserService userService,
AllowanceService allowanceService,
TaskService taskService,
TransferService transferService,
MigrationService migrationService)
{
this.userService = userService;
this.allowanceService = allowanceService;
this.taskService = taskService;
this.transferService = transferService;
this.migrationService = migrationService;
}
public ApiController(UserService userService,
AllowanceService allowanceService,
TaskService taskService,
TransferService transferService,
MigrationService migrationService) {
this.userService = userService;
this.allowanceService = allowanceService;
this.taskService = taskService;
this.transferService = transferService;
this.migrationService = migrationService;
}
// ---- Users ----
// ---- Users ----
@GetMapping("/users")
public List<UserDto> getUsers()
{
return userService.getUsers();
}
@GetMapping("/users")
public List<UserDto> getUsers() {
return userService.getUsers();
}
@GetMapping("/user/{userId}")
public ResponseEntity<?> getUser(@PathVariable String userId)
{
int id;
try
{
id = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@GetMapping("/user/{userId}")
public ResponseEntity<?> getUser(@PathVariable String userId) {
int id;
try {
id = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
Optional<UserWithAllowanceDto> user = userService.getUser(id);
if (user.isEmpty())
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
return ResponseEntity.ok(user.get());
}
Optional<UserWithAllowanceDto> user = userService.getUser(id);
if (user.isEmpty()) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
return ResponseEntity.ok(user.get());
}
// ---- History ----
// ---- History ----
@PostMapping("/user/{userId}/history")
public ResponseEntity<?> postHistory(@PathVariable String userId, @RequestBody PostHistoryRequest request)
{
int id;
try
{
id = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@PostMapping("/user/{userId}/history")
public ResponseEntity<?> postHistory(@PathVariable String userId, @RequestBody PostHistoryRequest request) {
int id;
try {
id = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
if (request.description() == null || request.description().isEmpty())
{
return ResponseEntity.badRequest().body(new ErrorResponse("Description cannot be empty"));
}
if (request.description() == null || request.description().isEmpty()) {
return ResponseEntity.badRequest().body(new ErrorResponse("Description cannot be empty"));
}
if (!userService.userExists(id))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(id)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
allowanceService.addHistory(id, request);
return ResponseEntity.ok(new MessageResponse("History updated successfully"));
}
allowanceService.addHistory(id, request);
return ResponseEntity.ok(new MessageResponse("History updated successfully"));
}
@GetMapping("/user/{userId}/history")
public ResponseEntity<?> getHistory(@PathVariable String userId)
{
int id;
try
{
id = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@GetMapping("/user/{userId}/history")
public ResponseEntity<?> getHistory(@PathVariable String userId) {
int id;
try {
id = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
List<HistoryDto> history = allowanceService.getHistory(id);
return ResponseEntity.ok(history);
}
List<HistoryDto> history = allowanceService.getHistory(id);
return ResponseEntity.ok(history);
}
// ---- Allowances ----
// ---- Allowances ----
@GetMapping("/user/{userId}/allowance")
public ResponseEntity<?> getUserAllowance(@PathVariable String userId)
{
int id;
try
{
id = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@GetMapping("/user/{userId}/allowance")
public ResponseEntity<?> getUserAllowance(@PathVariable String userId) {
int id;
try {
id = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
if (!userService.userExists(id))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(id)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
return ResponseEntity.ok(allowanceService.getUserAllowances(id));
}
return ResponseEntity.ok(allowanceService.getUserAllowances(id));
}
@PostMapping("/user/{userId}/allowance")
public ResponseEntity<?> createUserAllowance(@PathVariable String userId,
@RequestBody CreateAllowanceRequest request)
{
int id;
try
{
id = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@PostMapping("/user/{userId}/allowance")
public ResponseEntity<?> createUserAllowance(@PathVariable String userId,
@RequestBody CreateAllowanceRequest request) {
int id;
try {
id = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
if (request.name() == null || request.name().isEmpty())
{
return ResponseEntity.badRequest().body(new ErrorResponse("Allowance name cannot be empty"));
}
if (request.name() == null || request.name().isEmpty()) {
return ResponseEntity.badRequest().body(new ErrorResponse("Allowance name cannot be empty"));
}
if (!userService.userExists(id))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(id)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
int allowanceId = allowanceService.createAllowance(id, request);
return ResponseEntity.status(HttpStatus.CREATED).body(new IdResponse(allowanceId));
}
int allowanceId = allowanceService.createAllowance(id, request);
return ResponseEntity.status(HttpStatus.CREATED).body(new IdResponse(allowanceId));
}
@PutMapping("/user/{userId}/allowance")
public ResponseEntity<?> bulkPutUserAllowance(@PathVariable String userId,
@RequestBody List<BulkUpdateAllowanceRequest> requests)
{
int id;
try
{
id = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@PutMapping("/user/{userId}/allowance")
public ResponseEntity<?> bulkPutUserAllowance(@PathVariable String userId,
@RequestBody List<BulkUpdateAllowanceRequest> requests) {
int id;
try {
id = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
if (!userService.userExists(id))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(id)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
allowanceService.bulkUpdateAllowance(id, requests);
return ResponseEntity.ok(new MessageResponse("Allowance updated successfully"));
}
allowanceService.bulkUpdateAllowance(id, requests);
return ResponseEntity.ok(new MessageResponse("Allowance updated successfully"));
}
@GetMapping("/user/{userId}/allowance/{allowanceId}")
public ResponseEntity<?> getUserAllowanceById(@PathVariable String userId, @PathVariable String allowanceId)
{
int uid;
try
{
uid = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@GetMapping("/user/{userId}/allowance/{allowanceId}")
public ResponseEntity<?> getUserAllowanceById(@PathVariable String userId, @PathVariable String allowanceId) {
int uid;
try {
uid = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
int aid;
try
{
aid = Integer.parseInt(allowanceId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
int aid;
try {
aid = Integer.parseInt(allowanceId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
if (!userService.userExists(uid))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(uid)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
Optional<AllowanceDto> allowance = allowanceService.getUserAllowanceById(uid, aid);
if (allowance.isEmpty())
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(allowance.get());
}
Optional<AllowanceDto> allowance = allowanceService.getUserAllowanceById(uid, aid);
if (allowance.isEmpty()) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(allowance.get());
}
@DeleteMapping("/user/{userId}/allowance/{allowanceId}")
public ResponseEntity<?> deleteUserAllowance(@PathVariable String userId, @PathVariable String allowanceId)
{
int uid;
try
{
uid = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@DeleteMapping("/user/{userId}/allowance/{allowanceId}")
public ResponseEntity<?> deleteUserAllowance(@PathVariable String userId, @PathVariable String allowanceId) {
int uid;
try {
uid = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
int aid;
try
{
aid = Integer.parseInt(allowanceId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
int aid;
try {
aid = Integer.parseInt(allowanceId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
if (aid == 0)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Allowance id zero cannot be deleted"));
}
if (aid == 0) {
return ResponseEntity.badRequest().body(new ErrorResponse("Allowance id zero cannot be deleted"));
}
if (!userService.userExists(uid))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(uid)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
boolean deleted = allowanceService.deleteAllowance(uid, aid);
if (!deleted)
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("History not found"));
}
return ResponseEntity.ok(new MessageResponse("History deleted successfully"));
}
boolean deleted = allowanceService.deleteAllowance(uid, aid);
if (!deleted) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("History not found"));
}
return ResponseEntity.ok(new MessageResponse("History deleted successfully"));
}
@PutMapping("/user/{userId}/allowance/{allowanceId}")
public ResponseEntity<?> putUserAllowance(@PathVariable String userId, @PathVariable String allowanceId,
@RequestBody UpdateAllowanceRequest request)
{
int uid;
try
{
uid = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@PutMapping("/user/{userId}/allowance/{allowanceId}")
public ResponseEntity<?> putUserAllowance(@PathVariable String userId, @PathVariable String allowanceId,
@RequestBody UpdateAllowanceRequest request) {
int uid;
try {
uid = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
int aid;
try
{
aid = Integer.parseInt(allowanceId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
int aid;
try {
aid = Integer.parseInt(allowanceId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
if (!userService.userExists(uid))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(uid)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
boolean updated = allowanceService.updateAllowance(uid, aid, request);
if (!updated)
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(new MessageResponse("Allowance updated successfully"));
}
boolean updated = allowanceService.updateAllowance(uid, aid, request);
if (!updated) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(new MessageResponse("Allowance updated successfully"));
}
@PostMapping("/user/{userId}/allowance/{allowanceId}/complete")
public ResponseEntity<?> completeAllowance(@PathVariable String userId, @PathVariable String allowanceId)
{
int uid;
try
{
uid = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@PostMapping("/user/{userId}/allowance/{allowanceId}/complete")
public ResponseEntity<?> completeAllowance(@PathVariable String userId, @PathVariable String allowanceId) {
int uid;
try {
uid = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
int aid;
try
{
aid = Integer.parseInt(allowanceId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
int aid;
try {
aid = Integer.parseInt(allowanceId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
if (!userService.userExists(uid))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(uid)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
boolean completed = allowanceService.completeAllowance(uid, aid);
if (!completed)
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(new MessageResponse("Allowance completed successfully"));
}
boolean completed = allowanceService.completeAllowance(uid, aid);
if (!completed) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(new MessageResponse("Allowance completed successfully"));
}
@PostMapping("/user/{userId}/allowance/{allowanceId}/add")
public ResponseEntity<?> addToAllowance(@PathVariable String userId, @PathVariable String allowanceId,
@RequestBody AddAllowanceAmountRequest request)
{
int uid;
try
{
uid = Integer.parseInt(userId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
@PostMapping("/user/{userId}/allowance/{allowanceId}/add")
public ResponseEntity<?> addToAllowance(@PathVariable String userId, @PathVariable String allowanceId,
@RequestBody AddAllowanceAmountRequest request) {
int uid;
try {
uid = Integer.parseInt(userId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid user ID"));
}
int aid;
try
{
aid = Integer.parseInt(allowanceId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
int aid;
try {
aid = Integer.parseInt(allowanceId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid allowance ID"));
}
if (!userService.userExists(uid))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
if (!userService.userExists(uid)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
boolean result = allowanceService.addAllowanceAmount(uid, aid, request);
if (!result)
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(new MessageResponse("Allowance completed successfully"));
}
boolean result = allowanceService.addAllowanceAmount(uid, aid, request);
if (!result) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Allowance not found"));
}
return ResponseEntity.ok(new MessageResponse("Allowance completed successfully"));
}
// ---- Tasks ----
// ---- Tasks ----
@PostMapping("/tasks")
public ResponseEntity<?> createTask(@RequestBody CreateTaskRequest request)
{
if (request.name() == null || request.name().isEmpty())
{
return ResponseEntity.badRequest().body(new ErrorResponse("Task name cannot be empty"));
}
@PostMapping("/tasks")
public ResponseEntity<?> createTask(@RequestBody CreateTaskRequest request) {
if (request.name() == null || request.name().isEmpty()) {
return ResponseEntity.badRequest().body(new ErrorResponse("Task name cannot be empty"));
}
if (request.schedule() != null)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Schedules are not yet supported"));
}
if (request.schedule() != null) {
return ResponseEntity.badRequest().body(new ErrorResponse("Schedules are not yet supported"));
}
if (request.assigned() != null)
{
if (!userService.userExists(request.assigned()))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
}
if (request.assigned() != null) {
if (!userService.userExists(request.assigned())) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("User not found"));
}
}
int taskId = taskService.createTask(request);
return ResponseEntity.status(HttpStatus.CREATED).body(new IdResponse(taskId));
}
int taskId = taskService.createTask(request);
return ResponseEntity.status(HttpStatus.CREATED).body(new IdResponse(taskId));
}
@GetMapping("/tasks")
public List<TaskDto> getTasks()
{
return taskService.getTasks();
}
@GetMapping("/tasks")
public List<TaskDto> getTasks() {
return taskService.getTasks();
}
@GetMapping("/task/{taskId}")
public ResponseEntity<?> getTask(@PathVariable String taskId)
{
int id;
try
{
id = Integer.parseInt(taskId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
@GetMapping("/task/{taskId}")
public ResponseEntity<?> getTask(@PathVariable String taskId) {
int id;
try {
id = Integer.parseInt(taskId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
Optional<TaskDto> task = taskService.getTask(id);
if (task.isEmpty())
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
return ResponseEntity.ok(task.get());
}
Optional<TaskDto> task = taskService.getTask(id);
if (task.isEmpty()) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
return ResponseEntity.ok(task.get());
}
@PutMapping("/task/{taskId}")
public ResponseEntity<?> putTask(@PathVariable String taskId, @RequestBody CreateTaskRequest request)
{
int id;
try
{
id = Integer.parseInt(taskId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
@PutMapping("/task/{taskId}")
public ResponseEntity<?> putTask(@PathVariable String taskId, @RequestBody CreateTaskRequest request) {
int id;
try {
id = Integer.parseInt(taskId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
Optional<TaskDto> existing = taskService.getTask(id);
if (existing.isEmpty())
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
Optional<TaskDto> existing = taskService.getTask(id);
if (existing.isEmpty()) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
taskService.updateTask(id, request);
return ResponseEntity.ok(new MessageResponse("Task updated successfully"));
}
taskService.updateTask(id, request);
return ResponseEntity.ok(new MessageResponse("Task updated successfully"));
}
@DeleteMapping("/task/{taskId}")
public ResponseEntity<?> deleteTask(@PathVariable String taskId)
{
int id;
try
{
id = Integer.parseInt(taskId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
@DeleteMapping("/task/{taskId}")
public ResponseEntity<?> deleteTask(@PathVariable String taskId) {
int id;
try {
id = Integer.parseInt(taskId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
if (!taskService.hasTask(id))
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
if (!taskService.hasTask(id)) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
taskService.deleteTask(id);
return ResponseEntity.ok(new MessageResponse("Task deleted successfully"));
}
taskService.deleteTask(id);
return ResponseEntity.ok(new MessageResponse("Task deleted successfully"));
}
@PostMapping("/task/{taskId}/complete")
public ResponseEntity<?> completeTask(@PathVariable String taskId)
{
int id;
try
{
id = Integer.parseInt(taskId);
}
catch (NumberFormatException e)
{
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
@PostMapping("/task/{taskId}/complete")
public ResponseEntity<?> completeTask(@PathVariable String taskId) {
int id;
try {
id = Integer.parseInt(taskId);
} catch (NumberFormatException e) {
return ResponseEntity.badRequest().body(new ErrorResponse("Invalid task ID"));
}
boolean completed = taskService.completeTask(id);
if (!completed)
{
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
return ResponseEntity.ok(new MessageResponse("Task completed successfully"));
}
boolean completed = taskService.completeTask(id);
if (!completed) {
return ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse("Task not found"));
}
return ResponseEntity.ok(new MessageResponse("Task completed successfully"));
}
// ---- Transfer ----
// ---- Transfer ----
@PostMapping("/transfer")
public ResponseEntity<?> transfer(@RequestBody TransferRequest request)
{
TransferService.TransferResult result = transferService.transfer(request);
return switch (result.status())
{
case SUCCESS -> ResponseEntity.ok(new MessageResponse(result.message()));
case BAD_REQUEST -> ResponseEntity.badRequest().body(new ErrorResponse(result.message()));
case NOT_FOUND ->
ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse(result.message()));
};
}
@PostMapping("/transfer")
public ResponseEntity<?> transfer(@RequestBody TransferRequest request) {
TransferService.TransferResult result = transferService.transfer(request);
return switch (result.status()) {
case SUCCESS -> ResponseEntity.ok(new MessageResponse(result.message()));
case BAD_REQUEST -> ResponseEntity.badRequest().body(new ErrorResponse(result.message()));
case NOT_FOUND -> ResponseEntity.status(HttpStatus.NOT_FOUND).body(new ErrorResponse(result.message()));
};
}
// ---- Migration ----
// ---- Migration ----
@PostMapping("/import")
public ResponseEntity<?> importData(@RequestBody MigrationDto data)
{
migrationService.importData(data);
return ResponseEntity.ok(new MessageResponse("Import successful"));
}
@PostMapping("/import")
public ResponseEntity<?> importData(@RequestBody MigrationDto data) {
migrationService.importData(data);
return ResponseEntity.ok(new MessageResponse("Import successful"));
}
}

258
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/controller/WebController.java
View File

@@ -1,6 +1,7 @@
package be.seeseepuff.allowanceplanner.controller;
import be.seeseepuff.allowanceplanner.dto.*;
import be.seeseepuff.allowanceplanner.dto.CreateAllowanceRequest;
import be.seeseepuff.allowanceplanner.dto.CreateTaskRequest;
import be.seeseepuff.allowanceplanner.service.AllowanceService;
import be.seeseepuff.allowanceplanner.service.TaskService;
import be.seeseepuff.allowanceplanner.service.UserService;
@@ -14,160 +15,135 @@ import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestParam;
import java.util.Arrays;
import java.util.List;
@Controller
public class WebController
{
private final UserService userService;
private final AllowanceService allowanceService;
private final TaskService taskService;
public class WebController {
private final UserService userService;
private final AllowanceService allowanceService;
private final TaskService taskService;
public WebController(UserService userService, AllowanceService allowanceService, TaskService taskService)
{
this.userService = userService;
this.allowanceService = allowanceService;
this.taskService = taskService;
}
public WebController(UserService userService, AllowanceService allowanceService, TaskService taskService) {
this.userService = userService;
this.allowanceService = allowanceService;
this.taskService = taskService;
}
@GetMapping("/")
public String index(HttpServletRequest request, HttpServletResponse response, Model model)
{
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null)
{
model.addAttribute("users", userService.getUsers());
return "index";
}
return renderWithUser(model, currentUser);
}
@GetMapping("/")
public String index(HttpServletRequest request, HttpServletResponse response, Model model) {
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null) {
model.addAttribute("users", userService.getUsers());
return "index";
}
return renderWithUser(model, currentUser);
}
@GetMapping("/login")
public String login(@RequestParam(required = false) String user, HttpServletResponse response)
{
if (user != null && !user.isEmpty())
{
Cookie cookie = new Cookie("user", user);
cookie.setMaxAge(3600);
cookie.setHttpOnly(true);
response.addCookie(cookie);
}
return "redirect:/";
}
@GetMapping("/login")
public String login(@RequestParam(required = false) String user, HttpServletResponse response) {
if (user != null && !user.isEmpty()) {
Cookie cookie = new Cookie("user", user);
cookie.setMaxAge(3600);
cookie.setHttpOnly(true);
response.addCookie(cookie);
}
return "redirect:/";
}
@PostMapping("/createTask")
public String createTask(@RequestParam String name, @RequestParam double reward,
@RequestParam(required = false) String schedule,
HttpServletRequest request, HttpServletResponse response, Model model)
{
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null)
{
return "redirect:/";
}
@PostMapping("/createTask")
public String createTask(@RequestParam String name, @RequestParam double reward,
@RequestParam(required = false) String schedule,
HttpServletRequest request, HttpServletResponse response, Model model) {
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null) {
return "redirect:/";
}
if (name.isEmpty() || reward <= 0)
{
model.addAttribute("error", "Invalid input");
return "index";
}
if (name.isEmpty() || reward <= 0) {
model.addAttribute("error", "Invalid input");
return "index";
}
CreateTaskRequest taskRequest = new CreateTaskRequest(name, reward, null,
(schedule != null && !schedule.isEmpty()) ? schedule : null);
taskService.createTask(taskRequest);
return "redirect:/";
}
CreateTaskRequest taskRequest = new CreateTaskRequest(name, reward, null,
(schedule != null && !schedule.isEmpty()) ? schedule : null);
taskService.createTask(taskRequest);
return "redirect:/";
}
@GetMapping("/completeTask")
public String completeTask(@RequestParam("task") int taskId)
{
taskService.completeTask(taskId);
return "redirect:/";
}
@GetMapping("/completeTask")
public String completeTask(@RequestParam("task") int taskId) {
taskService.completeTask(taskId);
return "redirect:/";
}
@PostMapping("/createAllowance")
public String createAllowance(@RequestParam String name, @RequestParam double target,
@RequestParam double weight,
HttpServletRequest request, HttpServletResponse response, Model model)
{
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null)
{
return "redirect:/";
}
@PostMapping("/createAllowance")
public String createAllowance(@RequestParam String name, @RequestParam double target,
@RequestParam double weight,
HttpServletRequest request, HttpServletResponse response, Model model) {
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null) {
return "redirect:/";
}
if (name.isEmpty() || target <= 0 || weight <= 0)
{
model.addAttribute("error", "Invalid input");
return "index";
}
if (name.isEmpty() || target <= 0 || weight <= 0) {
model.addAttribute("error", "Invalid input");
return "index";
}
allowanceService.createAllowance(currentUser, new CreateAllowanceRequest(name, target, weight, ""));
return "redirect:/";
}
allowanceService.createAllowance(currentUser, new CreateAllowanceRequest(name, target, weight, ""));
return "redirect:/";
}
@GetMapping("/completeAllowance")
public String completeAllowance(@RequestParam("allowance") int allowanceId,
HttpServletRequest request, HttpServletResponse response)
{
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null)
{
return "redirect:/";
}
allowanceService.completeAllowance(currentUser, allowanceId);
return "redirect:/";
}
@GetMapping("/completeAllowance")
public String completeAllowance(@RequestParam("allowance") int allowanceId,
HttpServletRequest request, HttpServletResponse response) {
Integer currentUser = getCurrentUser(request, response);
if (currentUser == null) {
return "redirect:/";
}
allowanceService.completeAllowance(currentUser, allowanceId);
return "redirect:/";
}
private Integer getCurrentUser(HttpServletRequest request, HttpServletResponse response)
{
Cookie[] cookies = request.getCookies();
if (cookies == null)
{
return null;
}
String userStr = Arrays.stream(cookies)
.filter(c -> "user".equals(c.getName()))
.map(Cookie::getValue)
.findFirst()
.orElse(null);
if (userStr == null)
{
return null;
}
try
{
int userId = Integer.parseInt(userStr);
if (!userService.userExists(userId))
{
unsetUserCookie(response);
return null;
}
return userId;
}
catch (NumberFormatException e)
{
unsetUserCookie(response);
return null;
}
}
private Integer getCurrentUser(HttpServletRequest request, HttpServletResponse response) {
Cookie[] cookies = request.getCookies();
if (cookies == null) {
return null;
}
String userStr = Arrays.stream(cookies)
.filter(c -> "user".equals(c.getName()))
.map(Cookie::getValue)
.findFirst()
.orElse(null);
if (userStr == null) {
return null;
}
try {
int userId = Integer.parseInt(userStr);
if (!userService.userExists(userId)) {
unsetUserCookie(response);
return null;
}
return userId;
} catch (NumberFormatException e) {
unsetUserCookie(response);
return null;
}
}
private void unsetUserCookie(HttpServletResponse response)
{
Cookie cookie = new Cookie("user", "");
cookie.setMaxAge(0);
cookie.setPath("/");
cookie.setHttpOnly(true);
response.addCookie(cookie);
}
private void unsetUserCookie(HttpServletResponse response) {
Cookie cookie = new Cookie("user", "");
cookie.setMaxAge(0);
cookie.setPath("/");
cookie.setHttpOnly(true);
response.addCookie(cookie);
}
private String renderWithUser(Model model, int currentUser)
{
model.addAttribute("users", userService.getUsers());
model.addAttribute("currentUser", currentUser);
model.addAttribute("allowances", allowanceService.getUserAllowances(currentUser));
model.addAttribute("tasks", taskService.getTasks());
model.addAttribute("history", allowanceService.getHistory(currentUser));
return "index";
}
private String renderWithUser(Model model, int currentUser) {
model.addAttribute("users", userService.getUsers());
model.addAttribute("currentUser", currentUser);
model.addAttribute("allowances", allowanceService.getUserAllowances(currentUser));
model.addAttribute("tasks", taskService.getTasks());
model.addAttribute("history", allowanceService.getHistory(currentUser));
return "index";
}
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/AddAllowanceAmountRequest.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record AddAllowanceAmountRequest(double amount, String description)
{
public record AddAllowanceAmountRequest(double amount, String description) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/AllowanceDto.java
View File

@@ -3,6 +3,5 @@ package be.seeseepuff.allowanceplanner.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
@JsonInclude(JsonInclude.Include.ALWAYS)
public record AllowanceDto(int id, String name, double target, double progress, double weight, String colour)
{
public record AllowanceDto(int id, String name, double target, double progress, double weight, String colour) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/BulkUpdateAllowanceRequest.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record BulkUpdateAllowanceRequest(int id, double weight)
{
public record BulkUpdateAllowanceRequest(int id, double weight) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/CreateAllowanceRequest.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record CreateAllowanceRequest(String name, double target, double weight, String colour)
{
public record CreateAllowanceRequest(String name, double target, double weight, String colour) {
}

11
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/CreateTaskRequest.java
View File

@@ -1,11 +1,8 @@
package be.seeseepuff.allowanceplanner.dto;
import com.fasterxml.jackson.annotation.JsonProperty;
public record CreateTaskRequest(
String name,
Double reward,
Integer assigned,
String schedule)
{
String name,
Double reward,
Integer assigned,
String schedule) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/ErrorResponse.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record ErrorResponse(String error)
{
public record ErrorResponse(String error) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/HistoryDto.java
View File

@@ -2,6 +2,5 @@ package be.seeseepuff.allowanceplanner.dto;
import java.time.Instant;
public record HistoryDto(double allowance, Instant timestamp, String description)
{
public record HistoryDto(double allowance, Instant timestamp, String description) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/IdResponse.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record IdResponse(int id)
{
public record IdResponse(int id) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/MessageResponse.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record MessageResponse(String message)
{
public record MessageResponse(String message) {
}

27
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/MigrationDto.java
View File

@@ -3,19 +3,22 @@ package be.seeseepuff.allowanceplanner.dto;
import java.util.List;
public record MigrationDto(
List<MigrationUserDto> users,
List<MigrationAllowanceDto> allowances,
List<MigrationHistoryDto> history,
List<MigrationTaskDto> tasks
)
{
public record MigrationUserDto(int id, String name, long balance, double weight) {}
List<MigrationUserDto> users,
List<MigrationAllowanceDto> allowances,
List<MigrationHistoryDto> history,
List<MigrationTaskDto> tasks
) {
public record MigrationUserDto(int id, String name, long balance, double weight) {
}
public record MigrationAllowanceDto(int id, int userId, String name, long target, long balance, double weight,
Integer colour) {}
public record MigrationAllowanceDto(int id, int userId, String name, long target, long balance, double weight,
Integer colour) {
}
public record MigrationHistoryDto(int id, int userId, long timestamp, long amount, String description) {}
public record MigrationHistoryDto(int id, int userId, long timestamp, long amount, String description) {
}
public record MigrationTaskDto(int id, String name, long reward, Integer assigned, String schedule,
Long completed, Long nextRun) {}
public record MigrationTaskDto(int id, String name, long reward, Integer assigned, String schedule,
Long completed, Long nextRun) {
}
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/PostHistoryRequest.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record PostHistoryRequest(double allowance, String description)
{
public record PostHistoryRequest(double allowance, String description) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/TaskDto.java
View File

@@ -3,6 +3,5 @@ package be.seeseepuff.allowanceplanner.dto;
import com.fasterxml.jackson.annotation.JsonInclude;
@JsonInclude(JsonInclude.Include.ALWAYS)
public record TaskDto(int id, String name, double reward, Integer assigned, String schedule)
{
public record TaskDto(int id, String name, double reward, Integer assigned, String schedule) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/TransferRequest.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record TransferRequest(int from, int to, double amount)
{
public record TransferRequest(int from, int to, double amount) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/UpdateAllowanceRequest.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record UpdateAllowanceRequest(String name, double target, double weight, String colour)
{
public record UpdateAllowanceRequest(String name, double target, double weight, String colour) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/UserDto.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record UserDto(int id, String name)
{
public record UserDto(int id, String name) {
}

3
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/dto/UserWithAllowanceDto.java
View File

@@ -1,5 +1,4 @@
package be.seeseepuff.allowanceplanner.dto;
public record UserWithAllowanceDto(int id, String name, double allowance)
{
public record UserWithAllowanceDto(int id, String name, double allowance) {
}

129
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/entity/Allowance.java
View File

@@ -4,96 +4,81 @@ import jakarta.persistence.*;
@Entity
@Table(name = "allowances")
public class Allowance
{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
public class Allowance {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@Column(name = "user_id", nullable = false)
private int userId;
@Column(name = "user_id", nullable = false)
private int userId;
@Column(nullable = false)
private String name;
@Column(nullable = false)
private String name;
@Column(nullable = false)
private long target;
@Column(nullable = false)
private long target;
@Column(nullable = false)
private long balance = 0;
@Column(nullable = false)
private long balance = 0;
@Column(nullable = false)
private double weight;
@Column(nullable = false)
private double weight;
private Integer colour;
private Integer colour;
public int getId()
{
return id;
}
public int getId() {
return id;
}
public void setId(int id)
{
this.id = id;
}
public void setId(int id) {
this.id = id;
}
public int getUserId()
{
return userId;
}
public int getUserId() {
return userId;
}
public void setUserId(int userId)
{
this.userId = userId;
}
public void setUserId(int userId) {
this.userId = userId;
}
public String getName()
{
return name;
}
public String getName() {
return name;
}
public void setName(String name)
{
this.name = name;
}
public void setName(String name) {
this.name = name;
}
public long getTarget()
{
return target;
}
public long getTarget() {
return target;
}
public void setTarget(long target)
{
this.target = target;
}
public void setTarget(long target) {
this.target = target;
}
public long getBalance()
{
return balance;
}
public long getBalance() {
return balance;
}
public void setBalance(long balance)
{
this.balance = balance;
}
public void setBalance(long balance) {
this.balance = balance;
}
public double getWeight()
{
return weight;
}
public double getWeight() {
return weight;
}
public void setWeight(double weight)
{
this.weight = weight;
}
public void setWeight(double weight) {
this.weight = weight;
}
public Integer getColour()
{
return colour;
}
public Integer getColour() {
return colour;
}
public void setColour(Integer colour)
{
this.colour = colour;
}
public void setColour(Integer colour) {
this.colour = colour;
}
}

93
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/entity/History.java
View File

@@ -4,70 +4,59 @@ import jakarta.persistence.*;
@Entity
@Table(name = "history")
public class History
{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
public class History {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@Column(name = "user_id", nullable = false)
private int userId;
@Column(name = "user_id", nullable = false)
private int userId;
@Column(nullable = false)
private long timestamp;
@Column(nullable = false)
private long timestamp;
@Column(nullable = false)
private long amount;
@Column(nullable = false)
private long amount;
private String description;
private String description;
public int getId()
{
return id;
}
public int getId() {
return id;
}
public void setId(int id)
{
this.id = id;
}
public void setId(int id) {
this.id = id;
}
public int getUserId()
{
return userId;
}
public int getUserId() {
return userId;
}
public void setUserId(int userId)
{
this.userId = userId;
}
public void setUserId(int userId) {
this.userId = userId;
}
public long getTimestamp()
{
return timestamp;
}
public long getTimestamp() {
return timestamp;
}
public void setTimestamp(long timestamp)
{
this.timestamp = timestamp;
}
public void setTimestamp(long timestamp) {
this.timestamp = timestamp;
}
public long getAmount()
{
return amount;
}
public long getAmount() {
return amount;
}
public void setAmount(long amount)
{
this.amount = amount;
}
public void setAmount(long amount) {
this.amount = amount;
}
public String getDescription()
{
return description;
}
public String getDescription() {
return description;
}
public void setDescription(String description)
{
this.description = description;
}
public void setDescription(String description) {
this.description = description;
}
}

125
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/entity/Task.java
View File

@@ -4,94 +4,79 @@ import jakarta.persistence.*;
@Entity
@Table(name = "tasks")
public class Task
{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
public class Task {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@Column(nullable = false)
private String name;
@Column(nullable = false)
private String name;
@Column(nullable = false)
private long reward;
@Column(nullable = false)
private long reward;
private Integer assigned;
private Integer assigned;
private String schedule;
private String schedule;
private Long completed;
private Long completed;
@Column(name = "next_run")
private Long nextRun;
@Column(name = "next_run")
private Long nextRun;
public int getId()
{
return id;
}
public int getId() {
return id;
}
public void setId(int id)
{
this.id = id;
}
public void setId(int id) {
this.id = id;
}
public String getName()
{
return name;
}
public String getName() {
return name;
}
public void setName(String name)
{
this.name = name;
}
public void setName(String name) {
this.name = name;
}
public long getReward()
{
return reward;
}
public long getReward() {
return reward;
}
public void setReward(long reward)
{
this.reward = reward;
}
public void setReward(long reward) {
this.reward = reward;
}
public Integer getAssigned()
{
return assigned;
}
public Integer getAssigned() {
return assigned;
}
public void setAssigned(Integer assigned)
{
this.assigned = assigned;
}
public void setAssigned(Integer assigned) {
this.assigned = assigned;
}
public String getSchedule()
{
return schedule;
}
public String getSchedule() {
return schedule;
}
public void setSchedule(String schedule)
{
this.schedule = schedule;
}
public void setSchedule(String schedule) {
this.schedule = schedule;
}
public Long getCompleted()
{
return completed;
}
public Long getCompleted() {
return completed;
}
public void setCompleted(Long completed)
{
this.completed = completed;
}
public void setCompleted(Long completed) {
this.completed = completed;
}
public Long getNextRun()
{
return nextRun;
}
public Long getNextRun() {
return nextRun;
}
public void setNextRun(Long nextRun)
{
this.nextRun = nextRun;
}
public void setNextRun(Long nextRun) {
this.nextRun = nextRun;
}
}

77
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/entity/User.java
View File

@@ -4,58 +4,49 @@ import jakarta.persistence.*;
@Entity
@Table(name = "users")
public class User
{
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
public class User {
@Id
@GeneratedValue(strategy = GenerationType.IDENTITY)
private int id;
@Column(nullable = false)
private String name;
@Column(nullable = false)
private String name;
@Column(nullable = false)
private double weight = 10.0;
@Column(nullable = false)
private double weight = 10.0;
@Column(nullable = false)
private long balance = 0;
@Column(nullable = false)
private long balance = 0;
public int getId()
{
return id;
}
public int getId() {
return id;
}
public void setId(int id)
{
this.id = id;
}
public void setId(int id) {
this.id = id;
}
public String getName()
{
return name;
}
public String getName() {
return name;
}
public void setName(String name)
{
this.name = name;
}
public void setName(String name) {
this.name = name;
}
public double getWeight()
{
return weight;
}
public double getWeight() {
return weight;
}
public void setWeight(double weight)
{
this.weight = weight;
}
public void setWeight(double weight) {
this.weight = weight;
}
public long getBalance()
{
return balance;
}
public long getBalance() {
return balance;
}
public void setBalance(long balance)
{
this.balance = balance;
}
public void setBalance(long balance) {
this.balance = balance;
}
}

19
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/repository/AllowanceRepository.java
View File

@@ -9,19 +9,18 @@ import java.util.List;
import java.util.Optional;
@Repository
public interface AllowanceRepository extends JpaRepository<Allowance, Integer>
{
List<Allowance> findByUserIdOrderByIdAsc(int userId);
public interface AllowanceRepository extends JpaRepository<Allowance, Integer> {
List<Allowance> findByUserIdOrderByIdAsc(int userId);
Optional<Allowance> findByIdAndUserId(int id, int userId);
Optional<Allowance> findByIdAndUserId(int id, int userId);
int countByIdAndUserId(int id, int userId);
int countByIdAndUserId(int id, int userId);
void deleteByIdAndUserId(int id, int userId);
void deleteByIdAndUserId(int id, int userId);
@Query("SELECT a FROM Allowance a WHERE a.userId = :userId AND a.weight > 0 ORDER BY (a.target - a.balance) ASC")
List<Allowance> findByUserIdWithPositiveWeightOrderByRemainingAsc(int userId);
@Query("SELECT a FROM Allowance a WHERE a.userId = :userId AND a.weight > 0 ORDER BY (a.target - a.balance) ASC")
List<Allowance> findByUserIdWithPositiveWeightOrderByRemainingAsc(int userId);
@Query("SELECT COALESCE(SUM(a.weight), 0) FROM Allowance a WHERE a.userId = :userId AND a.weight > 0")
double sumPositiveWeights(int userId);
@Query("SELECT COALESCE(SUM(a.weight), 0) FROM Allowance a WHERE a.userId = :userId AND a.weight > 0")
double sumPositiveWeights(int userId);
}

5
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/repository/HistoryRepository.java
View File

@@ -7,7 +7,6 @@ import org.springframework.stereotype.Repository;
import java.util.List;
@Repository
public interface HistoryRepository extends JpaRepository<History, Integer>
{
List<History> findByUserIdOrderByIdDesc(int userId);
public interface HistoryRepository extends JpaRepository<History, Integer> {
List<History> findByUserIdOrderByIdDesc(int userId);
}

7
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/repository/TaskRepository.java
View File

@@ -8,9 +8,8 @@ import java.util.List;
import java.util.Optional;
@Repository
public interface TaskRepository extends JpaRepository<Task, Integer>
{
List<Task> findByCompletedIsNull();
public interface TaskRepository extends JpaRepository<Task, Integer> {
List<Task> findByCompletedIsNull();
Optional<Task> findByIdAndCompletedIsNull(int id);
Optional<Task> findByIdAndCompletedIsNull(int id);
}

7
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/repository/UserRepository.java
View File

@@ -6,8 +6,7 @@ import org.springframework.data.jpa.repository.Query;
import org.springframework.stereotype.Repository;
@Repository
public interface UserRepository extends JpaRepository<User, Integer>
{
@Query("SELECT COALESCE(SUM(h.amount), 0) FROM History h WHERE h.userId = :userId")
long sumHistoryAmount(int userId);
public interface UserRepository extends JpaRepository<User, Integer> {
@Query("SELECT COALESCE(SUM(h.amount), 0) FROM History h WHERE h.userId = :userId")
long sumHistoryAmount(int userId);
}

456
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/service/AllowanceService.java
View File

@@ -17,282 +17,242 @@ import java.util.List;
import java.util.Optional;
@Service
public class AllowanceService
{
private final AllowanceRepository allowanceRepository;
private final UserRepository userRepository;
private final HistoryRepository historyRepository;
public class AllowanceService {
private final AllowanceRepository allowanceRepository;
private final UserRepository userRepository;
private final HistoryRepository historyRepository;
public AllowanceService(AllowanceRepository allowanceRepository,
UserRepository userRepository,
HistoryRepository historyRepository)
{
this.allowanceRepository = allowanceRepository;
this.userRepository = userRepository;
this.historyRepository = historyRepository;
}
public AllowanceService(AllowanceRepository allowanceRepository,
UserRepository userRepository,
HistoryRepository historyRepository) {
this.allowanceRepository = allowanceRepository;
this.userRepository = userRepository;
this.historyRepository = historyRepository;
}
public List<AllowanceDto> getUserAllowances(int userId)
{
User user = userRepository.findById(userId).orElseThrow();
List<AllowanceDto> result = new ArrayList<>();
public List<AllowanceDto> getUserAllowances(int userId) {
User user = userRepository.findById(userId).orElseThrow();
List<AllowanceDto> result = new ArrayList<>();
// Add the "rest" allowance (id=0)
result.add(new AllowanceDto(0, "", 0, user.getBalance() / 100.0, user.getWeight(), ""));
// Add the "rest" allowance (id=0)
result.add(new AllowanceDto(0, "", 0, user.getBalance() / 100.0, user.getWeight(), ""));
// Add named allowances
for (Allowance a : allowanceRepository.findByUserIdOrderByIdAsc(userId))
{
result.add(toDto(a));
}
return result;
}
// Add named allowances
for (Allowance a : allowanceRepository.findByUserIdOrderByIdAsc(userId)) {
result.add(toDto(a));
}
return result;
}
public Optional<AllowanceDto> getUserAllowanceById(int userId, int allowanceId)
{
if (allowanceId == 0)
{
return userRepository.findById(userId)
.map(u -> new AllowanceDto(0, "", 0, u.getBalance() / 100.0, u.getWeight(), ""));
}
return allowanceRepository.findByIdAndUserId(allowanceId, userId)
.map(this::toDto);
}
public Optional<AllowanceDto> getUserAllowanceById(int userId, int allowanceId) {
if (allowanceId == 0) {
return userRepository.findById(userId)
.map(u -> new AllowanceDto(0, "", 0, u.getBalance() / 100.0, u.getWeight(), ""));
}
return allowanceRepository.findByIdAndUserId(allowanceId, userId)
.map(this::toDto);
}
@Transactional
public int createAllowance(int userId, CreateAllowanceRequest request)
{
int colour = ColourUtil.convertStringToColour(request.colour());
Allowance allowance = new Allowance();
allowance.setUserId(userId);
allowance.setName(request.name());
allowance.setTarget(Math.round(request.target() * 100.0));
allowance.setWeight(request.weight());
allowance.setColour(colour);
allowance = allowanceRepository.save(allowance);
return allowance.getId();
}
@Transactional
public int createAllowance(int userId, CreateAllowanceRequest request) {
int colour = ColourUtil.convertStringToColour(request.colour());
Allowance allowance = new Allowance();
allowance.setUserId(userId);
allowance.setName(request.name());
allowance.setTarget(Math.round(request.target() * 100.0));
allowance.setWeight(request.weight());
allowance.setColour(colour);
allowance = allowanceRepository.save(allowance);
return allowance.getId();
}
@Transactional
public boolean deleteAllowance(int userId, int allowanceId)
{
int count = allowanceRepository.countByIdAndUserId(allowanceId, userId);
if (count == 0)
{
return false;
}
allowanceRepository.deleteByIdAndUserId(allowanceId, userId);
return true;
}
@Transactional
public boolean deleteAllowance(int userId, int allowanceId) {
int count = allowanceRepository.countByIdAndUserId(allowanceId, userId);
if (count == 0) {
return false;
}
allowanceRepository.deleteByIdAndUserId(allowanceId, userId);
return true;
}
@Transactional
public boolean updateAllowance(int userId, int allowanceId, UpdateAllowanceRequest request)
{
if (allowanceId == 0)
{
User user = userRepository.findById(userId).orElseThrow();
user.setWeight(request.weight());
userRepository.save(user);
return true;
}
@Transactional
public boolean updateAllowance(int userId, int allowanceId, UpdateAllowanceRequest request) {
if (allowanceId == 0) {
User user = userRepository.findById(userId).orElseThrow();
user.setWeight(request.weight());
userRepository.save(user);
return true;
}
Optional<Allowance> opt = allowanceRepository.findByIdAndUserId(allowanceId, userId);
if (opt.isEmpty())
{
return false;
}
Optional<Allowance> opt = allowanceRepository.findByIdAndUserId(allowanceId, userId);
if (opt.isEmpty()) {
return false;
}
int colour = ColourUtil.convertStringToColour(request.colour());
Allowance allowance = opt.get();
allowance.setName(request.name());
allowance.setTarget(Math.round(request.target() * 100.0));
allowance.setWeight(request.weight());
allowance.setColour(colour);
allowanceRepository.save(allowance);
return true;
}
int colour = ColourUtil.convertStringToColour(request.colour());
Allowance allowance = opt.get();
allowance.setName(request.name());
allowance.setTarget(Math.round(request.target() * 100.0));
allowance.setWeight(request.weight());
allowance.setColour(colour);
allowanceRepository.save(allowance);
return true;
}
@Transactional
public void bulkUpdateAllowance(int userId, List<BulkUpdateAllowanceRequest> requests)
{
for (BulkUpdateAllowanceRequest req : requests)
{
if (req.id() == 0)
{
User user = userRepository.findById(userId).orElseThrow();
user.setWeight(req.weight());
userRepository.save(user);
}
else
{
allowanceRepository.findByIdAndUserId(req.id(), userId).ifPresent(a ->
{
a.setWeight(req.weight());
allowanceRepository.save(a);
});
}
}
}
@Transactional
public void bulkUpdateAllowance(int userId, List<BulkUpdateAllowanceRequest> requests) {
for (BulkUpdateAllowanceRequest req : requests) {
if (req.id() == 0) {
User user = userRepository.findById(userId).orElseThrow();
user.setWeight(req.weight());
userRepository.save(user);
} else {
allowanceRepository.findByIdAndUserId(req.id(), userId).ifPresent(a ->
{
a.setWeight(req.weight());
allowanceRepository.save(a);
});
}
}
}
@Transactional
public boolean completeAllowance(int userId, int allowanceId)
{
Optional<Allowance> opt = allowanceRepository.findByIdAndUserId(allowanceId, userId);
if (opt.isEmpty())
{
return false;
}
@Transactional
public boolean completeAllowance(int userId, int allowanceId) {
Optional<Allowance> opt = allowanceRepository.findByIdAndUserId(allowanceId, userId);
if (opt.isEmpty()) {
return false;
}
Allowance allowance = opt.get();
long cost = allowance.getBalance();
String allowanceName = allowance.getName();
Allowance allowance = opt.get();
long cost = allowance.getBalance();
String allowanceName = allowance.getName();
// Delete the allowance
allowanceRepository.delete(allowance);
// Delete the allowance
allowanceRepository.delete(allowance);
// Add a history entry
History history = new History();
history.setUserId(userId);
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(-cost);
history.setDescription("Allowance completed: " + allowanceName);
historyRepository.save(history);
// Add a history entry
History history = new History();
history.setUserId(userId);
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(-cost);
history.setDescription("Allowance completed: " + allowanceName);
historyRepository.save(history);
return true;
}
return true;
}
@Transactional
public boolean addAllowanceAmount(int userId, int allowanceId, AddAllowanceAmountRequest request)
{
long remainingAmount = Math.round(request.amount() * 100);
@Transactional
public boolean addAllowanceAmount(int userId, int allowanceId, AddAllowanceAmountRequest request) {
long remainingAmount = Math.round(request.amount() * 100);
// Insert history entry
History history = new History();
history.setUserId(userId);
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(remainingAmount);
history.setDescription(request.description());
historyRepository.save(history);
// Insert history entry
History history = new History();
history.setUserId(userId);
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(remainingAmount);
history.setDescription(request.description());
historyRepository.save(history);
if (allowanceId == 0)
{
if (remainingAmount < 0)
{
User user = userRepository.findById(userId).orElseThrow();
if (remainingAmount > user.getBalance())
{
throw new IllegalArgumentException("cannot remove more than the current balance: " + user.getBalance());
}
}
User user = userRepository.findById(userId).orElseThrow();
user.setBalance(user.getBalance() + remainingAmount);
userRepository.save(user);
}
else if (remainingAmount < 0)
{
Allowance allowance = allowanceRepository.findByIdAndUserId(allowanceId, userId).orElse(null);
if (allowance == null)
{
return false;
}
if (remainingAmount > allowance.getBalance())
{
throw new IllegalArgumentException("cannot remove more than the current allowance balance: " + allowance.getBalance());
}
allowance.setBalance(allowance.getBalance() + remainingAmount);
allowanceRepository.save(allowance);
}
else
{
Allowance allowance = allowanceRepository.findByIdAndUserId(allowanceId, userId).orElse(null);
if (allowance == null)
{
return false;
}
if (allowanceId == 0) {
if (remainingAmount < 0) {
User user = userRepository.findById(userId).orElseThrow();
if (remainingAmount > user.getBalance()) {
throw new IllegalArgumentException("cannot remove more than the current balance: " + user.getBalance());
}
}
User user = userRepository.findById(userId).orElseThrow();
user.setBalance(user.getBalance() + remainingAmount);
userRepository.save(user);
} else if (remainingAmount < 0) {
Allowance allowance = allowanceRepository.findByIdAndUserId(allowanceId, userId).orElse(null);
if (allowance == null) {
return false;
}
if (remainingAmount > allowance.getBalance()) {
throw new IllegalArgumentException("cannot remove more than the current allowance balance: " + allowance.getBalance());
}
allowance.setBalance(allowance.getBalance() + remainingAmount);
allowanceRepository.save(allowance);
} else {
Allowance allowance = allowanceRepository.findByIdAndUserId(allowanceId, userId).orElse(null);
if (allowance == null) {
return false;
}
long toAdd = remainingAmount;
if (allowance.getBalance() + toAdd > allowance.getTarget())
{
toAdd = allowance.getTarget() - allowance.getBalance();
}
remainingAmount -= toAdd;
long toAdd = remainingAmount;
if (allowance.getBalance() + toAdd > allowance.getTarget()) {
toAdd = allowance.getTarget() - allowance.getBalance();
}
remainingAmount -= toAdd;
if (toAdd > 0)
{
allowance.setBalance(allowance.getBalance() + toAdd);
allowanceRepository.save(allowance);
}
if (toAdd > 0) {
allowance.setBalance(allowance.getBalance() + toAdd);
allowanceRepository.save(allowance);
}
if (remainingAmount > 0)
{
addDistributedReward(userId, (int) remainingAmount);
}
}
return true;
}
if (remainingAmount > 0) {
addDistributedReward(userId, (int) remainingAmount);
}
}
return true;
}
public void addDistributedReward(int userId, int reward)
{
User user = userRepository.findById(userId).orElseThrow();
double userWeight = user.getWeight();
public void addDistributedReward(int userId, int reward) {
User user = userRepository.findById(userId).orElseThrow();
double userWeight = user.getWeight();
double sumOfWeights = allowanceRepository.sumPositiveWeights(userId) + userWeight;
double sumOfWeights = allowanceRepository.sumPositiveWeights(userId) + userWeight;
int remainingReward = reward;
int remainingReward = reward;
if (sumOfWeights > 0)
{
List<Allowance> allowances = allowanceRepository.findByUserIdWithPositiveWeightOrderByRemainingAsc(userId);
for (Allowance allowance : allowances)
{
int amount = (int) ((allowance.getWeight() / sumOfWeights) * remainingReward);
if (allowance.getBalance() + amount > allowance.getTarget())
{
amount = (int) (allowance.getTarget() - allowance.getBalance());
}
sumOfWeights -= allowance.getWeight();
allowance.setBalance(allowance.getBalance() + amount);
allowanceRepository.save(allowance);
remainingReward -= amount;
}
}
if (sumOfWeights > 0) {
List<Allowance> allowances = allowanceRepository.findByUserIdWithPositiveWeightOrderByRemainingAsc(userId);
for (Allowance allowance : allowances) {
int amount = (int) ((allowance.getWeight() / sumOfWeights) * remainingReward);
if (allowance.getBalance() + amount > allowance.getTarget()) {
amount = (int) (allowance.getTarget() - allowance.getBalance());
}
sumOfWeights -= allowance.getWeight();
allowance.setBalance(allowance.getBalance() + amount);
allowanceRepository.save(allowance);
remainingReward -= amount;
}
}
// Add remaining to user's balance
user = userRepository.findById(userId).orElseThrow();
user.setBalance(user.getBalance() + remainingReward);
userRepository.save(user);
}
// Add remaining to user's balance
user = userRepository.findById(userId).orElseThrow();
user.setBalance(user.getBalance() + remainingReward);
userRepository.save(user);
}
public List<HistoryDto> getHistory(int userId)
{
return historyRepository.findByUserIdOrderByIdDesc(userId).stream()
.map(h -> new HistoryDto(
h.getAmount() / 100.0,
Instant.ofEpochSecond(h.getTimestamp()),
h.getDescription()))
.toList();
}
public List<HistoryDto> getHistory(int userId) {
return historyRepository.findByUserIdOrderByIdDesc(userId).stream()
.map(h -> new HistoryDto(
h.getAmount() / 100.0,
Instant.ofEpochSecond(h.getTimestamp()),
h.getDescription()))
.toList();
}
@Transactional
public void addHistory(int userId, PostHistoryRequest request)
{
long amount = Math.round(request.allowance() * 100.0);
History history = new History();
history.setUserId(userId);
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(amount);
history.setDescription(request.description());
historyRepository.save(history);
}
@Transactional
public void addHistory(int userId, PostHistoryRequest request) {
long amount = Math.round(request.allowance() * 100.0);
History history = new History();
history.setUserId(userId);
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(amount);
history.setDescription(request.description());
historyRepository.save(history);
}
private AllowanceDto toDto(Allowance a)
{
return new AllowanceDto(
a.getId(),
a.getName(),
a.getTarget() / 100.0,
a.getBalance() / 100.0,
a.getWeight(),
ColourUtil.convertColourToString(a.getColour()));
}
private AllowanceDto toDto(Allowance a) {
return new AllowanceDto(
a.getId(),
a.getName(),
a.getTarget() / 100.0,
a.getBalance() / 100.0,
a.getWeight(),
ColourUtil.convertColourToString(a.getColour()));
}
}

161
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/service/MigrationService.java
View File

@@ -10,95 +10,88 @@ import org.springframework.stereotype.Service;
import org.springframework.transaction.annotation.Transactional;
@Service
public class MigrationService
{
private final UserRepository userRepository;
private final AllowanceRepository allowanceRepository;
private final HistoryRepository historyRepository;
private final TaskRepository taskRepository;
private final EntityManager entityManager;
public class MigrationService {
private final UserRepository userRepository;
private final AllowanceRepository allowanceRepository;
private final HistoryRepository historyRepository;
private final TaskRepository taskRepository;
private final EntityManager entityManager;
public MigrationService(UserRepository userRepository,
AllowanceRepository allowanceRepository,
HistoryRepository historyRepository,
TaskRepository taskRepository,
EntityManager entityManager)
{
this.userRepository = userRepository;
this.allowanceRepository = allowanceRepository;
this.historyRepository = historyRepository;
this.taskRepository = taskRepository;
this.entityManager = entityManager;
}
public MigrationService(UserRepository userRepository,
AllowanceRepository allowanceRepository,
HistoryRepository historyRepository,
TaskRepository taskRepository,
EntityManager entityManager) {
this.userRepository = userRepository;
this.allowanceRepository = allowanceRepository;
this.historyRepository = historyRepository;
this.taskRepository = taskRepository;
this.entityManager = entityManager;
}
@Transactional
public void importData(MigrationDto data)
{
// Delete in dependency order
taskRepository.deleteAll();
historyRepository.deleteAll();
allowanceRepository.deleteAll();
userRepository.deleteAll();
@Transactional
public void importData(MigrationDto data) {
// Delete in dependency order
taskRepository.deleteAll();
historyRepository.deleteAll();
allowanceRepository.deleteAll();
userRepository.deleteAll();
// Insert users with original IDs using native SQL to bypass auto-increment
for (MigrationDto.MigrationUserDto u : data.users())
{
entityManager.createNativeQuery(
"INSERT INTO users (id, name, balance, weight) VALUES (:id, :name, :balance, :weight)")
.setParameter("id", u.id())
.setParameter("name", u.name())
.setParameter("balance", u.balance())
.setParameter("weight", u.weight())
.executeUpdate();
}
// Insert users with original IDs using native SQL to bypass auto-increment
for (MigrationDto.MigrationUserDto u : data.users()) {
entityManager.createNativeQuery(
"INSERT INTO users (id, name, balance, weight) VALUES (:id, :name, :balance, :weight)")
.setParameter("id", u.id())
.setParameter("name", u.name())
.setParameter("balance", u.balance())
.setParameter("weight", u.weight())
.executeUpdate();
}
// Insert allowances with original IDs
for (MigrationDto.MigrationAllowanceDto a : data.allowances())
{
entityManager.createNativeQuery(
"INSERT INTO allowances (id, user_id, name, target, balance, weight, colour) VALUES (:id, :userId, :name, :target, :balance, :weight, :colour)")
.setParameter("id", a.id())
.setParameter("userId", a.userId())
.setParameter("name", a.name())
.setParameter("target", a.target())
.setParameter("balance", a.balance())
.setParameter("weight", a.weight())
.setParameter("colour", a.colour())
.executeUpdate();
}
// Insert allowances with original IDs
for (MigrationDto.MigrationAllowanceDto a : data.allowances()) {
entityManager.createNativeQuery(
"INSERT INTO allowances (id, user_id, name, target, balance, weight, colour) VALUES (:id, :userId, :name, :target, :balance, :weight, :colour)")
.setParameter("id", a.id())
.setParameter("userId", a.userId())
.setParameter("name", a.name())
.setParameter("target", a.target())
.setParameter("balance", a.balance())
.setParameter("weight", a.weight())
.setParameter("colour", a.colour())
.executeUpdate();
}
// Insert history with original IDs
for (MigrationDto.MigrationHistoryDto h : data.history())
{
entityManager.createNativeQuery(
"INSERT INTO history (id, user_id, timestamp, amount, description) VALUES (:id, :userId, :timestamp, :amount, :description)")
.setParameter("id", h.id())
.setParameter("userId", h.userId())
.setParameter("timestamp", h.timestamp())
.setParameter("amount", h.amount())
.setParameter("description", h.description())
.executeUpdate();
}
// Insert history with original IDs
for (MigrationDto.MigrationHistoryDto h : data.history()) {
entityManager.createNativeQuery(
"INSERT INTO history (id, user_id, timestamp, amount, description) VALUES (:id, :userId, :timestamp, :amount, :description)")
.setParameter("id", h.id())
.setParameter("userId", h.userId())
.setParameter("timestamp", h.timestamp())
.setParameter("amount", h.amount())
.setParameter("description", h.description())
.executeUpdate();
}
// Insert tasks with original IDs
for (MigrationDto.MigrationTaskDto t : data.tasks())
{
entityManager.createNativeQuery(
"INSERT INTO tasks (id, name, reward, assigned, schedule, completed, next_run) VALUES (:id, :name, :reward, :assigned, :schedule, :completed, :nextRun)")
.setParameter("id", t.id())
.setParameter("name", t.name())
.setParameter("reward", t.reward())
.setParameter("assigned", t.assigned())
.setParameter("schedule", t.schedule())
.setParameter("completed", t.completed())
.setParameter("nextRun", t.nextRun())
.executeUpdate();
}
// Insert tasks with original IDs
for (MigrationDto.MigrationTaskDto t : data.tasks()) {
entityManager.createNativeQuery(
"INSERT INTO tasks (id, name, reward, assigned, schedule, completed, next_run) VALUES (:id, :name, :reward, :assigned, :schedule, :completed, :nextRun)")
.setParameter("id", t.id())
.setParameter("name", t.name())
.setParameter("reward", t.reward())
.setParameter("assigned", t.assigned())
.setParameter("schedule", t.schedule())
.setParameter("completed", t.completed())
.setParameter("nextRun", t.nextRun())
.executeUpdate();
}
// Reset sequences so new inserts don't collide with migrated IDs
entityManager.createNativeQuery("SELECT setval('users_id_seq', COALESCE((SELECT MAX(id) FROM users), 0))").getSingleResult();
entityManager.createNativeQuery("SELECT setval('allowances_id_seq', COALESCE((SELECT MAX(id) FROM allowances), 0))").getSingleResult();
entityManager.createNativeQuery("SELECT setval('history_id_seq', COALESCE((SELECT MAX(id) FROM history), 0))").getSingleResult();
entityManager.createNativeQuery("SELECT setval('tasks_id_seq', COALESCE((SELECT MAX(id) FROM tasks), 0))").getSingleResult();
}
// Reset sequences so new inserts don't collide with migrated IDs
entityManager.createNativeQuery("SELECT setval('users_id_seq', COALESCE((SELECT MAX(id) FROM users), 0))").getSingleResult();
entityManager.createNativeQuery("SELECT setval('allowances_id_seq', COALESCE((SELECT MAX(id) FROM allowances), 0))").getSingleResult();
entityManager.createNativeQuery("SELECT setval('history_id_seq', COALESCE((SELECT MAX(id) FROM history), 0))").getSingleResult();
entityManager.createNativeQuery("SELECT setval('tasks_id_seq', COALESCE((SELECT MAX(id) FROM tasks), 0))").getSingleResult();
}
}

190
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/service/TaskService.java
View File

@@ -1,6 +1,7 @@
package be.seeseepuff.allowanceplanner.service;
import be.seeseepuff.allowanceplanner.dto.*;
import be.seeseepuff.allowanceplanner.dto.CreateTaskRequest;
import be.seeseepuff.allowanceplanner.dto.TaskDto;
import be.seeseepuff.allowanceplanner.entity.History;
import be.seeseepuff.allowanceplanner.entity.Task;
import be.seeseepuff.allowanceplanner.entity.User;
@@ -15,118 +16,105 @@ import java.util.List;
import java.util.Optional;
@Service
public class TaskService
{
private final TaskRepository taskRepository;
private final UserRepository userRepository;
private final HistoryRepository historyRepository;
private final AllowanceService allowanceService;
public class TaskService {
private final TaskRepository taskRepository;
private final UserRepository userRepository;
private final HistoryRepository historyRepository;
private final AllowanceService allowanceService;
public TaskService(TaskRepository taskRepository,
UserRepository userRepository,
HistoryRepository historyRepository,
AllowanceService allowanceService)
{
this.taskRepository = taskRepository;
this.userRepository = userRepository;
this.historyRepository = historyRepository;
this.allowanceService = allowanceService;
}
public TaskService(TaskRepository taskRepository,
UserRepository userRepository,
HistoryRepository historyRepository,
AllowanceService allowanceService) {
this.taskRepository = taskRepository;
this.userRepository = userRepository;
this.historyRepository = historyRepository;
this.allowanceService = allowanceService;
}
@Transactional
public int createTask(CreateTaskRequest request)
{
Task task = new Task();
task.setName(request.name());
task.setReward(Math.round((request.reward() != null ? request.reward() : 0.0) * 100.0));
task.setAssigned(request.assigned());
task = taskRepository.save(task);
return task.getId();
}
@Transactional
public int createTask(CreateTaskRequest request) {
Task task = new Task();
task.setName(request.name());
task.setReward(Math.round((request.reward() != null ? request.reward() : 0.0) * 100.0));
task.setAssigned(request.assigned());
task = taskRepository.save(task);
return task.getId();
}
public List<TaskDto> getTasks()
{
return taskRepository.findByCompletedIsNull().stream()
.map(this::toDto)
.toList();
}
public List<TaskDto> getTasks() {
return taskRepository.findByCompletedIsNull().stream()
.map(this::toDto)
.toList();
}
public Optional<TaskDto> getTask(int taskId)
{
return taskRepository.findByIdAndCompletedIsNull(taskId)
.map(this::toDto);
}
public Optional<TaskDto> getTask(int taskId) {
return taskRepository.findByIdAndCompletedIsNull(taskId)
.map(this::toDto);
}
@Transactional
public boolean updateTask(int taskId, CreateTaskRequest request)
{
Optional<Task> opt = taskRepository.findByIdAndCompletedIsNull(taskId);
if (opt.isEmpty())
{
return false;
}
Task task = opt.get();
task.setName(request.name());
task.setReward(Math.round((request.reward() != null ? request.reward() : 0.0) * 100.0));
task.setAssigned(request.assigned());
taskRepository.save(task);
return true;
}
@Transactional
public boolean updateTask(int taskId, CreateTaskRequest request) {
Optional<Task> opt = taskRepository.findByIdAndCompletedIsNull(taskId);
if (opt.isEmpty()) {
return false;
}
Task task = opt.get();
task.setName(request.name());
task.setReward(Math.round((request.reward() != null ? request.reward() : 0.0) * 100.0));
task.setAssigned(request.assigned());
taskRepository.save(task);
return true;
}
public boolean hasTask(int taskId)
{
return taskRepository.existsById(taskId);
}
public boolean hasTask(int taskId) {
return taskRepository.existsById(taskId);
}
@Transactional
public void deleteTask(int taskId)
{
taskRepository.deleteById(taskId);
}
@Transactional
public void deleteTask(int taskId) {
taskRepository.deleteById(taskId);
}
@Transactional
public boolean completeTask(int taskId)
{
Optional<Task> opt = taskRepository.findById(taskId);
if (opt.isEmpty())
{
return false;
}
@Transactional
public boolean completeTask(int taskId) {
Optional<Task> opt = taskRepository.findById(taskId);
if (opt.isEmpty()) {
return false;
}
Task task = opt.get();
long reward = task.getReward();
String rewardName = task.getName();
Task task = opt.get();
long reward = task.getReward();
String rewardName = task.getName();
// Give reward to all users
List<User> users = userRepository.findAll();
for (User user : users)
{
// Add history entry
History history = new History();
history.setUserId(user.getId());
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(reward);
history.setDescription("Task completed: " + rewardName);
historyRepository.save(history);
// Give reward to all users
List<User> users = userRepository.findAll();
for (User user : users) {
// Add history entry
History history = new History();
history.setUserId(user.getId());
history.setTimestamp(Instant.now().getEpochSecond());
history.setAmount(reward);
history.setDescription("Task completed: " + rewardName);
historyRepository.save(history);
// Distribute reward
allowanceService.addDistributedReward(user.getId(), (int) reward);
}
// Distribute reward
allowanceService.addDistributedReward(user.getId(), (int) reward);
}
// Mark task as completed
task.setCompleted(Instant.now().getEpochSecond());
taskRepository.save(task);
// Mark task as completed
task.setCompleted(Instant.now().getEpochSecond());
taskRepository.save(task);
return true;
}
return true;
}
private TaskDto toDto(Task t)
{
return new TaskDto(
t.getId(),
t.getName(),
t.getReward() / 100.0,
t.getAssigned(),
t.getSchedule());
}
private TaskDto toDto(Task t) {
return new TaskDto(
t.getId(),
t.getName(),
t.getReward() / 100.0,
t.getAssigned(),
t.getSchedule());
}
}

132
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/service/TransferService.java
View File

@@ -9,94 +9,78 @@ import org.springframework.transaction.annotation.Transactional;
import java.util.Optional;
@Service
public class TransferService
{
private final AllowanceRepository allowanceRepository;
public class TransferService {
private final AllowanceRepository allowanceRepository;
public TransferService(AllowanceRepository allowanceRepository)
{
this.allowanceRepository = allowanceRepository;
}
public TransferService(AllowanceRepository allowanceRepository) {
this.allowanceRepository = allowanceRepository;
}
@Transactional
public TransferResult transfer(TransferRequest request)
{
if (request.from() == request.to())
{
return TransferResult.success();
}
@Transactional
public TransferResult transfer(TransferRequest request) {
if (request.from() == request.to()) {
return TransferResult.success();
}
int amountCents = (int) Math.round(request.amount() * 100.0);
if (amountCents <= 0)
{
return TransferResult.badRequest("amount must be positive");
}
int amountCents = (int) Math.round(request.amount() * 100.0);
if (amountCents <= 0) {
return TransferResult.badRequest("amount must be positive");
}
Optional<Allowance> fromOpt = allowanceRepository.findById(request.from());
if (fromOpt.isEmpty())
{
return TransferResult.notFound();
}
Optional<Allowance> fromOpt = allowanceRepository.findById(request.from());
if (fromOpt.isEmpty()) {
return TransferResult.notFound();
}
Optional<Allowance> toOpt = allowanceRepository.findById(request.to());
if (toOpt.isEmpty())
{
return TransferResult.notFound();
}
Optional<Allowance> toOpt = allowanceRepository.findById(request.to());
if (toOpt.isEmpty()) {
return TransferResult.notFound();
}
Allowance from = fromOpt.get();
Allowance to = toOpt.get();
Allowance from = fromOpt.get();
Allowance to = toOpt.get();
if (from.getUserId() != to.getUserId())
{
return TransferResult.badRequest("Allowances do not belong to the same user");
}
if (from.getUserId() != to.getUserId()) {
return TransferResult.badRequest("Allowances do not belong to the same user");
}
long remainingTo = to.getTarget() - to.getBalance();
if (remainingTo <= 0)
{
return TransferResult.badRequest("target already reached");
}
long remainingTo = to.getTarget() - to.getBalance();
if (remainingTo <= 0) {
return TransferResult.badRequest("target already reached");
}
int transfer = amountCents;
if (transfer > remainingTo)
{
transfer = (int) remainingTo;
}
int transfer = amountCents;
if (transfer > remainingTo) {
transfer = (int) remainingTo;
}
if (from.getBalance() < transfer)
{
return TransferResult.badRequest("Insufficient funds in source allowance");
}
if (from.getBalance() < transfer) {
return TransferResult.badRequest("Insufficient funds in source allowance");
}
from.setBalance(from.getBalance() - transfer);
to.setBalance(to.getBalance() + transfer);
allowanceRepository.save(from);
allowanceRepository.save(to);
from.setBalance(from.getBalance() - transfer);
to.setBalance(to.getBalance() + transfer);
allowanceRepository.save(from);
allowanceRepository.save(to);
return TransferResult.success();
}
return TransferResult.success();
}
public record TransferResult(Status status, String message)
{
public enum Status
{
SUCCESS, BAD_REQUEST, NOT_FOUND
}
public record TransferResult(Status status, String message) {
public static TransferResult success() {
return new TransferResult(Status.SUCCESS, "Transfer successful");
}
public static TransferResult success()
{
return new TransferResult(Status.SUCCESS, "Transfer successful");
}
public static TransferResult badRequest(String message) {
return new TransferResult(Status.BAD_REQUEST, message);
}
public static TransferResult badRequest(String message)
{
return new TransferResult(Status.BAD_REQUEST, message);
}
public static TransferResult notFound() {
return new TransferResult(Status.NOT_FOUND, "Allowance not found");
}
public static TransferResult notFound()
{
return new TransferResult(Status.NOT_FOUND, "Allowance not found");
}
}
public enum Status {
SUCCESS, BAD_REQUEST, NOT_FOUND
}
}
}

51
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/service/UserService.java
View File

@@ -1,7 +1,7 @@
package be.seeseepuff.allowanceplanner.service;
import be.seeseepuff.allowanceplanner.dto.*;
import be.seeseepuff.allowanceplanner.entity.User;
import be.seeseepuff.allowanceplanner.dto.UserDto;
import be.seeseepuff.allowanceplanner.dto.UserWithAllowanceDto;
import be.seeseepuff.allowanceplanner.repository.UserRepository;
import org.springframework.stereotype.Service;
@@ -9,34 +9,29 @@ import java.util.List;
import java.util.Optional;
@Service
public class UserService
{
private final UserRepository userRepository;
public class UserService {
private final UserRepository userRepository;
public UserService(UserRepository userRepository)
{
this.userRepository = userRepository;
}
public UserService(UserRepository userRepository) {
this.userRepository = userRepository;
}
public List<UserDto> getUsers()
{
return userRepository.findAll().stream()
.map(u -> new UserDto(u.getId(), u.getName()))
.toList();
}
public List<UserDto> getUsers() {
return userRepository.findAll().stream()
.map(u -> new UserDto(u.getId(), u.getName()))
.toList();
}
public Optional<UserWithAllowanceDto> getUser(int userId)
{
return userRepository.findById(userId)
.map(u ->
{
long totalAmount = userRepository.sumHistoryAmount(userId);
return new UserWithAllowanceDto(u.getId(), u.getName(), totalAmount / 100.0);
});
}
public Optional<UserWithAllowanceDto> getUser(int userId) {
return userRepository.findById(userId)
.map(u ->
{
long totalAmount = userRepository.sumHistoryAmount(userId);
return new UserWithAllowanceDto(u.getId(), u.getName(), totalAmount / 100.0);
});
}
public boolean userExists(int userId)
{
return userRepository.existsById(userId);
}
public boolean userExists(int userId) {
return userRepository.existsById(userId);
}
}

65
backend-spring/src/main/java/be/seeseepuff/allowanceplanner/util/ColourUtil.java
View File

@@ -1,42 +1,33 @@
package be.seeseepuff.allowanceplanner.util;
public class ColourUtil
{
private ColourUtil()
{
}
public class ColourUtil {
private ColourUtil() {
}
public static int convertStringToColour(String colourStr)
{
if (colourStr == null || colourStr.isEmpty())
{
return 0xFF0000; // Default colour
}
if (colourStr.charAt(0) == '#')
{
colourStr = colourStr.substring(1);
}
if (colourStr.length() != 6 && colourStr.length() != 3)
{
throw new IllegalArgumentException("colour must be a valid hex string");
}
int colour = Integer.parseInt(colourStr, 16);
if (colourStr.length() == 3)
{
int r = (colour & 0xF00) >> 8;
int g = (colour & 0x0F0) >> 4;
int b = (colour & 0x00F);
colour = (r << 20) | (g << 12) | (b << 4);
}
return colour;
}
public static int convertStringToColour(String colourStr) {
if (colourStr == null || colourStr.isEmpty()) {
return 0xFF0000; // Default colour
}
if (colourStr.charAt(0) == '#') {
colourStr = colourStr.substring(1);
}
if (colourStr.length() != 6 && colourStr.length() != 3) {
throw new IllegalArgumentException("colour must be a valid hex string");
}
int colour = Integer.parseInt(colourStr, 16);
if (colourStr.length() == 3) {
int r = (colour & 0xF00) >> 8;
int g = (colour & 0x0F0) >> 4;
int b = (colour & 0x00F);
colour = (r << 20) | (g << 12) | (b << 4);
}
return colour;
}
public static String convertColourToString(Integer colour)
{
if (colour == null)
{
return "";
}
return String.format("#%06X", colour);
}
public static String convertColourToString(Integer colour) {
if (colour == null) {
return "";
}
return String.format("#%06X", colour);
}
}

4
backend-spring/src/main/resources/application.properties
View File

@@ -1,12 +1,8 @@
spring.application.name=allowance-planner
spring.datasource.url=jdbc:postgresql://localhost:5432/allowance_planner
spring.datasource.username=postgres
spring.datasource.password=postgres
spring.jpa.hibernate.ddl-auto=validate
spring.jpa.open-in-view=false
spring.flyway.enabled=true
server.port=8080

18
backend-spring/src/main/resources/templates/index.html
View File

@@ -20,8 +20,8 @@
<h2>Users</h2>
<span th:each="user : ${users}">
<strong th:if="${currentUser != null and currentUser == user.id()}" th:text="${user.name()}"></strong>
<a th:unless="${currentUser != null and currentUser == user.id()}"
th:href="@{/login(user=${user.id()})}" th:text="${user.name()}"></a>
<a th:href="@{/login(user=${user.id()})}"
th:text="${user.name()}" th:unless="${currentUser != null and currentUser == user.id()}"></a>
</span>
<div th:if="${currentUser != null and currentUser > 0}">
@@ -39,10 +39,10 @@
</thead>
<tbody>
<tr>
<td><label><input type="text" name="name" placeholder="Name"/></label></td>
<td><label><input name="name" placeholder="Name" type="text"/></label></td>
<td></td>
<td><label><input type="number" name="target" placeholder="Target"/></label></td>
<td><label><input type="number" name="weight" placeholder="Weight"/></label></td>
<td><label><input name="target" placeholder="Target" type="number"/></label></td>
<td><label><input name="weight" placeholder="Weight" type="number"/></label></td>
<td><input type="submit" value="Create"/></td>
</tr>
<tr th:each="allowance : ${allowances}">
@@ -66,7 +66,7 @@
</form>
<h2>Tasks</h2>
<form method="post" action="/createTask">
<form action="/createTask" method="post">
<table border="1">
<thead>
<tr>
@@ -91,10 +91,10 @@
</td>
</tr>
<tr>
<td><label><input type="text" name="name" placeholder="Name"/></label></td>
<td><label><input name="name" placeholder="Name" type="text"/></label></td>
<td></td>
<td><label><input type="number" name="reward" placeholder="Reward"/></label></td>
<td><label><input type="text" name="schedule" placeholder="Schedule"/></label></td>
<td><label><input name="reward" placeholder="Reward" type="number"/></label></td>
<td><label><input name="schedule" placeholder="Schedule" type="text"/></label></td>
<td><input type="submit" value="Create"/></td>
</tr>
</tbody>

2373
backend-spring/src/test/java/be/seeseepuff/allowanceplanner/ApiTest.java
View File

File diff suppressed because it is too large Load Diff

39
backend-spring/src/test/java/be/seeseepuff/allowanceplanner/ColourUtilTest.java
View File

@@ -5,29 +5,24 @@ import org.junit.jupiter.api.Test;
import static org.junit.jupiter.api.Assertions.assertEquals;
class ColourUtilTest
{
@Test
void convertStringToColourWithSign()
{
assertEquals(0x123456, ColourUtil.convertStringToColour("#123456"));
}
class ColourUtilTest {
@Test
void convertStringToColourWithSign() {
assertEquals(0x123456, ColourUtil.convertStringToColour("#123456"));
}
@Test
void convertStringToColourWithoutSign()
{
assertEquals(0x123456, ColourUtil.convertStringToColour("123456"));
}
@Test
void convertStringToColourWithoutSign() {
assertEquals(0x123456, ColourUtil.convertStringToColour("123456"));
}
@Test
void convertStringToColourWithSignThreeDigits()
{
assertEquals(0xA0B0C0, ColourUtil.convertStringToColour("#ABC"));
}
@Test
void convertStringToColourWithSignThreeDigits() {
assertEquals(0xA0B0C0, ColourUtil.convertStringToColour("#ABC"));
}
@Test
void convertStringToColourWithoutSignThreeDigits()
{
assertEquals(0xA0B0C0, ColourUtil.convertStringToColour("ABC"));
}
@Test
void convertStringToColourWithoutSignThreeDigits() {
assertEquals(0xA0B0C0, ColourUtil.convertStringToColour("ABC"));
}
}