Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
E
ecommerce-maven
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
Ascend
ecommerce-maven
Commits
a7462ffe
Commit
a7462ffe
authored
May 10, 2021
by
Christopher Cottier
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'AFP42OrderHistory' into 'master'
Afp42 order history See merge request
!7
parents
b2672ad5
797f6ac9
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
14 additions
and
1 deletion
+14
-1
OrdersController.java
...va/com/nisum/ecomservice/controller/OrdersController.java
+7
-1
OrderService.java
...main/java/com/nisum/ecomservice/service/OrderService.java
+7
-0
No files found.
ecom-service/src/main/java/com/nisum/ecomservice/controller/OrdersController.java
View file @
a7462ffe
package
com
.
nisum
.
ecomservice
.
controller
;
import
com.nisum.ecomservice.dto.CartDTO
;
import
com.nisum.ecomservice.dto.Order
;
import
com.nisum.ecomservice.dto.OrderRequest
;
import
com.nisum.ecomservice.service.OrderService
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.ResponseEntity
;
import
org.springframework.web.bind.annotation.*
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
@RestController
...
...
@@ -18,6 +21,9 @@ public class OrdersController {
private
Mono
<
Order
>
postOrder
(
@RequestBody
OrderRequest
orderRequest
){
return
orderService
.
postOrder
(
orderRequest
);
}
@GetMapping
(
"/byUser/{userId}"
)
private
ResponseEntity
<
Flux
<
Order
>>
getUserOrderHistory
(
@PathVariable
String
userId
){
return
ResponseEntity
.
ok
(
orderService
.
getOrderFromOmsAPI
(
userId
));
}
}
ecom-service/src/main/java/com/nisum/ecomservice/service/OrderService.java
View file @
a7462ffe
...
...
@@ -81,6 +81,13 @@ public class OrderService {
.
retrieve
()
.
bodyToMono
(
Order
.
class
);
}
public
Flux
<
Order
>
getOrderFromOmsAPI
(
String
userId
){
return
WebClient
.
create
(
String
.
format
(
"%s/orders/byCustomer/%s"
,
AppConfig
.
getOrderManagementAPI
(),
userId
))
.
get
()
.
retrieve
()
.
bodyToFlux
(
Order
.
class
);
}
}
/*
.map(productMono -> {
...
...
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