Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
G
GrowBros
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Iterations
Wiki
Requirements
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Test cases
Artifacts
Deploy
Releases
Package Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Issue analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
tomato
GrowBros
Commits
43d995d1
Commit
43d995d1
authored
1 year ago
by
Karsch Lukas
Browse files
Options
Downloads
Patches
Plain Diff
plant and user relation no longer optional on WishListEntry and GardenEntry
parent
812ce762
No related branches found
Branches containing commit
No related tags found
Tags containing commit
1 merge request
!27
Resolve "plants controller: require admin role & add delete endpoint"
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
src/main/java/hdm/mi/growbros/models/GardenEntry.java
+1
-1
1 addition, 1 deletion
src/main/java/hdm/mi/growbros/models/GardenEntry.java
src/main/java/hdm/mi/growbros/models/WishListEntry.java
+6
-3
6 additions, 3 deletions
src/main/java/hdm/mi/growbros/models/WishListEntry.java
with
7 additions
and
4 deletions
src/main/java/hdm/mi/growbros/models/GardenEntry.java
+
1
−
1
View file @
43d995d1
...
...
@@ -24,7 +24,7 @@ public class GardenEntry {
@GeneratedValue
private
Long
id
;
@ManyToOne
@ManyToOne
(
optional
=
false
)
private
Plant
plant
;
@ManyToOne
(
optional
=
false
)
...
...
This diff is collapsed.
Click to expand it.
src/main/java/hdm/mi/growbros/models/WishListEntry.java
+
6
−
3
View file @
43d995d1
...
...
@@ -2,7 +2,10 @@ package hdm.mi.growbros.models;
import
hdm.mi.growbros.models.plant.Plant
;
import
hdm.mi.growbros.models.user.User
;
import
jakarta.persistence.*
;
import
jakarta.persistence.Entity
;
import
jakarta.persistence.GeneratedValue
;
import
jakarta.persistence.Id
;
import
jakarta.persistence.ManyToOne
;
import
lombok.AllArgsConstructor
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
...
...
@@ -17,11 +20,11 @@ import java.util.Date;
@NoArgsConstructor
public
class
WishListEntry
{
@ManyToOne
@ManyToOne
(
optional
=
false
)
@CreatedBy
private
User
user
;
@ManyToOne
@ManyToOne
(
optional
=
false
)
private
Plant
plant
;
@CreatedDate
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment