Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
W
warehouse-management
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
warehouse-management
Commits
d9cdaecc
Commit
d9cdaecc
authored
May 04, 2021
by
Alex Pinto
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
finished inital routes and fixed cors error
parent
28f95b55
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
with
19943 additions
and
27 deletions
+19943
-27
package-lock.json
frontend/package-lock.json
+19875
-24
pom.xml
pom.xml
+11
-1
WarehouseController.java
...nalproject/warehouse/controllers/WarehouseController.java
+14
-0
OrderResponse.java
...om/ascendfinalproject/warehouse/models/OrderResponse.java
+20
-0
WarehouseOrderService.java
...inalproject/warehouse/services/WarehouseOrderService.java
+23
-2
No files found.
frontend/package-lock.json
View file @
d9cdaecc
This source diff could not be displayed because it is too large. You can
view the blob
instead.
pom.xml
View file @
d9cdaecc
...
@@ -59,7 +59,17 @@
...
@@ -59,7 +59,17 @@
<scope>
test
</scope>
<scope>
test
</scope>
</dependency>
</dependency>
<dependency>
<groupId>
org.mongodb
</groupId>
<artifactId>
mongodb-driver-sync
</artifactId>
<version>
4.0.5
</version>
</dependency>
<dependency>
<groupId>
org.mongodb
</groupId>
<artifactId>
mongodb-driver-sync
</artifactId>
<version>
4.0.5
</version>
</dependency>
<dependency>
<groupId>
org.apache.httpcomponents
</groupId>
<artifactId>
httpclient
</artifactId>
<scope>
test
</scope>
</dependency>
</dependencies>
</dependencies>
<build>
<build>
...
...
src/main/java/com/ascendfinalproject/warehouse/controllers/WarehouseController.java
View file @
d9cdaecc
...
@@ -14,14 +14,28 @@ public class WarehouseController {
...
@@ -14,14 +14,28 @@ public class WarehouseController {
@Autowired
@Autowired
WarehouseOrderService
orderService
;
WarehouseOrderService
orderService
;
@CrossOrigin
@GetMapping
(
value
=
"/orders"
)
@GetMapping
(
value
=
"/orders"
)
public
Flux
<
WarehouseOrder
>
getOrders
()
{
public
Flux
<
WarehouseOrder
>
getOrders
()
{
return
orderService
.
getOrders
();
return
orderService
.
getOrders
();
}
}
@CrossOrigin
@GetMapping
(
"/orders/{id}"
)
public
Mono
<
WarehouseOrder
>
findStudent
(
@PathVariable
String
id
){
return
orderService
.
findOrderById
(
id
);
}
@CrossOrigin
@PostMapping
(
value
=
"/orders"
)
@PostMapping
(
value
=
"/orders"
)
public
Mono
<
WarehouseOrder
>
createOrder
(
@RequestBody
WarehouseOrder
order
)
{
public
Mono
<
WarehouseOrder
>
createOrder
(
@RequestBody
WarehouseOrder
order
)
{
return
orderService
.
createOrder
(
order
);
return
orderService
.
createOrder
(
order
);
}
}
@CrossOrigin
@PutMapping
(
value
=
"/orders/{id}"
)
public
Mono
<
WarehouseOrder
>
updateOrder
(
@RequestBody
WarehouseOrder
order
,
@PathVariable
(
value
=
"id"
)
String
id
)
{
return
orderService
.
updateOrder
(
order
,
id
);
}
}
}
src/main/java/com/ascendfinalproject/warehouse/models/OrderResponse.java
0 → 100644
View file @
d9cdaecc
package
com
.
ascendfinalproject
.
warehouse
.
models
;
import
lombok.Getter
;
import
lombok.Setter
;
import
java.util.HashMap
;
import
java.util.List
;
@Getter
@Setter
public
class
OrderResponse
{
private
List
<
String
>
allIds
;
private
HashMap
<
String
,
WarehouseOrder
>
byId
;
public
void
appendId
(
String
id
)
{
allIds
.
add
(
id
);
}
}
src/main/java/com/ascendfinalproject/warehouse/services/WarehouseOrderService.java
View file @
d9cdaecc
...
@@ -3,7 +3,6 @@ package com.ascendfinalproject.warehouse.services;
...
@@ -3,7 +3,6 @@ package com.ascendfinalproject.warehouse.services;
import
com.ascendfinalproject.warehouse.models.WarehouseOrder
;
import
com.ascendfinalproject.warehouse.models.WarehouseOrder
;
import
com.ascendfinalproject.warehouse.repositories.WarehouseOrderRepository
;
import
com.ascendfinalproject.warehouse.repositories.WarehouseOrderRepository
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.data.mongodb.repository.ReactiveMongoRepository
;
import
org.springframework.stereotype.Service
;
import
org.springframework.stereotype.Service
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Flux
;
import
reactor.core.publisher.Mono
;
import
reactor.core.publisher.Mono
;
...
@@ -14,12 +13,34 @@ public class WarehouseOrderService {
...
@@ -14,12 +13,34 @@ public class WarehouseOrderService {
@Autowired
@Autowired
WarehouseOrderRepository
orderRepository
;
WarehouseOrderRepository
orderRepository
;
public
Mono
<
WarehouseOrder
>
findOrderById
(
String
id
)
{
return
orderRepository
.
findById
(
id
);
}
public
Flux
<
WarehouseOrder
>
getOrders
()
{
public
Flux
<
WarehouseOrder
>
getOrders
()
{
return
orderRepository
.
findAll
();
return
orderRepository
.
findAll
();
// OrderResponse response = new OrderResponse();
// orderRepository.findAll()
// .flatMap(order -> {
// response.appendId(order.getId());
// response.getById().put(order.getId(), order);
// });
//
// return response;
}
}
public
Mono
<
WarehouseOrder
>
createOrder
(
WarehouseOrder
order
)
{
public
Mono
<
WarehouseOrder
>
createOrder
(
WarehouseOrder
order
)
{
return
orderRepository
.
save
(
order
);
return
orderRepository
.
save
(
order
);
}
}
public
Mono
<
WarehouseOrder
>
updateOrder
(
WarehouseOrder
order
,
String
id
)
{
return
orderRepository
.
findById
(
id
)
.
flatMap
(
existingOrder
->
{
existingOrder
.
setOrderId
(
order
.
getOrderId
());
existingOrder
.
setStatus
(
order
.
getStatus
());
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