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
ff458eb2
Commit
ff458eb2
authored
Apr 24, 2020
by
Ramakanth Dhane
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'master' into 'master'
Master See merge request
!7
parents
9eb39071
91b41690
Changes
6
Show whitespace changes
Inline
Side-by-side
Showing
6 changed files
with
24 additions
and
50 deletions
+24
-50
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
+5
-32
Order.java
...out-service/src/main/java/com/nisum/omd/domain/Order.java
+5
-3
PaymentMethod.java
...ice/src/main/java/com/nisum/omd/domain/PaymentMethod.java
+5
-5
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 @
ff458eb2
package
com
.
nisum
.
omd
;
package
com
.
nisum
.
omd
;
import
java.time.LocalDateTime
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.boot.CommandLineRunner
;
import
org.springframework.boot.CommandLineRunner
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
com.fasterxml.jackson.databind.ObjectMapper
;
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.domain.Order
;
import
com.nisum.omd.service.RandomDataGeneratorImpl
;
import
com.nisum.omd.service.RandomDataGeneratorImpl
;
...
@@ -30,6 +34,8 @@ public class OrderGenerator implements CommandLineRunner{
...
@@ -30,6 +34,8 @@ public class OrderGenerator implements CommandLineRunner{
while
(
orderGenerateFlag
){
while
(
orderGenerateFlag
){
order
=
getObjectData
(
order
);
order
=
getObjectData
(
order
);
ObjectMapper
objectMapper
=
new
ObjectMapper
();
ObjectMapper
objectMapper
=
new
ObjectMapper
();
objectMapper
.
registerModule
(
new
JavaTimeModule
());
objectMapper
.
disable
(
SerializationFeature
.
WRITE_DATES_AS_TIMESTAMPS
);
String
jsonOrderStr
=
objectMapper
.
writeValueAsString
(
order
);
String
jsonOrderStr
=
objectMapper
.
writeValueAsString
(
order
);
System
.
out
.
println
(
jsonOrderStr
);
System
.
out
.
println
(
jsonOrderStr
);
}
}
...
@@ -37,8 +43,10 @@ public class OrderGenerator implements CommandLineRunner{
...
@@ -37,8 +43,10 @@ public class OrderGenerator implements CommandLineRunner{
public
Order
getObjectData
(
Order
order2
)
{
public
Order
getObjectData
(
Order
order2
)
{
LocalDateTime
currentTime
=
LocalDateTime
.
now
();
order
.
setOrderNum
(
rdg
.
generateOrderNumber
());
order
.
setOrderNum
(
rdg
.
generateOrderNumber
());
order
.
setCustomerId
(
rdg
.
generateCustomerId
());
order
.
setCustomerId
(
rdg
.
generateCustomerId
());
order
.
setOrderDate
(
currentTime
);
order
.
setLineItem
(
rdg
.
genetateLineItem
(
order
.
getLineItem
()));
order
.
setLineItem
(
rdg
.
genetateLineItem
(
order
.
getLineItem
()));
return
order
;
return
order
;
}
}
...
...
omd-checkout-service/src/main/java/com/nisum/omd/domain/LineItem.java
View file @
ff458eb2
package
com
.
nisum
.
omd
.
domain
;
package
com
.
nisum
.
omd
.
domain
;
import
java.time.LocalDateTime
;
import
java.util.Map
;
import
java.util.Map
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
...
@@ -15,13 +16,10 @@ public class LineItem {
...
@@ -15,13 +16,10 @@ public class LineItem {
private
String
productName
;
private
String
productName
;
private
String
itemType
;
private
String
itemType
;
private
boolean
shipChrgApplInd
;
private
boolean
shipChrgApplInd
;
private
String
estimatedShipDate
;
private
LocalDateTime
estimatedShipDate
;
private
Map
<
String
,
Object
>
linePriceInfo
;
private
Map
<
String
,
Object
>
linePriceInfo
;
private
Map
<
String
,
Object
>
lineTax
;
private
Map
<
String
,
Object
>
lineTax
;
private
String
originalLineItemId
;
private
String
vendorUpcCode
;
private
String
brandCode
;
private
String
eligibleReturnLocationCode
;
public
String
getLineItemNumber
()
{
public
String
getLineItemNumber
()
{
return
lineItemNumber
;
return
lineItemNumber
;
}
}
...
@@ -71,10 +69,10 @@ public class LineItem {
...
@@ -71,10 +69,10 @@ public class LineItem {
public
void
setShipChrgApplInd
(
boolean
shipChrgApplInd
)
{
public
void
setShipChrgApplInd
(
boolean
shipChrgApplInd
)
{
this
.
shipChrgApplInd
=
shipChrgApplInd
;
this
.
shipChrgApplInd
=
shipChrgApplInd
;
}
}
public
String
getEstimatedShipDate
()
{
public
LocalDateTime
getEstimatedShipDate
()
{
return
estimatedShipDate
;
return
estimatedShipDate
;
}
}
public
void
setEstimatedShipDate
(
String
estimatedShipDate
)
{
public
void
setEstimatedShipDate
(
LocalDateTime
estimatedShipDate
)
{
this
.
estimatedShipDate
=
estimatedShipDate
;
this
.
estimatedShipDate
=
estimatedShipDate
;
}
}
public
Map
<
String
,
Object
>
getLinePriceInfo
()
{
public
Map
<
String
,
Object
>
getLinePriceInfo
()
{
...
@@ -89,30 +87,5 @@ public class LineItem {
...
@@ -89,30 +87,5 @@ public class LineItem {
public
void
setLineTax
(
Map
<
String
,
Object
>
lineTax
)
{
public
void
setLineTax
(
Map
<
String
,
Object
>
lineTax
)
{
this
.
lineTax
=
lineTax
;
this
.
lineTax
=
lineTax
;
}
}
public
String
getOriginalLineItemId
()
{
return
originalLineItemId
;
}
public
void
setOriginalLineItemId
(
String
originalLineItemId
)
{
this
.
originalLineItemId
=
originalLineItemId
;
}
public
String
getVendorUpcCode
()
{
return
vendorUpcCode
;
}
public
void
setVendorUpcCode
(
String
vendorUpcCode
)
{
this
.
vendorUpcCode
=
vendorUpcCode
;
}
public
String
getBrandCode
()
{
return
brandCode
;
}
public
void
setBrandCode
(
String
brandCode
)
{
this
.
brandCode
=
brandCode
;
}
public
String
getEligibleReturnLocationCode
()
{
return
eligibleReturnLocationCode
;
}
public
void
setEligibleReturnLocationCode
(
String
eligibleReturnLocationCode
)
{
this
.
eligibleReturnLocationCode
=
eligibleReturnLocationCode
;
}
}
}
omd-checkout-service/src/main/java/com/nisum/omd/domain/Order.java
View file @
ff458eb2
package
com
.
nisum
.
omd
.
domain
;
package
com
.
nisum
.
omd
.
domain
;
import
java.time.LocalDateTime
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.boot.context.properties.ConfigurationProperties
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
...
@@ -9,7 +11,7 @@ public class Order {
...
@@ -9,7 +11,7 @@ public class Order {
private
String
orderNum
;
private
String
orderNum
;
private
String
orderDate
;
private
LocalDateTime
orderDate
;
private
String
currency
;
private
String
currency
;
private
String
shipMethod
;
private
String
shipMethod
;
private
String
customerId
;
private
String
customerId
;
...
@@ -45,11 +47,11 @@ public class Order {
...
@@ -45,11 +47,11 @@ public class Order {
this
.
orderNum
=
orderNum
;
this
.
orderNum
=
orderNum
;
}
}
public
String
getOrderDate
()
{
public
LocalDateTime
getOrderDate
()
{
return
orderDate
;
return
orderDate
;
}
}
public
void
setOrderDate
(
String
orderDate
)
{
public
void
setOrderDate
(
LocalDateTime
orderDate
)
{
this
.
orderDate
=
orderDate
;
this
.
orderDate
=
orderDate
;
}
}
...
...
omd-checkout-service/src/main/java/com/nisum/omd/domain/PaymentMethod.java
View file @
ff458eb2
...
@@ -3,17 +3,17 @@ package com.nisum.omd.domain;
...
@@ -3,17 +3,17 @@ package com.nisum.omd.domain;
import
java.util.Map
;
import
java.util.Map
;
public
class
PaymentMethod
{
public
class
PaymentMethod
{
private
String
paymetMethod
;
private
String
payme
n
tMethod
;
private
String
creditCardNo
;
private
String
creditCardNo
;
private
String
creditCardType
;
private
String
creditCardType
;
private
String
displayCreditCardNo
;
private
String
displayCreditCardNo
;
private
String
paymentStatus
;
private
String
paymentStatus
;
private
Map
<
String
,
Object
>
paymentDetail
;
private
Map
<
String
,
Object
>
paymentDetail
;
public
String
getPaymetMethod
()
{
public
String
getPayme
n
tMethod
()
{
return
paymetMethod
;
return
payme
n
tMethod
;
}
}
public
void
setPayme
tMethod
(
String
payme
tMethod
)
{
public
void
setPayme
ntMethod
(
String
paymen
tMethod
)
{
this
.
payme
tMethod
=
payme
tMethod
;
this
.
payme
ntMethod
=
paymen
tMethod
;
}
}
public
String
getCreditCardNo
()
{
public
String
getCreditCardNo
()
{
return
creditCardNo
;
return
creditCardNo
;
...
...
omd-checkout-service/src/main/java/com/nisum/omd/service/RandomDataGeneratorImpl.java
View file @
ff458eb2
...
@@ -6,7 +6,6 @@ import java.util.Random;
...
@@ -6,7 +6,6 @@ import java.util.Random;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.stereotype.Component
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.bind.annotation.GetMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
org.springframework.web.bind.annotation.RequestMapping
;
import
com.github.javafaker.Faker
;
import
com.github.javafaker.Faker
;
...
@@ -35,13 +34,6 @@ public class RandomDataGeneratorImpl implements RandomDataGenerator {
...
@@ -35,13 +34,6 @@ public class RandomDataGeneratorImpl implements RandomDataGenerator {
return
String
.
valueOf
(
fk
.
number
().
numberBetween
(
1
,
1000
));
return
String
.
valueOf
(
fk
.
number
().
numberBetween
(
1
,
1000
));
}
}
@GetMapping
(
"/orderDate"
)
public
String
getOrderDate
()
{
return
order
.
getOrderDate
();
}
@Override
@Override
public
LineItem
genetateLineItem
(
LineItem
li
)
{
public
LineItem
genetateLineItem
(
LineItem
li
)
{
List
<
String
>
productname
=
new
ArrayList
<
String
>();
List
<
String
>
productname
=
new
ArrayList
<
String
>();
...
@@ -56,6 +48,7 @@ public class RandomDataGeneratorImpl implements RandomDataGenerator {
...
@@ -56,6 +48,7 @@ public class RandomDataGeneratorImpl implements RandomDataGenerator {
int
randomIndex
=
rand
.
nextInt
(
productname
.
size
());
int
randomIndex
=
rand
.
nextInt
(
productname
.
size
());
String
randomElement
=
productname
.
get
(
randomIndex
);
String
randomElement
=
productname
.
get
(
randomIndex
);
li
.
setProductName
(
randomElement
);
li
.
setProductName
(
randomElement
);
li
.
setEstimatedShipDate
(
order
.
getOrderDate
().
plusDays
(
5
));
return
li
;
return
li
;
}
}
...
...
omd-checkout-service/src/main/resources/application.properties
View file @
ff458eb2
app.orderDate
=
2020-04-26T13:33:15.657-05:00
app.currency
=
INR
app.currency
=
INR
app.shipMethod
=
1
app.shipMethod
=
1
app.customerType
=
01
app.customerType
=
01
...
@@ -18,7 +17,6 @@ app.lineItem.size=6
...
@@ -18,7 +17,6 @@ app.lineItem.size=6
app.lineItem.orderedQty
=
2
app.lineItem.orderedQty
=
2
app.lineItem.itemType
=
7
app.lineItem.itemType
=
7
app.lineItem.shipChrgApplInd
=
true
app.lineItem.shipChrgApplInd
=
true
app.lineItem.estimatedShipDate
=
2020-04-26T00:00:00-05:00
app.lineItem.linePriceInfo.listPrice
=
29.50
app.lineItem.linePriceInfo.listPrice
=
29.50
app.lineItem.linePriceInfo.retailPrice
=
29.50
app.lineItem.linePriceInfo.retailPrice
=
29.50
app.lineItem.linePriceInfo.unitPrice
=
20.00
app.lineItem.linePriceInfo.unitPrice
=
20.00
...
...
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