Merge branch 'master' into 'feat/endpoint-badges'

...u/idi/stud/savingsapp/controller/item/ItemController.java

...ingsapp/controller/leaderboard/LeaderboardController.java

...a/no/ntnu/idi/stud/savingsapp/dto/store/InventoryDTO.java

...n/java/no/ntnu/idi/stud/savingsapp/dto/store/ItemDTO.java

...va/no/ntnu/idi/stud/savingsapp/model/store/Inventory.java

.../no/ntnu/idi/stud/savingsapp/model/store/InventoryId.java

...in/java/no/ntnu/idi/stud/savingsapp/model/store/Item.java

...ain/java/no/ntnu/idi/stud/savingsapp/model/user/User.java

...u/idi/stud/savingsapp/repository/InventoryRepository.java

.../ntnu/idi/stud/savingsapp/repository/StoreRepository.java

...o/ntnu/idi/stud/savingsapp/repository/UserRepository.java

...java/no/ntnu/idi/stud/savingsapp/service/ItemService.java

.../ntnu/idi/stud/savingsapp/service/LeaderboardService.java

...java/no/ntnu/idi/stud/savingsapp/service/UserService.java

...tnu/idi/stud/savingsapp/service/impl/ItemServiceImpl.java

.../stud/savingsapp/service/impl/LeaderboardServiceImpl.java

...tnu/idi/stud/savingsapp/service/impl/UserServiceImpl.java

src/main/resources/data-test.sql

...i/stud/savingsapp/controller/item/ItemControllerTest.java

...app/controller/leaderboard/LeaderboardControllerTest.java