Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
inventory-service
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
inventory-service
Commits
67ebf5fa
Commit
67ebf5fa
authored
May 06, 2021
by
Khai Yuan Liew
Browse files
Options
Browse Files
Download
Plain Diff
[AFP-58] Fixed merge conflict with dev
parents
76cfd59e
9353e892
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
89 additions
and
4 deletions
+89
-4
WebFluxConfig.java
...m/nisum/ascend/inventory/configuration/WebFluxConfig.java
+10
-0
ProductController.java
.../nisum/ascend/inventory/controller/ProductController.java
+10
-1
ResourceAlreadyExistsException.java
...d/inventory/exception/ResourceAlreadyExistsException.java
+12
-0
RestWebExceptionHandler.java
...m/ascend/inventory/exception/RestWebExceptionHandler.java
+25
-0
Product.java
src/main/java/com/nisum/ascend/inventory/model/Product.java
+1
-0
ProductService.java
...va/com/nisum/ascend/inventory/service/ProductService.java
+5
-1
ProductControllerTest.java
...um/ascend/inventory/controller/ProductControllerTest.java
+20
-2
application-test.properties
src/test/resources/application-test.properties
+6
-0
No files found.
src/main/java/com/nisum/ascend/inventory/configuration/WebFluxConfig.java
0 → 100644
View file @
67ebf5fa
package
com
.
nisum
.
ascend
.
inventory
.
configuration
;
import
org.springframework.context.annotation.Configuration
;
import
org.springframework.web.reactive.config.EnableWebFlux
;
import
org.springframework.web.reactive.config.WebFluxConfigurer
;
@Configuration
@EnableWebFlux
public
class
WebFluxConfig
implements
WebFluxConfigurer
{
}
src/main/java/com/nisum/ascend/inventory/controller/ProductController.java
View file @
67ebf5fa
package
com
.
nisum
.
ascend
.
inventory
.
controller
;
import
com.nisum.ascend.inventory.dto.ProductDto
;
import
com.nisum.ascend.inventory.exception.ResourceAlreadyExistsException
;
import
com.nisum.ascend.inventory.model.Product
;
import
org.springframework.beans.factory.annotation.Autowired
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.http.ResponseEntity
;
...
...
@@ -12,6 +14,8 @@ import org.springframework.web.bind.annotation.RequestMapping;
import
org.springframework.web.bind.annotation.RestController
;
import
reactor.core.publisher.Mono
;
import
reactor.core.publisher.Flux
;
import
org.springframework.web.bind.annotation.PostMapping
;
import
org.springframework.web.bind.annotation.RequestBody
;
@RestController
@RequestMapping
(
"/api/products"
)
...
...
@@ -37,4 +41,9 @@ public class ProductController {
public
ResponseEntity
<
Flux
<
ProductDto
>>
getAllProducts
()
{
return
ResponseEntity
.
ok
(
productService
.
findAllProducts
());
}
}
@PostMapping
(
""
)
public
Mono
<
ProductDto
>
postProduct
(
@RequestBody
Product
product
)
{
return
productService
.
createProduct
(
product
).
onErrorMap
(
throwable
->
new
ResourceAlreadyExistsException
());
}
}
\ No newline at end of file
src/main/java/com/nisum/ascend/inventory/exception/ResourceAlreadyExistsException.java
0 → 100644
View file @
67ebf5fa
package
com
.
nisum
.
ascend
.
inventory
.
exception
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.web.bind.annotation.ResponseStatus
;
@ResponseStatus
(
value
=
HttpStatus
.
NOT_ACCEPTABLE
)
public
class
ResourceAlreadyExistsException
extends
RuntimeException
{
public
ResourceAlreadyExistsException
()
{
super
(
"A resource with the provided SKU already exists"
);
}
}
src/main/java/com/nisum/ascend/inventory/exception/RestWebExceptionHandler.java
0 → 100644
View file @
67ebf5fa
package
com
.
nisum
.
ascend
.
inventory
.
exception
;
import
com.mongodb.DuplicateKeyException
;
import
org.springframework.core.annotation.Order
;
import
org.springframework.http.HttpStatus
;
import
org.springframework.stereotype.Component
;
import
org.springframework.web.server.ServerWebExchange
;
import
org.springframework.web.server.WebExceptionHandler
;
import
reactor.core.publisher.Mono
;
@Component
@Order
(-
2
)
class
RestWebExceptionHandler
implements
WebExceptionHandler
{
@Override
public
Mono
<
Void
>
handle
(
ServerWebExchange
exchange
,
Throwable
ex
)
{
if
(
ex
instanceof
ResourceAlreadyExistsException
)
{
exchange
.
getResponse
().
setStatusCode
(
HttpStatus
.
NOT_ACCEPTABLE
);
// marks the response as complete and forbids writing to it
return
exchange
.
getResponse
().
setComplete
();
}
return
Mono
.
error
(
ex
);
}
}
src/main/java/com/nisum/ascend/inventory/model/Product.java
View file @
67ebf5fa
...
...
@@ -24,6 +24,7 @@ public class Product {
private
String
brand
;
private
String
category
;
public
Product
()
{}
public
Product
(
String
sku
,
String
upc
,
String
productName
,
String
productDescription
,
float
price
,
int
availableStock
,
String
productImageUrl
,
String
brand
,
String
category
)
{
this
.
sku
=
sku
;
...
...
src/main/java/com/nisum/ascend/inventory/service/ProductService.java
View file @
67ebf5fa
...
...
@@ -8,7 +8,6 @@ import org.springframework.stereotype.Service;
import
reactor.core.publisher.Flux
;
import
com.nisum.ascend.inventory.repository.ProductRepository
;
import
reactor.core.publisher.Mono
;
import
static
com
.
nisum
.
ascend
.
inventory
.
dto
.
ProductDto
.
generateDtoFromProduct
;
@Service
...
...
@@ -35,4 +34,9 @@ public class ProductService {
.
map
(
ProductDto:
:
generateDtoFromProduct
);
}
public
Mono
<
ProductDto
>
createProduct
(
Product
product
)
{
return
productRepository
.
save
(
product
)
.
map
(
ProductDto:
:
generateDtoFromProduct
);
}
}
src/test/java/com/nisum/ascend/inventory/controller/ProductControllerTest.java
View file @
67ebf5fa
...
...
@@ -6,6 +6,7 @@ import com.nisum.ascend.inventory.repository.ProductRepository;
import
com.nisum.ascend.inventory.service.ProductService
;
import
com.nisum.ascend.inventory.controller.ProductController
;
import
com.nisum.ascend.inventory.model.Product
;
import
lombok.extern.slf4j.Slf4j
;
import
org.junit.jupiter.api.BeforeEach
;
import
org.junit.jupiter.api.Test
;
...
...
@@ -34,6 +35,11 @@ import java.util.List;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertNotNull
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.
assertTrue
;
import
reactor.core.publisher.Mono
;
import
java.util.UUID
;
import
static
org
.
junit
.
jupiter
.
api
.
Assertions
.*;
@ExtendWith
(
SpringExtension
.
class
)
@SpringBootTest
(
webEnvironment
=
SpringBootTest
.
WebEnvironment
.
RANDOM_PORT
)
...
...
@@ -95,7 +101,6 @@ class ProductControllerTest {
});
}
/*
If you want to do this test, make sure to insert the following in MongoDB Atlas:
,
...
...
@@ -122,5 +127,18 @@ class ProductControllerTest {
System
.
out
.
println
(
"Deletion Successful. Ending test..."
);
}
@Test
void
postProduct
()
{
String
sku
=
"SH="
+
UUID
.
randomUUID
();
Product
product
=
new
Product
(
sku
,
"3d2dsd9cm"
,
"Red Sweater"
,
"A Nice red sweater"
,
(
float
)
23.99
,
45
,
""
,
"SweatCo"
,
"Sweatshirts"
);
webTestClient
.
post
().
uri
(
"/api/products"
)
.
contentType
(
MediaType
.
valueOf
(
MediaType
.
APPLICATION_JSON_VALUE
))
.
body
(
Mono
.
just
(
product
),
Product
.
class
)
.
exchange
()
.
expectStatus
().
isOk
()
.
expectBody
()
.
jsonPath
(
"$.sku"
,
sku
);
}
}
\ No newline at end of file
src/test/resources/application-test.properties
0 → 100644
View file @
67ebf5fa
spring.config.import
=
classpath:secret.properties
server.port
=
8080
spring.data.mongodb.uri
=
mongodb+srv://admin:${db.password}@inventory-promotions.d4nfz.mongodb
\
.net/${spring.data.mongodb.database}?retryWrites=true&w=majority
spring.data.mongodb.database
=
test
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