Skip to content

GitLab

Explore

Sign in

Primary navigation

Project

B

backend
- Activity
- Members
- Wiki
- Terraform modules

Snippets Groups Projects

4692f53f

Commit 4692f53f authored 1 year ago by Stian Lyng Stræte

Downloads
- Plain Diff

Merge branch 'feature/213-fix-weeklymenu' into 'main'

Feature/213 fix weeklymenu

See merge request idatt2106-v23-03/backend!156

parents 1af3ab55 5d9d235f

No related branches found

No related tags found

No related merge requests found

Changes 6

Hide whitespace changes

Inline Side-by-side

Showing

src/main/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuController.java 3 additions, 3 deletions

...tt2016/v233/SmartMat/controller/WeeklyMenuController.java
src/main/java/ntnu/idatt2016/v233/SmartMat/dto/response/WeeklyMenuResponse.java 2 additions, 4 deletions

...tt2016/v233/SmartMat/dto/response/WeeklyMenuResponse.java
src/main/java/ntnu/idatt2016/v233/SmartMat/repository/RecipeRepository.java 11 additions, 2 deletions

.../idatt2016/v233/SmartMat/repository/RecipeRepository.java
src/main/java/ntnu/idatt2016/v233/SmartMat/service/WeeklyMenuService.java 7 additions, 20 deletions

...nu/idatt2016/v233/SmartMat/service/WeeklyMenuService.java
src/test/java/ntnu/idatt2016/v233/SmartMat/controller/WeeklyMenuControllerTest.java 15 additions, 5 deletions

...16/v233/SmartMat/controller/WeeklyMenuControllerTest.java
src/test/java/ntnu/idatt2016/v233/SmartMat/service/user/WeeklyMenuServiceTest.java 11 additions, 11 deletions

...016/v233/SmartMat/service/user/WeeklyMenuServiceTest.java

with 49 additions and 45 deletions

Loading

0% Loading or .

You are about to add 0 people to the discussion. Proceed with caution.

Finish editing this message first!

Please register or sign in to comment