Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
I
idatt2106_2023_11_backend
Manage
Activity
Members
Labels
Plan
Issues
0
Issue boards
Milestones
Wiki
Code
Merge requests
0
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Joakim Falch
idatt2106_2023_11_backend
Merge requests
!48
Resolve "recommended week menu"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "recommended week menu"
50-recommended-week-menu
into
dev
Overview
0
Commits
8
Pipelines
1
Changes
5
Merged
Charlotte Hallan Christiansen
requested to merge
50-recommended-week-menu
into
dev
1 year ago
Overview
0
Commits
8
Pipelines
1
Changes
5
Expand
Closes
#50 (closed)
0
0
Merge request reports
Compare
dev
dev (base)
and
latest version
latest version
a6e1b358
8 commits,
1 year ago
5 files
+
36
−
9
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
5
Search (e.g. *.vue) (Ctrl+P)
src/main/java/edu/ntnu/idatt2106/backend/controller/WeekMenuController.java
+
11
−
3
Options
@@ -24,17 +24,25 @@ import java.util.List;
@RequestMapping
(
value
=
"/week-menu"
)
public
class
WeekMenuController
{
//TODO: lage endepunkt for å fjerne oppskrift i ukesmeny hvis den er lagd
//TODO: sjekker om recipen og brukeren finnes i ukesmenyen, hvis det er trykket på spist, så fjernes den fra ukesmenyen
private
final
WeekMenuService
weekMenuService
;
//TODO: ha tabell for ukes meny i db, vise en random ukes meny (og en anbefalt)? har mulighet til å lagre en uke meny av gangen
//TODO: kan se på lagret ukesmeny og fjerne den fra db
//TODO: metode for å legge til alle itemene som skal være i ukes menyen men som ikke har?
public
WeekMenuController
(
WeekMenuService
weekMenuService
)
{
this
.
weekMenuService
=
weekMenuService
;
}
@GetMapping
(
"/list-random"
)
public
ResponseEntity
<
List
<
Recipe
>>
listRandom
(){
return
weekMenuService
.
getRandomWeekMenu
();
}
@GetMapping
(
"/list-recommended"
)
public
ResponseEntity
<
List
<
Recipe
>>
listRecommended
(
@AuthenticationPrincipal
User
user
){
return
weekMenuService
.
getRecommendedWeekMenu
(
user
);
}
public
ResponseEntity
<
List
<
Recipe
>>
list
(){
return
weekMenuService
.
getRandomWeekMenu
();
}
Loading