yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-26 09:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix #1527: List locations is not including the service and the serviceType in the result (#1530)

Browse Source
This commit is contained in:
Alberto Miorin 2021-12-03 03:54:14 +01:00 committed by GitHub
parent 13fb6b5c96
commit b7711bf21a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
catalog-rest-service/src/main/java/org/openmetadata/catalog/jdbi3/LocationRepository.java
View File

@ -17,6 +17,7 @@ import com.fasterxml.jackson.core.JsonProcessingException;
import org.jdbi.v3.sqlobject.transaction.Transaction; import org.jdbi.v3.sqlobject.transaction.Transaction;
import org.openmetadata.catalog.Entity; import org.openmetadata.catalog.Entity;
import org.openmetadata.catalog.entity.data.Location; import org.openmetadata.catalog.entity.data.Location;
import org.openmetadata.catalog.entity.services.StorageService;
import org.openmetadata.catalog.exception.CatalogExceptionMessage; import org.openmetadata.catalog.exception.CatalogExceptionMessage;
import org.openmetadata.catalog.resources.locations.LocationResource; import org.openmetadata.catalog.resources.locations.LocationResource;
import org.openmetadata.catalog.type.ChangeDescription; import org.openmetadata.catalog.type.ChangeDescription;
@ -57,8 +58,8 @@ public class LocationRepository extends EntityRepository<Location> {
@Override @Override
public Location setFields(Location location, Fields fields) throws IOException { public Location setFields(Location location, Fields fields) throws IOException {
location.setService(getService(location));
location.setOwner(fields.contains("owner") ? getOwner(location) : null); location.setOwner(fields.contains("owner") ? getOwner(location) : null);
location.setService(fields.contains("service") ? getService(location) : null);
location.setFollowers(fields.contains("followers") ? getFollowers(location) : null); location.setFollowers(fields.contains("followers") ? getFollowers(location) : null);
location.setTags(fields.contains("tags") ? getTags(location.getFullyQualifiedName()) : null); location.setTags(fields.contains("tags") ? getTags(location.getFullyQualifiedName()) : null);
return location; return location;
@ -142,17 +143,21 @@ public class LocationRepository extends EntityRepository<Location> {
return EntityUtil.populateOwner(dao.userDAO(), dao.teamDAO(), location.getOwner()); return EntityUtil.populateOwner(dao.userDAO(), dao.teamDAO(), location.getOwner());
} }
private StorageService getService(UUID serviceId, String entityType) throws IOException {
if (entityType.equalsIgnoreCase(Entity.STORAGE_SERVICE)) {
return dao.storageServiceDAO().findEntityById(serviceId);
}
throw new IllegalArgumentException(CatalogExceptionMessage.invalidServiceEntity(entityType, Entity.LOCATION));
}
@Override @Override
public void prepare(Location location) throws IOException { public void prepare(Location location) throws IOException {
EntityReference storageService = getService(location.getService()); StorageService storageService = getService(location.getService().getId(), location.getService().getType());
location.setService(storageService); location.setService(new StorageServiceRepository.StorageServiceEntityInterface(storageService)
// Set data in location entity based on storage relationship .getEntityReference());
location.setServiceType(storageService.getServiceType());
location.setFullyQualifiedName(getFQN(location)); location.setFullyQualifiedName(getFQN(location));
EntityUtil.populateOwner(dao.userDAO(), dao.teamDAO(), location.getOwner()); // Validate owner
// Check if owner is valid and set the relationship
location.setOwner(EntityUtil.populateOwner(dao.userDAO(), dao.teamDAO(), location.getOwner()));
// Validate location tags and add derived tags to the list
location.setTags(EntityUtil.addDerivedTags(dao.tagDAO(), location.getTags())); location.setTags(EntityUtil.addDerivedTags(dao.tagDAO(), location.getTags()));
} }

3
catalog-rest-service/src/test/java/org/openmetadata/catalog/resources/locations/LocationResourceTest.java
View File

@ -674,7 +674,8 @@ public class LocationResourceTest extends CatalogApplicationTest {
location = byName ? getLocationByName(location.getFullyQualifiedName(), fields, adminAuthHeaders()) : location = byName ? getLocationByName(location.getFullyQualifiedName(), fields, adminAuthHeaders()) :
getLocation(location.getId(), fields, adminAuthHeaders()); getLocation(location.getId(), fields, adminAuthHeaders());
assertNotNull(location.getOwner()); assertNotNull(location.getOwner());
assertNull(location.getService()); assertNotNull(location.getService()); // We always return the service
assertNotNull(location.getServiceType()); // We always return the service
// .../locations?fields=owner,service // .../locations?fields=owner,service
fields = "owner,service"; fields = "owner,service";