# Conflicts:
#	requests.http
#	src/main/java/hdm/mi/growbros/controllers/PlantsController.java
#	src/main/java/hdm/mi/growbros/service/PlantsService.java

# Conflicts:
#	requests.http
#	src/main/java/hdm/mi/growbros/repositories/PlantRepository.java

Resolve "fix / refactor: move UserRepository into repositories package"

Closes #26

See merge request !16

#7 backend of wishList

See merge request !14

#29 Pagination for Plants endpoint w/ CustomPageDTO

See merge request !15

# Conflicts:
#	src/main/java/hdm/mi/growbros/exceptions/PlantNotFoundException.java

#29 introduce custom page dto, add @RequestMapping to PlantsController to simplify mappings on controller methods

#27 Seeding the database with plants data on initial startup.

See merge request !13

#27 seeding data now fixed, command line runner moved to config class to clean up the main application class

#3 merge fully implemented garden branch into main

See merge request !12

# Conflicts:
#   src/main/java/hdm/mi/growbros/service/PlantsService.java

update: WishList #7: check for user before changing wishlist and filter for plants which can be planted in the current week and added requests to requests.http

#3 tests for controller done. @AuthenticationPrincipal is not! injected into controller methods as i could not get it to work. but thats not significant when testing just the web layer. might be a problem when doing full integration tests

#3 fix UserDetailsService bean for tests (rename method to avoid naming conflict, add 2 users & 1 admin). starting tests for GardenController. Added 1 dependency: spring-security-test to mock users in tests

Update CHANGELOG

See merge request !10