Mei Chang van der Werff
30635b4a21
added tests to configTest class to improve coverage
2026-01-10 20:01:06 +01:00
Mei Chang van der Werff
78fdb64bdf
added test to improve coverage
2026-01-10 19:50:31 +01:00
Mei Chang van der Werff
c83d80bb74
Removed the server dependancy, so they aren't skipped
2026-01-10 19:17:07 +01:00
Mei Chang van der Werff
973ccfc50e
LOC maxxing
2026-01-09 23:59:17 +01:00
Mei Chang van der Werff
9479aa27b3
refactor:declaring in contructor looks nicer
2026-01-09 23:49:40 +01:00
Mei Chang van der Werff
a95c5ac7d0
made tests that work in gitlab, without being skipped
2026-01-09 23:44:43 +01:00
07adedde3e
Merge branch 'feature/server_search_bar' into 'main'
...
Added backend server search functionality with unit tests
Closes #33
See merge request cse1105/2025-2026/teams/csep-team-76!33
2026-01-09 16:35:02 +01:00
Mei Chang van der Werff
ec5881790d
updated Provisionary tasks for agenda-7.md
2026-01-09 15:38:47 +01:00
95213519a3
chore(gitignore): add trace.db and config.json to ignore-list
2026-01-09 15:11:58 +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
Aysegul Aydinlik
809457254d
Merge branch 'CountringRecipeIngredients' into 'main'
...
added counting ingredients to serverside requirment of 4.3
Closes #51
See merge request cse1105/2025-2026/teams/csep-team-76!43
2026-01-09 12:24:04 +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
Mei Chang van der Werff
de8bdd60db
add agenda for week 7
2026-01-08 19:20:10 +01:00
Oskar Rasieński
6010208e33
Merge branch 'refactor/server-refactor' into 'main'
...
refactor/server
Closes #44
See merge request cse1105/2025-2026/teams/csep-team-76!41
2026-01-08 02:38:00 +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
032b86e502
created getters for Ingredient
2026-01-07 23:46:57 +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
b01d313c9a
Merge branch 'client/incremental-websocket-modelling' into 'main'
...
fix(client/ws): Detailed WebSocket modelling
Closes #31
See merge request cse1105/2025-2026/teams/csep-team-76!39
2026-01-07 11:35:31 +01:00
ef65f33b64
chore(client): use lambda arg
2026-01-06 21:45:29 +01:00
ed87f1c09f
fix(client/print): remove obsolete code & +notimplexception
2026-01-06 21:41:01 +01:00
0cc767d577
fix(client/main): fixed FIXME(1) edit box rendering
2026-01-06 21:36:40 +01:00
9f892e8fb1
refactor(client/ws): divorce WS data handler from the class constructor
2026-01-06 21:32:07 +01:00
ae05675e27
Merge branch 'client/fix-idea-debugging' into 'main'
...
Fix JavaFX dependencies not working in IDEA Run/Debug configuration
See merge request cse1105/2025-2026/teams/csep-team-76!40
2026-01-06 18:25:23 +01:00
6d56e684a3
fix(client): separate Main and UI for IDEA debugger to work
...
Reference: https://www.reddit.com/r/JavaFX/wiki/common-problems/#wiki_how_do_i_fix_.27error.3A_javafx_runtime_components_are_missing.27.3F
2026-01-06 18:10:51 +01:00
5de11428a8
chore(client): cleanup
2026-01-06 18:07:09 +01:00
042a43e06a
feat(client/ws): integrate changes from main and create client-side WS service
2026-01-06 18:06:40 +01:00
9f67800372
Merge branch 'commons/recipe-model-v2' into 'main'
...
refactor: New recipe & ingredients model to work with (in)formal quantities
Closes #43
See merge request cse1105/2025-2026/teams/csep-team-76!38
2026-01-05 17:38:23 +01:00
253da0b5bc
chore(test/printExport): delegate creation to DefaultValueFactory
2026-01-05 17:24:29 +01:00
39b2bb9d61
fix(commons/scaling): delegate scaleBy(int) to scaleBy(double) impl
2026-01-05 17:24:29 +01:00
b60284fa14
fix(client/serverUtils): immigrate nulling IDs to addRecipe(Recipe)
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
33a542672f
fix(test/client): implement pipeline testing skip in teardown function
2026-01-05 17:24:29 +01:00
88ef77d858
refactor(test/server): refactor server-side testing
2026-01-05 17:24:29 +01:00
c0add049be
refactor(test/client): refactor client-side tests
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
