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 minor bugs related to Organizations #12815

Merged
merged 1 commit into from
Jan 31, 2025
Merged

Fix minor bugs related to Organizations #12815

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
6 changes: 3 additions & 3 deletions ...i.admin.v1/src/gen/java/org/wso2/carbon/apimgt/rest/api/admin/v1/dto/OrganizationDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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;
}
Expand All @@ -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;
}
Expand Down
4 changes: 4 additions & 0 deletions .../main/java/org/wso2/carbon/apimgt/rest/api/admin/v1/impl/OrganizationsApiServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down
2 changes: 1 addition & 1 deletion components/apimgt/org.wso2.carbon.apimgt.rest.api.admin.v1/src/main/resources/admin-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4889,7 +4889,7 @@ components:
Organization:
title: Organization
required:
- organizationId
- externalOrganizationId
type: object
properties:
organizationId:
Expand Down
2 changes: 1 addition & 1 deletion components/apimgt/org.wso2.carbon.apimgt.rest.api.common/src/main/resources/admin-api.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4889,7 +4889,7 @@ components:
Organization:
title: Organization
required:
- organizationId
- externalOrganizationId
type: object
properties:
organizationId:
Expand Down