Skip to content
Snippets Groups Projects
Commit 8b565bf2 authored by Robert Goldmann's avatar Robert Goldmann
Browse files

cleanup and refactoring

parent 77fd837c
No related branches found
No related tags found
No related merge requests found
...@@ -35,7 +35,6 @@ import java.util.List; ...@@ -35,7 +35,6 @@ import java.util.List;
@Controller @Controller
public class TransactionController extends BaseController public class TransactionController extends BaseController
{ {
private final TransactionRepository transactionRepository;
private final TransactionService transactionService; private final TransactionService transactionService;
private final CategoryRepository categoryRepository; private final CategoryRepository categoryRepository;
private final AccountService accountService; private final AccountService accountService;
...@@ -46,9 +45,8 @@ public class TransactionController extends BaseController ...@@ -46,9 +45,8 @@ public class TransactionController extends BaseController
private final FilterHelpersService filterHelpers; private final FilterHelpersService filterHelpers;
@Autowired @Autowired
public TransactionController(TransactionRepository transactionRepository, TransactionService transactionService, CategoryRepository categoryRepository, AccountService accountService, SettingsRepository settingsRepository, TagRepository tagRepository, RepeatingTransactionUpdater repeatingTransactionUpdater, HelpersService helpers, FilterHelpersService filterHelpers) public TransactionController(TransactionService transactionService, CategoryRepository categoryRepository, AccountService accountService, SettingsRepository settingsRepository, TagRepository tagRepository, RepeatingTransactionUpdater repeatingTransactionUpdater, HelpersService helpers, FilterHelpersService filterHelpers)
{ {
this.transactionRepository = transactionRepository;
this.transactionService = transactionService; this.transactionService = transactionService;
this.categoryRepository = categoryRepository; this.categoryRepository = categoryRepository;
this.accountService = accountService; this.accountService = accountService;
...@@ -81,7 +79,7 @@ public class TransactionController extends BaseController ...@@ -81,7 +79,7 @@ public class TransactionController extends BaseController
DateTime date = helpers.getDateTimeFromCookie(cookieDate); DateTime date = helpers.getDateTimeFromCookie(cookieDate);
prepareModelTransactions(request, model, date); prepareModelTransactions(request, model, date);
model.addAttribute("currentTransaction", transactionRepository.getOne(ID)); model.addAttribute("currentTransaction", transactionService.getRepository().getOne(ID));
return "transactions/transactions"; return "transactions/transactions";
} }
...@@ -245,14 +243,14 @@ public class TransactionController extends BaseController ...@@ -245,14 +243,14 @@ public class TransactionController extends BaseController
return url; return url;
} }
transactionRepository.save(transaction); transactionService.getRepository().save(transaction);
return "redirect:/transactions"; return "redirect:/transactions";
} }
@RequestMapping("/transactions/{ID}/edit") @RequestMapping("/transactions/{ID}/edit")
public String editTransaction(Model model, @CookieValue("currentDate") String cookieDate, @PathVariable("ID") Integer ID) public String editTransaction(Model model, @CookieValue("currentDate") String cookieDate, @PathVariable("ID") Integer ID)
{ {
Transaction transaction = transactionRepository.findOne(ID); Transaction transaction = transactionService.getRepository().findOne(ID);
if(transaction == null) if(transaction == null)
{ {
throw new ResourceNotFoundException(); throw new ResourceNotFoundException();
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment