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
Issue boards
Milestones
Wiki
Code
Merge requests
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
!14
Resolve "Add table for date_category in database"
Code
Review changes
Check out branch
Download
Patches
Plain diff
Merged
Resolve "Add table for date_category in database"
23-add-table-for-date_category-in-database
into
main
Overview
0
Commits
3
Pipelines
1
Changes
6
Merged
Charlotte Hallan Christiansen
requested to merge
23-add-table-for-date_category-in-database
into
main
2 years ago
Overview
0
Commits
3
Pipelines
1
Changes
6
Expand
Closes
#23 (closed)
0
0
Merge request reports
Compare
main
main (base)
and
latest version
latest version
68dab6e3
3 commits,
2 years ago
6 files
+
165
−
16
Inline
Compare changes
Side-by-side
Inline
Show whitespace changes
Show one file at a time
Files
6
Search (e.g. *.vue) (Ctrl+P)
src/main/java/edu/ntnu/idatt2106/backend/controller/ItemController.java
+
10
−
5
Options
@@ -7,7 +7,6 @@ import edu.ntnu.idatt2106.backend.model.user.User;
import
edu.ntnu.idatt2106.backend.service.ItemService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.autoconfigure.EnableAutoConfiguration
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.security.core.annotation.AuthenticationPrincipal
;
import
org.springframework.web.bind.annotation.*
;
@@ -49,13 +48,19 @@ public class ItemController {
@PostMapping
(
"/addCustom"
)
public
ResponseEntity
<?>
uploadCustomItem
(
@RequestParam
(
"name"
)
String
name
,
@RequestParam
(
"weight"
)
double
weight
,
@RequestParam
(
"date"
)
String
date
,
@AuthenticationPrincipal
User
user
)
{
itemService
.
saveOrUpdateCustomItem
(
new
CustomItem
(
name
,
weight
,
LocalDate
.
parse
(
date
),
user
));
return
ResponseEntity
.
ok
().
build
();
@RequestParam
(
"category"
)
String
category
,
@RequestParam
(
"date"
)
String
date
,
@AuthenticationPrincipal
User
user
)
{
//Date must be on form yyyy-mm-dd
if
(
date
.
isEmpty
())
{
return
itemService
.
saveOrUpdateCustomItemWithoutDate
(
new
CustomItem
(
name
,
weight
,
Category
.
valueOf
(
category
),
user
));
}
else
{
return
itemService
.
saveOrUpdateCustomItemWithDate
(
new
CustomItem
(
name
,
weight
,
Category
.
valueOf
(
category
),
user
),
LocalDate
.
parse
(
date
));
}
}
@GetMapping
(
"/getCustom"
)
public
List
<
CustomItem
>
getCustomItemsByUser
(
@AuthenticationPrincipal
User
user
){
public
ResponseEntity
<
List
<
CustomItem
>
>
getCustomItemsByUser
(
@AuthenticationPrincipal
User
user
){
return
itemService
.
getCustomItemByUser
(
user
);
}
}
Loading