Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: removed org name #98

Merged
merged 1 commit into from
Jan 15, 2025
Merged

fix: removed org name #98

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 4 additions & 1 deletion docs/modules/onecx-product-store-bff/pages/onecx-product-store-bff-docs.adoc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,10 @@ app:
enabled: true
spec:
kcConfig:
defaultClientScopes: [ ocx-ps:all, ocx-ws:read, ocx-pm:read ]
defaultClientScopes: [ ocx-ps:all, ocx-pm:read ]
----

read ]
----

uct:
Expand Down
36 changes: 18 additions & 18 deletions src/test/java/org/tkit/onecx/product/store/bff/rs/ProductsRestControllerTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ void getProduct_shouldReturnProduct() {

Product data = createProduct("7a0ee705-8fd0-47b0-8205-b2a5f6540b9e", "0", offsetDateTime, null, offsetDateTime,
null, "test-appl2", "Here is some description 2", false,
"https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg",
"https://rndmImageUrl.rnmd/rndmImage.jpg",
"/app3", 0, "Product ABC", "Sun", "Themes, Menu");

// create mock rest endpoint
Expand Down Expand Up @@ -164,7 +164,7 @@ void getProductByName_test() {

Product data2 = createProduct("7a0ee705-8fd0-47b0-8205-b2a5f6540b9e", "0", offsetDateTime, null, offsetDateTime,
null, "test-appl50", "Here is some description 2", false,
"https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg",
"https://rndmImageUrl.rnmd/rndmImage.jpg",
"/app3", 0, "Product ABC", "Sun", "Themes, Menu");

// create mock rest endpoint
Expand Down Expand Up @@ -236,14 +236,14 @@ void createProduct_shouldAddNewProduct_whenNameAndBasePathAreUnique() {
classificationSet.add("Menu");
Product data = this.createProduct("ABCee705-8fd0-47b0-8205-b2a5f6540b9e", "0", offsetDateTime, null, offsetDateTime,
null, "test-appl35", "Here is some description", false,
"https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg",
"https://rndmImageUrl.rnmd/rndmImage.jpg",
"/app35", 0, "Product ABC", "Sun", "Themes,Menu");

CreateProductRequest request = new CreateProductRequest();
request.setBasePath("/app35");
request.setDescription("Here is some more description");
request.setName("test-appl35");
request.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
request.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
request.setDisplayName("Product ABC");
request.setIconName("Sun");
request.setVersion("0");
Expand All @@ -260,7 +260,7 @@ void createProduct_shouldAddNewProduct_whenNameAndBasePathAreUnique() {
requestDTO.setDescription("Here is some more description");
requestDTO.setName("test-appl35");
requestDTO
.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
requestDTO.setDisplayName("Product ABC");
requestDTO.setIconName("Sun");
requestDTO.setVersion("0");
Expand Down Expand Up @@ -344,7 +344,7 @@ void createProduct_shouldReturnBadRequest_whenBasePathIsNotUnique() {
request.setBasePath("/app6");
request.setDescription("Here is some description 2");
request.setName("test-appl2");
request.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
request.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
request.setDisplayName("Product ABC");
request.setIconName("Sun");
request.setVersion("0");
Expand All @@ -361,7 +361,7 @@ void createProduct_shouldReturnBadRequest_whenBasePathIsNotUnique() {
requestDTO.setDescription("Here is some description 2");
requestDTO.setName("test-appl2");
requestDTO
.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
requestDTO.setDisplayName("Product ABC");
requestDTO.setIconName("Sun");
requestDTO.setVersion("0");
Expand Down Expand Up @@ -425,7 +425,7 @@ void createProduct_shouldReturnBadRequest_whenRunningIntoValidationConstraints()
request.setBasePath("/app6");
request.setDescription("Here is some description 2");
request.setName(null);
request.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
request.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
request.setDisplayName("Product ABC");
request.setIconName("Sun");
request.setVersion("0");
Expand All @@ -442,7 +442,7 @@ void createProduct_shouldReturnBadRequest_whenRunningIntoValidationConstraints()
requestDTO.setDescription("Here is some description 2");
requestDTO.setName(null);
requestDTO
.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
requestDTO.setDisplayName("Product ABC");
requestDTO.setIconName("Sun");
requestDTO.setVersion("0");
Expand Down Expand Up @@ -553,7 +553,7 @@ void searchProducts_shouldReturnProductList_whenSearchCriteriaDoesMatch() {
ProductAbstract product = this.createProductAbstract("7a0ee705-8fd0-47b0-8205-b2a5f6540b9e", "0", dateTime,
null, dateTime,
null, "test-appl2", "Here is some description 2", false,
"https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg",
"https://rndmImageUrl.rnmd/rndmImage.jpg",
"/app3", 0, "MyName", "Times");

ProductPageResult data = new ProductPageResult();
Expand Down Expand Up @@ -665,14 +665,14 @@ void searchProducts_shouldReturnProductList_whenSearchCriteriaIsNotGivenButProdu
null,
dateTime,
null, "test-appl2", "Here is some description 2", false,
"https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg",
"https://rndmImageUrl.rnmd/rndmImage.jpg",
"/app3", 0, "Product 1", "Icon");

ProductAbstract productAbstractTwo = this.createProductAbstract("e72a1699-9e60-4531-9422-8c325bed7e6a", "0", dateTime,
"CSommer",
dateTime,
"CSommer", "test-appl5", "Here is some description 5", true,
"https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg",
"https://rndmImageUrl.rnmd/rndmImage.jpg",
"/app5", 1, "Product 2", "Sunny");

ProductPageResult data = new ProductPageResult();
Expand Down Expand Up @@ -813,7 +813,7 @@ void updateProduct_shouldUpdateProduct() {
request.setBasePath("/app3");
request.setDescription("Some changes");
request.setName("test-appl2");
request.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
request.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
request.setVersion("1.0.0");
request.setClassifications(null);
request.setIconName("Sunny");
Expand All @@ -827,7 +827,7 @@ void updateProduct_shouldUpdateProduct() {
updateProductRequestDTO.setDescription("Some changes");
updateProductRequestDTO.setName("test-appl2");
updateProductRequestDTO
.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
updateProductRequestDTO.setVersion("1.0.0");
updateProductRequestDTO.setClassifications(null);
updateProductRequestDTO.setIconName("Sunny");
Expand Down Expand Up @@ -863,7 +863,7 @@ void updateProduct_shouldReturnNotFound_whenProductIdDoesNotExist() {
request.setBasePath("/app3");
request.setDescription("Some changes");
request.setName("test-appl2");
request.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
request.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
request.setClassifications(null);
request.setIconName("Trash");
request.setVersion("1.0.0");
Expand All @@ -878,7 +878,7 @@ void updateProduct_shouldReturnNotFound_whenProductIdDoesNotExist() {
updateProductRequestDTO.setDescription("Some changes");
updateProductRequestDTO.setName("test-appl2");
updateProductRequestDTO
.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
updateProductRequestDTO.setClassifications(null);
updateProductRequestDTO.setIconName("Trash");
updateProductRequestDTO.setVersion("1.0.0");
Expand Down Expand Up @@ -933,7 +933,7 @@ void updateProduct_shouldReturnNotFound_whenRunningIntoValidationConstraints() {
request.setBasePath("/app15");
request.setDescription("Here is some description 2");
request.setName("test-appl10");
request.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
request.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
request.setVersion("1.0.0");
request.setIconName("Trash");
request.setClassifications(null);
Expand All @@ -952,7 +952,7 @@ void updateProduct_shouldReturnNotFound_whenRunningIntoValidationConstraints() {
requestDTO.setDescription("Here is some description 2");
requestDTO.setName("test-appl10");
requestDTO
.setImageUrl("https://prod.ucwe.capgemini.com/wp-content/uploads/2023/11/world-cloud-report-banner1_2023.jpg");
.setImageUrl("https://rndmImageUrl.rnmd/rndmImage.jpg");
requestDTO.version("1.0.0");
requestDTO.setIconName("Trash");
requestDTO.setClassifications(null);
Expand Down
Loading