Merge pull request #12460 from BLasan/fix-api-product-type

Fix: Wrong APIProduct Type Returning on Search #12460
wso2 · Jun 10, 2024 · 96d86b0 · 96d86b0
2 parents 20b6441 + 3ea3d93
commit 96d86b0
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 3 deletions.
diff --git a/...rg.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java b/...rg.wso2.carbon.apimgt.impl/src/main/java/org/wso2/carbon/apimgt/impl/APIConsumerImpl.java
@@ -112,6 +112,7 @@
 import org.wso2.carbon.apimgt.impl.utils.APIAPIProductNameComparator;
 import org.wso2.carbon.apimgt.impl.utils.APIMWSDLReader;
 import org.wso2.carbon.apimgt.impl.utils.APINameComparator;
+import org.wso2.carbon.apimgt.impl.utils.APIProductNameComparator;
 import org.wso2.carbon.apimgt.impl.utils.APIUtil;
 import org.wso2.carbon.apimgt.impl.utils.APIVersionComparator;
 import org.wso2.carbon.apimgt.impl.utils.ApplicationUtils;
@@ -4148,6 +4149,7 @@ public Map<String, Object> searchPaginatedContent(String searchQuery, String org
         Map<Documentation, API> docMap = new HashMap<Documentation, API>();
         Map<String, Object> result = new HashMap<String, Object>();
         SortedSet<API> apiSet = new TreeSet<API>(new APINameComparator());
+        SortedSet<APIProduct> apiProductSet = new TreeSet<APIProduct>(new APIProductNameComparator());
         int totalLength = 0;
 
         String userame = (userNameWithoutChange != null) ? userNameWithoutChange : username;
@@ -4175,7 +4177,7 @@ public Map<String, Object> searchPaginatedContent(String searchQuery, String org
                                 docItem.getApiVersion()));
                         api.setUuid(docItem.getApiUUID());
                         docMap.put(doc, api);
-                    } else {
+                    } else if ("API".equals(item.getType())) {
                         DevPortalSearchContent publiserAPI = (DevPortalSearchContent) item;
                         API api = new API(new APIIdentifier(publiserAPI.getProvider(), publiserAPI.getName(),
                                 publiserAPI.getVersion()));
@@ -4193,10 +4195,27 @@ public Map<String, Object> searchPaginatedContent(String searchQuery, String org
                         api.setDescription(publiserAPI.getDescription());
                         api.setType(publiserAPI.getTransportType());
                         apiSet.add(api);
+                    } else if ("APIProduct".equals(item.getType())) {
+                        DevPortalSearchContent devAPIProduct = (DevPortalSearchContent) item;
+                        APIProduct apiProduct = new APIProduct(
+                                new APIProductIdentifier(devAPIProduct.getProvider(), devAPIProduct.getName(),
+                                        devAPIProduct.getVersion()));
+                        apiProduct.setUuid(devAPIProduct.getId());
+                        apiProduct.setContextTemplate(devAPIProduct.getContext());
+                        apiProduct.setState(devAPIProduct.getStatus());
+                        apiProduct.setType(devAPIProduct.getTransportType());
+                        apiProduct.setBusinessOwner(devAPIProduct.getBusinessOwner());
+                        apiProduct.setBusinessOwnerEmail(devAPIProduct.getBusinessOwnerEmail());
+                        apiProduct.setTechnicalOwner(devAPIProduct.getTechnicalOwner());
+                        apiProduct.setTechnicalOwnerEmail(devAPIProduct.getTechnicalOwnerEmail());
+                        apiProduct.setDescription(devAPIProduct.getDescription());
+                        apiProduct.setRating("0");// need to retrieve from db
+                        apiProductSet.add(apiProduct);
                     }
                 }
                 compoundResult.addAll(apiSet);
                 compoundResult.addAll(docMap.entrySet());
+                compoundResult.addAll(apiProductSet);
                 compoundResult.sort(new ContentSearchResultNameComparator());
                 result.put("length", sResults.getTotalCount());
             } else {

diff --git a/...persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java b/...persistence/src/main/java/org/wso2/carbon/apimgt/persistence/RegistryPersistenceImpl.java
@@ -1701,7 +1701,15 @@ public DevPortalContentSearchResult searchContentForDevPortal(Organization org,
                                 devAPI.setVisibility(apiArtifact.getAttribute(APIConstants.API_OVERVIEW_VISIBILITY));
                                 DevPortalSearchContent content = new DevPortalSearchContent();
                                 content.setContext(devAPI.getContext());
+                                String associatedType;
+                                if (apiArtifact.getAttribute(APIConstants.API_OVERVIEW_TYPE)
+                                        .equals(APIConstants.AuditLogConstants.API_PRODUCT)) {
+                                    associatedType = APIConstants.API_PRODUCT;
+                                } else {
+                                    associatedType = APIConstants.API;
+                                }
                                 content.setDescription(devAPI.getDescription());
+                                content.setType(associatedType);
                                 content.setId(devAPI.getId());
                                 content.setName(devAPI.getApiName());
                                 content.setProvider(

diff --git a/...nents/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml b/...nents/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/devportal-api.yaml
@@ -5319,6 +5319,7 @@ components:
           enum:
             - DOC
             - API
+            - APIProduct
         transportType:
           type: string
           description: Accepted values are HTTP, WS, SOAPTOREST, GRAPHQL

diff --git a/...i.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/SearchResultDTO.java b/...i.store.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/store/v1/dto/SearchResultDTO.java
@@ -29,7 +29,8 @@ public class SearchResultDTO   {
     @XmlEnum(String.class)
     public enum TypeEnum {
         DOC("DOC"),
-        API("API");
+        API("API"),
+        APIPRODUCT("APIProduct");
         private String value;
 
         TypeEnum (String v) {

diff --git a/.../main/java/org/wso2/carbon/apimgt/rest/api/store/v1/mappings/SearchResultMappingUtil.java b/.../main/java/org/wso2/carbon/apimgt/rest/api/store/v1/mappings/SearchResultMappingUtil.java
@@ -110,7 +110,7 @@ public static APISearchResultDTO fromAPIToAPIResultDTO(APIProduct apiProduct) {
         apiBusinessInformationDTO.setTechnicalOwner(apiProduct.getTechnicalOwner());
         apiBusinessInformationDTO.setTechnicalOwnerEmail(apiProduct.getTechnicalOwnerEmail());
         apiResultDTO.setBusinessInformation(apiBusinessInformationDTO);
-        apiResultDTO.setType(SearchResultDTO.TypeEnum.API);
+        apiResultDTO.setType(SearchResultDTO.TypeEnum.APIPRODUCT);
         apiResultDTO.setTransportType(apiProduct.getType());
         apiResultDTO.setDescription(apiProduct.getDescription());
         apiResultDTO.setStatus(apiProduct.getState());

diff --git a/...nts/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml b/...nts/apimgt/org.wso2.carbon.apimgt.rest.api.store.v1/src/main/resources/devportal-api.yaml
@@ -5319,6 +5319,7 @@ components:
           enum:
             - DOC
             - API
+            - APIProduct
         transportType:
           type: string
           description: Accepted values are HTTP, WS, SOAPTOREST, GRAPHQL