Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
order-management-backend
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
1
Merge Requests
1
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Ascend
order-management-backend
Commits
de1efd0b
Commit
de1efd0b
authored
May 11, 2021
by
Alex Segers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AFP-91]
🐛
Fix validations & error messages in 'Manager' model (
@asegers
)
parent
7a746815
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
7 additions
and
21 deletions
+7
-21
Manager.java
src/main/java/com/afp/ordermanagement/model/Manager.java
+7
-21
No files found.
src/main/java/com/afp/ordermanagement/model/Manager.java
View file @
de1efd0b
...
@@ -4,12 +4,10 @@ import lombok.Data;
...
@@ -4,12 +4,10 @@ import lombok.Data;
import
lombok.NoArgsConstructor
;
import
lombok.NoArgsConstructor
;
import
org.hibernate.validator.constraints.URL
;
import
org.hibernate.validator.constraints.URL
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.mongodb.core.index.Indexed
;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
javax.validation.constraints.*
;
import
javax.validation.constraints.*
;
import
java.lang.reflect.Field
;
import
static
java
.
util
.
Objects
.
isNull
;
@Data
@Data
@NoArgsConstructor
@NoArgsConstructor
...
@@ -18,30 +16,18 @@ public class Manager {
...
@@ -18,30 +16,18 @@ public class Manager {
@Id
@Id
private
String
id
;
private
String
id
;
@Size
(
min
=
1
,
max
=
250
,
message
=
"'firstName' must be between 1 & 250 characters"
)
@Size
(
min
=
1
,
max
=
250
)
@NotNull
@NotNull
()
private
String
firstName
,
lastName
;
private
String
firstName
,
lastName
;
@Indexed
(
unique
=
true
)
@Email
@Email
private
String
email
;
private
String
email
;
@
NotNull
@
Size
(
min
=
21
,
max
=
21
)
@
Size
(
min
=
21
,
max
=
21
,
message
=
"'googleId' is invalid"
)
@
NotNull
(
)
private
String
googleId
;
private
String
googleId
;
@URL
(
message
=
"'imageUrl' must be a valid URL"
)
@URL
private
String
imageUrl
;
private
String
imageUrl
;
static
public
Manager
combine
(
Manager
target
,
Manager
source
)
{
try
{
for
(
Field
field:
Manager
.
class
.
getDeclaredFields
())
{
String
fieldName
=
field
.
getName
();
Object
sourceValue
=
field
.
get
(
source
);
if
(!
isNull
(
sourceValue
)
&&
!
fieldName
.
equals
(
"id"
))
field
.
set
(
target
,
sourceValue
);
}
}
catch
(
Exception
ignore
)
{
}
return
target
;
}
}
}
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment