Merge pull request #12815 from NethmiRanasinghe/org_visibility

wso2 · Jan 31, 2025 · 8587622 · 8587622
2 parents 7f72857 + a8c07a3
commit 8587622
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/...i.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/OrganizationDTO.java b/...i.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/OrganizationDTO.java
@@ -35,9 +35,8 @@ public OrganizationDTO organizationId(String organizationId) {
   }
 
 
-  @ApiModelProperty(example = "ece92bdc-e1e6-325c-b6f4-656208a041e9", required = true, value = "UUID of the organization. ")
+  @ApiModelProperty(example = "ece92bdc-e1e6-325c-b6f4-656208a041e9", value = "UUID of the organization. ")
   @JsonProperty("organizationId")
-  @NotNull
   public String getOrganizationId() {
     return organizationId;
   }
@@ -54,8 +53,9 @@ public OrganizationDTO externalOrganizationId(String externalOrganizationId) {
   }
 
 
-  @ApiModelProperty(example = "ece92bdc-e1e6-325c-b6f4-656208a041e9", value = "External id of the organization. ")
+  @ApiModelProperty(example = "ece92bdc-e1e6-325c-b6f4-656208a041e9", required = true, value = "External id of the organization. ")
   @JsonProperty("externalOrganizationId")
+  @NotNull
   public String getExternalOrganizationId() {
     return externalOrganizationId;
   }

diff --git a/.../main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/OrganizationsApiServiceImpl.java b/.../main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/OrganizationsApiServiceImpl.java
@@ -130,6 +130,10 @@ public Response organizationsPost(OrganizationDTO organizationDTO, MessageContex
                 orgId = orgInfo.getOrganizationId();
                 organizationDTO.setParentOrganizationId(orgId); // set current users organization as parent id if available.
             }
+            if (organizationDTO.getParentOrganizationId() == null) {
+                throw new APIManagementException("Parent Organization not found",
+                        ExceptionCodes.MISSING_ORGANINATION);
+            }
             OrganizationDetailsDTO orgDto = OrganizationsMappingUtil.toOrganizationDetailsDTO(organizationDTO);
             orgDto.setTenantDomain(superOrganization);
             orgDto = apiAdmin.addOrganization(orgDto);

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml
@@ -4889,7 +4889,7 @@ components:
     Organization:
       title: Organization
       required:
-        - organizationId
+        - externalOrganizationId
       type: object
       properties:
         organizationId:

diff --git a/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/admin-api.yaml b/components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/admin-api.yaml
@@ -4889,7 +4889,7 @@ components:
     Organization:
       title: Organization
       required:
-        - organizationId
+        - externalOrganizationId
       type: object
       properties:
         organizationId: