Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
orders-monitoring-dashboard
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
0
Merge Requests
0
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
Ramakanth Dhane
orders-monitoring-dashboard
Commits
4a7b93c5
Commit
4a7b93c5
authored
5 years ago
by
rani0808
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
modified orderDate and estimated date
parent
e45f6ea0
Changes
5
Hide whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
18 additions
and
16 deletions
+18
-16
OrderGenerator.java
...t-service/src/main/java/com/nisum/omd/OrderGenerator.java
+8
-0
LineItem.java
...-service/src/main/java/com/nisum/omd/domain/LineItem.java
+4
-3
Order.java
...out-service/src/main/java/com/nisum/omd/domain/Order.java
+5
-3
RandomDataGeneratorImpl.java
...n/java/com/nisum/omd/service/RandomDataGeneratorImpl.java
+1
-8
application.properties
...heckout-service/src/main/resources/application.properties
+0
-2
No files found.
omd-checkout-service/src/main/java/com/nisum/omd/OrderGenerator.java
View file @
4a7b93c5
package
com
.
nisum
.
omd
;
import
java.time.LocalDateTime
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.CommandLineRunner
;
import
org.springframework.stereotype.Component
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
import
com.fasterxml.jackson.databind.SerializationFeature
;
import
com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
;
import
com.nisum.omd.domain.Order
;
import
com.nisum.omd.service.RandomDataGeneratorImpl
;
...
...
@@ -30,6 +34,8 @@ public class OrderGenerator implements CommandLineRunner{
while
(
orderGenerateFlag
){
order
=
getObjectData
(
order
);
ObjectMapper
objectMapper
=
new
ObjectMapper
();
objectMapper
.
registerModule
(
new
JavaTimeModule
());
objectMapper
.
disable
(
SerializationFeature
.
WRITE_DATES_AS_TIMESTAMPS
);
String
jsonOrderStr
=
objectMapper
.
writeValueAsString
(
order
);
System
.
out
.
println
(
jsonOrderStr
);
}
...
...
@@ -37,8 +43,10 @@ public class OrderGenerator implements CommandLineRunner{
public
Order
getObjectData
(
Order
order2
)
{
LocalDateTime
currentTime
=
LocalDateTime
.
now
();
order
.
setOrderNum
(
rdg
.
generateOrderNumber
());
order
.
setCustomerId
(
rdg
.
generateCustomerId
());
order
.
setOrderDate
(
currentTime
);
order
.
setLineItem
(
rdg
.
genetateLineItem
(
order
.
getLineItem
()));
return
order
;
}
...
...
This diff is collapsed.
Click to expand it.
omd-checkout-service/src/main/java/com/nisum/omd/domain/LineItem.java
View file @
4a7b93c5
package
com
.
nisum
.
omd
.
domain
;
import
java.time.LocalDateTime
;
import
java.util.Map
;
import
org.springframework.stereotype.Component
;
...
...
@@ -15,7 +16,7 @@ public class LineItem {
private
String
productName
;
private
String
itemType
;
private
boolean
shipChrgApplInd
;
private
String
estimatedShipDate
;
private
LocalDateTime
estimatedShipDate
;
private
Map
<
String
,
Object
>
linePriceInfo
;
private
Map
<
String
,
Object
>
lineTax
;
private
String
originalLineItemId
;
...
...
@@ -71,10 +72,10 @@ public class LineItem {
public
void
setShipChrgApplInd
(
boolean
shipChrgApplInd
)
{
this
.
shipChrgApplInd
=
shipChrgApplInd
;
}
public
String
getEstimatedShipDate
()
{
public
LocalDateTime
getEstimatedShipDate
()
{
return
estimatedShipDate
;
}
public
void
setEstimatedShipDate
(
String
estimatedShipDate
)
{
public
void
setEstimatedShipDate
(
LocalDateTime
estimatedShipDate
)
{
this
.
estimatedShipDate
=
estimatedShipDate
;
}
public
Map
<
String
,
Object
>
getLinePriceInfo
()
{
...
...
This diff is collapsed.
Click to expand it.
omd-checkout-service/src/main/java/com/nisum/omd/domain/Order.java
View file @
4a7b93c5
package
com
.
nisum
.
omd
.
domain
;
import
java.time.LocalDateTime
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.stereotype.Component
;
...
...
@@ -9,7 +11,7 @@ public class Order {
private
String
orderNum
;
private
String
orderDate
;
private
LocalDateTime
orderDate
;
private
String
currency
;
private
String
shipMethod
;
private
String
customerId
;
...
...
@@ -45,11 +47,11 @@ public class Order {
this
.
orderNum
=
orderNum
;
}
public
String
getOrderDate
()
{
public
LocalDateTime
getOrderDate
()
{
return
orderDate
;
}
public
void
setOrderDate
(
String
orderDate
)
{
public
void
setOrderDate
(
LocalDateTime
orderDate
)
{
this
.
orderDate
=
orderDate
;
}
...
...
This diff is collapsed.
Click to expand it.
omd-checkout-service/src/main/java/com/nisum/omd/service/RandomDataGeneratorImpl.java
View file @
4a7b93c5
...
...
@@ -6,7 +6,6 @@ import java.util.Random;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
com.github.javafaker.Faker
;
...
...
@@ -35,13 +34,6 @@ public class RandomDataGeneratorImpl implements RandomDataGenerator {
return
String
.
valueOf
(
fk
.
number
().
numberBetween
(
1
,
1000
));
}
@GetMapping
(
"/orderDate"
)
public
String
getOrderDate
()
{
return
order
.
getOrderDate
();
}
@Override
public
LineItem
genetateLineItem
(
LineItem
li
)
{
List
<
String
>
productname
=
new
ArrayList
<
String
>();
...
...
@@ -56,6 +48,7 @@ public class RandomDataGeneratorImpl implements RandomDataGenerator {
int
randomIndex
=
rand
.
nextInt
(
productname
.
size
());
String
randomElement
=
productname
.
get
(
randomIndex
);
li
.
setProductName
(
randomElement
);
li
.
setEstimatedShipDate
(
order
.
getOrderDate
().
plusDays
(
5
));
return
li
;
}
...
...
This diff is collapsed.
Click to expand it.
omd-checkout-service/src/main/resources/application.properties
View file @
4a7b93c5
app.orderDate
=
2020-04-26T13:33:15.657-05:00
app.currency
=
INR
app.shipMethod
=
1
app.customerType
=
01
...
...
@@ -18,7 +17,6 @@ app.lineItem.size=6
app.lineItem.orderedQty
=
2
app.lineItem.itemType
=
7
app.lineItem.shipChrgApplInd
=
true
app.lineItem.estimatedShipDate
=
2020-04-26T00:00:00-05:00
app.lineItem.linePriceInfo.listPrice
=
29.50
app.lineItem.linePriceInfo.retailPrice
=
29.50
app.lineItem.linePriceInfo.unitPrice
=
20.00
...
...
This diff is collapsed.
Click to expand it.
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