23447a96d6
feat(commons/recipe): introduce weight sum calculations
2026-01-22 14:52:32 +01:00
b7bbebe222
feat(client/scaling): initial implementation
2026-01-22 14:51:03 +01:00
47d8aa7721
fix: got it
2026-01-21 16:12:00 +01:00
3a0120dc33
fix: getting to it
2026-01-21 15:53:58 +01:00
8422734a3f
feat(commons/kcal): kcal eval infrastructure
2026-01-21 14:47:46 +01:00
54db9bddff
feat(client/scaling): initial implementation
2026-01-19 15:32:30 +01:00
Oskar Rasieński
caeacf86e0
Made Delete msg take Recipe instead of id and made alert for recipe mourning.
2026-01-16 19:13:35 +01:00
9f7f32beff
fix(commons/ingredient): add missing setters
2026-01-15 17:15:05 +01:00
Oskar Rasieński
e4fd15b120
fixed weird spacing
2026-01-14 19:36:27 +01:00
Oskar Rasieński
da0c401168
wiremock dependency
2026-01-14 19:06:26 +01:00
Oskar Rasieński
9008bdd026
Ingredient Constructors for testing
2026-01-14 19:06:09 +01:00
Oskar Rasieński
d37d95f1d4
fixed ingredient test
2026-01-14 18:45:27 +01:00
Oskar Rasieński
f048e0fe3e
Fixed error when adding ingredient
2026-01-14 18:39:14 +01:00
Aysegul Aydinlik
3c33f2ff35
Merge branch 'idkwhattonameitanymore' into 'main'
...
added pop up view ingredients + warnings for delete
Closes #53 and #55
See merge request cse1105/2025-2026/teams/csep-team-76!48
2026-01-09 22:47:54 +01:00
Aysegul
9aae8f918f
added pop up view ingredients + warnings for delete
2026-01-09 21:42:57 +01:00
Natalia Cholewa
74b6f25e24
feat: language in recipes
2026-01-09 14:54:42 +01:00
1c9ffb9d13
Merge branch 'etc/logging' into 'main'
...
Logging for flow of the data exchange between client/server
Closes #37
See merge request cse1105/2025-2026/teams/csep-team-76!42
2026-01-09 12:24:20 +01:00
41353f2252
Logging for flow of the data exchange between client/server
2026-01-09 12:24:18 +01:00
Aysegul
16c8d4c6dc
fixed todo delete progatation in recipe
...
added count to IngredientController about what recipes we have or dont and 2 small typo mistakes
also added counting ingredients to IngredientService
2026-01-08 22:06:45 +01:00
Oskar Rasieński
032b86e502
created getters for Ingredient
2026-01-07 23:46:57 +01:00
39b2bb9d61
fix(commons/scaling): delegate scaleBy(int) to scaleBy(double) impl
2026-01-05 17:24:29 +01:00
7bb2b06679
fix(test/unit): fix tests for cup(s)
2026-01-05 17:24:29 +01:00
62bd134084
feat(unit): kindly make some cup(s)
2026-01-05 17:24:29 +01:00
73c42303c4
refactor(test/commons): refactor tests for commons models
2026-01-05 17:24:29 +01:00
554d769305
chore(commons): implement missing equals/hashcode
2026-01-05 17:24:29 +01:00
2d1df8fc11
feat(commons): create new Scalable<T extends RecipeIngredient> interface
...
Scalable<T extends Recipe> supplies two scaleBy() functions that
implementors should create. This allows for custom handling if more
types of ingredients are handled in the future.
2026-01-05 17:24:29 +01:00
88a85f2e04
refactor: revised class layout for JPA entities
2026-01-05 17:24:29 +01:00
Mei Chang van der Werff
c56344d88a
Merge branch 'RecipeIngredientTest' into 'main'
...
Made tests for the RecipeIngredient class
Closes #20
See merge request cse1105/2025-2026/teams/csep-team-76!29
2025-12-19 22:34:41 +01:00
Aysegul Aydinlik
c07bae8d74
Merge branch 'favouriteMessage' into 'main'
...
Created a message for favourite Recipe
Closes #23
See merge request cse1105/2025-2026/teams/csep-team-76!30
2025-12-19 18:30:35 +01:00
Mei Chang van der Werff
b0272fd276
Merge branch 'removeExampleCode' into 'main'
...
Removed all left over example code
Closes #27
See merge request cse1105/2025-2026/teams/csep-team-76!28
2025-12-19 00:48:19 +01:00
Oskar Rasieński
60efdc3a78
Merge branch 'feature/ws-client' into 'main'
...
Feature/ws-client
See merge request cse1105/2025-2026/teams/csep-team-76!25
2025-12-18 18:15:01 +01:00
Mei Chang van der Werff
3e47fdbb96
big Long instead of small long
2025-12-18 14:36:04 +01:00
Mei Chang van der Werff
b553cee6fd
fix checkstyle error
2025-12-18 04:27:04 +01:00
Mei Chang van der Werff
6794efa3a6
tested all units conversion and made every unit type a field
2025-12-18 04:25:42 +01:00
Mei Chang van der Werff
a45f31abed
Removed all left over example code
2025-12-18 03:44:01 +01:00
Mei Chang van der Werff
fef20ec876
refactor to setters TODO, ingredientController
2025-12-18 03:35:47 +01:00
Mei Chang van der Werff
a5ec17e486
created FavouriteRecipeMessage class
2025-12-18 03:25:12 +01:00
Mei Chang van der Werff
4a902ead20
ConvertToBaseUnit test + code fix
2025-12-18 03:20:03 +01:00
Mei Chang van der Werff
87f8a883d5
getUnit() tests
2025-12-18 03:20:03 +01:00
Oskar Rasieński
3da89c386b
Created utils for websockets.
2025-12-17 16:26:27 +01:00
Oskar Rasieński
e41dc70f97
Modified Message and its subclasses to work nicely with jackson
2025-12-17 16:19:33 +01:00
Mei Chang van der Werff
a83885745c
make the Unit Class enums
2025-12-17 15:35:14 +01:00
Oskar Rasieński
0dca957e43
Fixed bug and improved debug print
2025-12-17 13:32:14 +01:00
Natalia Cholewa
3af808ef58
feat: ingredient controller, websocket messages, ingredient controller tests
2025-12-05 14:38:43 +01:00
Natalia Cholewa
433f289c55
Merge branch 'feature/backend-websockets' into 'main'
...
Backend websockets
See merge request cse1105/2025-2026/teams/csep-team-76!16
2025-12-05 10:47:32 +01:00
Aysegul Aydinlik
1c9ff190ea
backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskarsss problems
2025-12-05 00:30:12 +01:00
Aysegul Aydinlik
f9262d4046
backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskars problems
2025-12-05 00:12:53 +01:00
Natalia Cholewa
8e24e47813
feat: topics, recipe messages
2025-12-04 22:52:14 +01:00
Aysegul Aydinlik
78e7f90024
backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS
2025-12-04 15:41:43 +01:00
Aysegul Aydinlik
88dc43613f
backend stuff for ingredients and nutritions
2025-12-04 14:41:45 +01:00
