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
Natalia Cholewa
2224fe1f51
Merge branch 'feature/server-recipe-i18n' into 'main'
...
Server-side recipe internationalization
See merge request cse1105/2025-2026/teams/csep-team-76!47
2026-01-09 22:28:31 +01:00
Aysegul
fe4d3ff2d6
added pop up view ingredients + warnings for delete removed the star import should also fix the test issue
2026-01-09 22:16:30 +01:00
Aysegul
bab9046682
added pop up view ingredients + warnings for delete removed the star import
2026-01-09 21:50:30 +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
Rithvik Sriram
caa78515cf
Merge branch 'main' into 'feature/server_search_bar'
...
# Conflicts:
# server/src/main/java/server/api/RecipeController.java
2026-01-09 13:49:51 +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
Rithvik Sriram
2d13a2b7af
rebased branches and fixed bugs
2026-01-08 23:19:50 +01:00
Rithvik Sriram
4dc44fb6e9
Implemented Optional fields and rewrote tests
2026-01-08 22:46:03 +01:00
Rithvik Sriram
01ff1a96a9
added comments
2026-01-08 22:45:36 +01:00
Rithvik Sriram
eb5aedbe91
added backend server search functionality with unit tests
...
# Conflicts:
# server/src/test/java/server/api/RecipeControllerTest.java
2026-01-08 22:45:27 +01:00
Aysegul
79e7b01363
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
the pipeline failure is bc i forgot tests exist
2026-01-08 22:20:54 +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
64dd5e4a28
Changed SomeController to be a health check
2026-01-08 01:49:21 +01:00
Oskar Rasieński
04f58c22cc
Refactored IngredientController to use services.
2026-01-08 01:43:56 +01:00
Oskar Rasieński
707f88b70b
Fixed ordering in ingredient service.
2026-01-08 01:43:18 +01:00
Oskar Rasieński
e9b6d81a27
Refactored recipe controller to use services
2026-01-08 01:05:36 +01:00
Oskar Rasieński
0050671944
Moved services
2026-01-08 01:04:05 +01:00
Oskar Rasieński
b7116a0882
Created IngredientService
2026-01-07 23:49:42 +01:00
Oskar Rasieński
d56b07f2aa
comment and access fixes for RecipeService
2026-01-07 23:46:40 +01:00
Oskar Rasieński
299385c7b1
Created recipe service.
2026-01-07 23:23:20 +01:00
88ef77d858
refactor(test/server): refactor server-side testing
2026-01-05 17:24:29 +01:00
d497ed108e
fix(server): fix duplicate Ingredient present in each recipe
...
An issue where multiple instances of a uniquely named Ingredient are
stored in the database. This is patched by checking server-side whether
an ingredient exists before persisting it. This now correctly implements
the Many-to-Many reference.
2026-01-05 17:24:29 +01:00
04a999147c
refactor(server): server-side integration of new recipe modelling
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
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
ea840f032e
chore: add periods to all sentences.
2025-12-07 21:17:49 +01:00
Natalia Cholewa
566a46178f
chore: remove unnecessary dependency
2025-12-05 20:39:32 +01:00
Natalia Cholewa
6d5f7af225
fix: the 26 checkstyle violations in tests (Thank you checkstyle)
2025-12-05 14:47:30 +01:00
Natalia Cholewa
6b659a2ced
fix: formatting in ingredient controller
2025-12-05 14:40:12 +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
Natalia Cholewa
e85a43725d
fix: checkstyle violations
2025-12-04 23:08:10 +01:00
Natalia Cholewa
25fdbcf49e
fix: testing with websocket connection
2025-12-04 23:03:52 +01:00
Natalia Cholewa
8e24e47813
feat: topics, recipe messages
2025-12-04 22:52:14 +01:00
Aysegul Aydinlik
88dc43613f
backend stuff for ingredients and nutritions
2025-12-04 14:41:45 +01:00
ee16265cb8
feat: message broadcast endpoint mapping
2025-11-27 14:59:46 +01:00
fcc7cfd9ac
feat: message broadcast endpoint mapping
2025-11-27 14:58:56 +01:00
dcb76612d5
feat: websocket config endpoints
2025-11-27 14:57:22 +01:00
ba3775f42b
feat: add WS dependency
2025-11-27 14:57:22 +01:00
1e9bd169d0
test: improve unit test clarity
2025-11-27 14:39:09 +01:00
a1fbea1585
test: add unit tests for RecipeController
...
Covers 6/6 methods in controller
Also added test configuration in application-mock-data-test.properties
2025-11-27 14:39:09 +01:00
17f4b8bba4
fix: correct deletion method implementation
...
reference: https://stackoverflow.com/questions/75912878/could-not-write-json-failed-to-lazily-initialize-a-collection-when-returning-an
2025-11-27 14:39:09 +01:00
f62e836692
fix: createRecipe checks name is unique
...
Uses JPA Repository.exists(Example<T>); Changed no-arg constuctor of
Recipe to public.
2025-11-27 14:39:09 +01:00
0a9251df67
fix: recipe api now under /api
2025-11-27 14:39:09 +01:00
4e23d913d1
feat: RecipeController with GET, POST, PUT, DELETE
...
TODO: WebSockets updates should be propagated after POST/PUT/DELETE operations
2025-11-27 14:39:09 +01:00
