Merge branch 'issueThirtyNine' into 'develop' (d0838fc3) · Commits · Joshua Gill / ASE_Y2S1_CP_G4

Commit d0838fc3 authored 3 years ago by Joshua Gill

Merge branch 'issueThirtyNine' into 'develop'

Issue complete

See merge request !107

parents 9f349034 3dd72dd1

No related branches found

No related tags found

2 merge requests!114LoggingService service class, new method to add a log to the "Logs" table when...,!107Issue complete

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/com/example/clientproject/data/misc/MiscQueries.java 5 additions, 4 deletions

...java/com/example/clientproject/data/misc/MiscQueries.java
src/main/java/com/example/clientproject/data/misc/MiscQueriesImpl.java 67 additions, 10 deletions

.../com/example/clientproject/data/misc/MiscQueriesImpl.java
src/main/java/com/example/clientproject/service/LoggingService.java 12 additions, 4 deletions

...ava/com/example/clientproject/service/LoggingService.java
src/main/java/com/example/clientproject/services/BusinessRegisterSaver.java 106 additions, 31 deletions

...example/clientproject/services/BusinessRegisterSaver.java
src/main/java/com/example/clientproject/services/DashboardStampLoader.java 6 additions, 3 deletions

.../example/clientproject/services/DashboardStampLoader.java
src/main/java/com/example/clientproject/services/GetStampBoardIdFromRewardId.java 5 additions, 2 deletions

...e/clientproject/services/GetStampBoardIdFromRewardId.java
src/main/java/com/example/clientproject/services/LinkUserShop.java 17 additions, 2 deletions

...java/com/example/clientproject/services/LinkUserShop.java
src/main/java/com/example/clientproject/services/RecommendationGenerator.java 11 additions, 13 deletions

...ample/clientproject/services/RecommendationGenerator.java
src/main/java/com/example/clientproject/services/ShopActiveService.java 18 additions, 4 deletions

...com/example/clientproject/services/ShopActiveService.java
src/main/java/com/example/clientproject/services/ShopDeleter.java 13 additions, 2 deletions

.../java/com/example/clientproject/services/ShopDeleter.java
src/main/java/com/example/clientproject/services/StampboardUpdater.java 60 additions, 20 deletions

...com/example/clientproject/services/StampboardUpdater.java
src/main/java/com/example/clientproject/services/UpdateKeyInfo.java 17 additions, 2 deletions

...ava/com/example/clientproject/services/UpdateKeyInfo.java
src/main/java/com/example/clientproject/services/UserFavouriteDeleter.java 21 additions, 8 deletions

.../example/clientproject/services/UserFavouriteDeleter.java
src/main/java/com/example/clientproject/services/UserFavouriteSaver.java 21 additions, 9 deletions

...om/example/clientproject/services/UserFavouriteSaver.java
src/main/java/com/example/clientproject/services/UserFavouriteTagSaver.java 19 additions, 4 deletions

...example/clientproject/services/UserFavouriteTagSaver.java
src/main/java/com/example/clientproject/services/UserSocialSave.java 51 additions, 8 deletions

...va/com/example/clientproject/services/UserSocialSave.java
src/main/java/com/example/clientproject/services/UserStampBoardService.java 32 additions, 8 deletions

...example/clientproject/services/UserStampBoardService.java
src/main/java/com/example/clientproject/web/controllers/AdminController.java 1 addition, 1 deletion

...xample/clientproject/web/controllers/AdminController.java
src/main/java/com/example/clientproject/web/controllers/SaveUserFavouriteTagController.java 1 addition, 1 deletion

...oject/web/controllers/SaveUserFavouriteTagController.java
src/main/java/com/example/clientproject/web/controllers/userSettingsPage/UserSettingsController.java 10 additions, 5 deletions

.../controllers/userSettingsPage/UserSettingsController.java

with 493 additions and 141 deletions

Please register or to comment