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
af28a51a
Commit
af28a51a
authored
May 12, 2021
by
Alex Segers
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AFP-129]
♻
️ Clean-up 'Order', 'Item', & 'CustomerAddress' models (
@asegers
)
parent
7066930b
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
119 deletions
+11
-119
CustomerAddress.java
...n/java/com/afp/ordermanagement/model/CustomerAddress.java
+1
-29
Item.java
src/main/java/com/afp/ordermanagement/model/Item.java
+1
-5
Order.java
src/main/java/com/afp/ordermanagement/model/Order.java
+9
-85
No files found.
src/main/java/com/afp/ordermanagement/model/CustomerAddress.java
View file @
af28a51a
...
...
@@ -2,35 +2,7 @@ package com.afp.ordermanagement.model;
import
lombok.Data
;
import
java.util.Objects
;
@Data
public
class
CustomerAddress
{
private
String
street
;
private
String
city
;
private
String
state
;
private
String
zip
;
@Override
public
boolean
equals
(
Object
o
)
{
if
(
this
==
o
)
return
true
;
if
(!(
o
instanceof
CustomerAddress
))
return
false
;
CustomerAddress
that
=
(
CustomerAddress
)
o
;
return
getStreet
().
equals
(
that
.
getStreet
())
&&
getCity
().
equals
(
that
.
getCity
())
&&
getState
().
equals
(
that
.
getState
())
&&
getZip
().
equals
(
that
.
getZip
());
}
@Override
public
int
hashCode
()
{
return
Objects
.
hash
(
getStreet
(),
getCity
(),
getState
(),
getZip
());
}
@Override
public
String
toString
()
{
return
"CustomerAddress{"
+
"street='"
+
street
+
'\''
+
", city='"
+
city
+
'\''
+
", state='"
+
state
+
'\''
+
", zip='"
+
zip
+
'\''
+
'}'
;
}
private
String
street
,
city
,
state
,
zip
;
}
src/main/java/com/afp/ordermanagement/model/Item.java
View file @
af28a51a
...
...
@@ -6,11 +6,7 @@ import java.util.Objects;
@Data
public
class
Item
{
private
String
itemId
;
private
String
itemName
;
private
String
itemSku
;
private
String
itemId
,
itemName
,
itemSku
;
private
int
itemQuantity
;
private
double
itemPrice
;
}
src/main/java/com/afp/ordermanagement/model/Order.java
View file @
af28a51a
package
com
.
afp
.
ordermanagement
.
model
;
import
lombok.AllArgsConstructor
;
import
lombok.Builder
;
import
lombok.Data
;
import
lombok.NoArgsConstructor
;
import
org.springframework.data.annotation.Id
;
import
org.springframework.data.mongodb.core.mapping.Document
;
import
java.util.List
;
import
java.util.Objects
;
@Data
@AllArgsConstructor
@NoArgsConstructor
@Document
(
collection
=
"orders"
)
public
class
Order
{
public
Order
(
OrderStatus
status
)
{
this
.
orderStatus
=
status
;
}
@Id
private
String
id
;
...
...
@@ -20,91 +23,12 @@ public class Order {
private
String
orderTrackingCode
;
private
OrderStatus
orderStatus
;
private
long
orderCreatedAt
;
private
long
orderUpdatedAt
;
private
String
customerId
;
private
String
customerEmailAddress
;
private
List
<
Item
>
orderItems
;
private
CustomerAddress
customerAddress
;
public
Order
(){
}
public
Order
(
OrderStatus
status
)
{
this
.
orderStatus
=
status
;
}
public
String
getId
()
{
return
id
;
}
public
void
setId
(
String
id
)
{
this
.
id
=
id
;
}
public
String
getOrderTrackingCode
()
{
return
orderTrackingCode
;
}
public
void
setOrderTrackingCode
(
String
orderTrackingCode
)
{
this
.
orderTrackingCode
=
orderTrackingCode
;
}
public
OrderStatus
getOrderStatus
()
{
return
orderStatus
;
}
private
long
orderCreatedAt
,
orderUpdatedAt
;
public
void
setOrderStatus
(
OrderStatus
orderStatus
)
{
this
.
orderStatus
=
orderStatus
;
}
private
String
customerId
,
customerEmailAddress
;
public
long
getOrderCreatedAt
()
{
return
orderCreatedAt
;
}
public
void
setOrderCreatedAt
(
long
orderCreatedAt
)
{
this
.
orderCreatedAt
=
orderCreatedAt
;
}
public
long
getOrderUpdatedAt
()
{
return
orderUpdatedAt
;
}
public
void
setOrderUpdatedAt
(
long
orderUpdatedAt
)
{
this
.
orderUpdatedAt
=
orderUpdatedAt
;
}
public
String
getCustomerId
()
{
return
customerId
;
}
public
void
setCustomerId
(
String
customerId
)
{
this
.
customerId
=
customerId
;
}
public
String
getCustomerEmailAddress
()
{
return
customerEmailAddress
;
}
public
void
setCustomerEmailAddress
(
String
customerEmailAddress
)
{
this
.
customerEmailAddress
=
customerEmailAddress
;
}
public
List
<
Item
>
getOrderItems
()
{
return
orderItems
;
}
public
void
setOrderItems
(
List
<
Item
>
orderItems
)
{
this
.
orderItems
=
orderItems
;
}
public
CustomerAddress
getCustomerAddress
()
{
return
customerAddress
;
}
private
List
<
Item
>
orderItems
;
public
void
setCustomerAddress
(
CustomerAddress
customerAddress
)
{
this
.
customerAddress
=
customerAddress
;
}
private
CustomerAddress
customerAddress
;
}
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