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
2e140675
Commit
2e140675
authored
May 11, 2021
by
Shanelle Valencia
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
[AFP-53]
🚧
Fix status update issues to update all other fields of order [
@svalencia
]
parent
cbe6c7cf
Changes
2
Show whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
17 additions
and
11 deletions
+17
-11
Receiver.java
...om/afp/ordermanagement/reactivekafkaservice/Receiver.java
+16
-11
OrderService.java
...in/java/com/afp/ordermanagement/service/OrderService.java
+1
-0
No files found.
src/main/java/com/afp/ordermanagement/reactivekafkaservice/Receiver.java
View file @
2e140675
...
...
@@ -52,14 +52,12 @@ public class Receiver {
try
{
//deserialize kafka message into java object using ObjectMapper
ObjectMapper
objectMapper
=
new
ObjectMapper
();
//Map<String, String> orderStatus = objectMapper.readValue(orderStatusStr, Map.class);
Order
order
=
objectMapper
.
readValue
(
orderStatusStr
,
Order
.
class
);
log
.
info
(
"ORDER objectMapper {}"
,
order
);
String
orderId
=
order
.
getId
();
Mono
<
Order
>
updated
=
orderService
.
updateOrderByOrderId
(
orderId
,
order
);
updated
.
block
();
}
catch
(
Exception
e
)
{
log
.
error
(
"Caught error"
,
e
);
}
...
...
@@ -67,16 +65,23 @@ public class Receiver {
private
boolean
checkExistingOrder
(
String
orderId
)
{
Flux
<
Order
>
orders
=
orderService
.
getAllOrders
();
List
<
Order
>
orderList
=
orders
.
collectList
().
block
();
Order
res
=
orderList
.
stream
()
.
filter
(
order
->
orderId
.
equals
(
order
.
getId
()))
.
findAny
()
.
orElse
(
null
);
if
(
res
==
null
)
{
// Flux<Order> orders = orderService.getAllOrders();
// List<Order> orderList = orders.collectList().block();
// Order res = orderList.stream()
// .filter(order -> orderId.equals(order.getId()))
// .findAny()
// .orElse(null);
// if (res == null) {
// log.error("Order {} not found", orderId);
// return false;
// }
Mono
<
Order
>
order
=
orderRepository
.
findById
(
orderId
);
if
(
order
==
null
)
{
log
.
error
(
"Order {} not found"
,
orderId
);
return
false
;
}
...
...
src/main/java/com/afp/ordermanagement/service/OrderService.java
View file @
2e140675
...
...
@@ -53,6 +53,7 @@ public class OrderService {
existingOrder
.
setOrderTrackingCode
(
newOrder
.
getOrderTrackingCode
());
existingOrder
.
setOrderItems
(
newOrder
.
getOrderItems
());
existingOrder
.
setOrderStatus
(
newOrder
.
getOrderStatus
());
existingOrder
.
setOrderItems
(
newOrder
.
getOrderItems
());
return
orderRepository
.
save
(
existingOrder
);
});
}
...
...
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