-
Notifications
You must be signed in to change notification settings - Fork 0
refactor(knowledge): hide asset reads behind owner query #252
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.
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
Merged
Merged
Changes from all commits
Commits
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
97 changes: 97 additions & 0 deletions
97
core/src/main/java/com/orgmemory/core/knowledge/asset/JpaKnowledgeAssetRetrievalQuery.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,97 @@ | ||
| package com.orgmemory.core.knowledge.asset; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Objects; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
| import org.springframework.stereotype.Service; | ||
| import org.springframework.transaction.annotation.Transactional; | ||
|
|
||
| @Service | ||
| @Transactional(readOnly = true) | ||
| class JpaKnowledgeAssetRetrievalQuery implements KnowledgeAssetRetrievalQuery { | ||
|
|
||
| private final KnowledgeAssetRepository assets; | ||
| private final KnowledgeAssetVersionRepository versions; | ||
|
|
||
| JpaKnowledgeAssetRetrievalQuery( | ||
| KnowledgeAssetRepository assets, | ||
| KnowledgeAssetVersionRepository versions) { | ||
| this.assets = assets; | ||
| this.versions = versions; | ||
| } | ||
|
|
||
| @Override | ||
| public boolean exists(UUID organizationId, UUID knowledgeAssetId) { | ||
| return assets.existsByIdAndOrganizationId( | ||
| Objects.requireNonNull(knowledgeAssetId, "knowledgeAssetId"), | ||
| Objects.requireNonNull(organizationId, "organizationId")); | ||
| } | ||
|
|
||
| @Override | ||
| public List<KnowledgeAssetAuthorizationScope> findActiveAuthorizationScopes( | ||
| UUID organizationId, | ||
| Collection<UUID> knowledgeAssetIds) { | ||
| UUID tenantId = Objects.requireNonNull(organizationId, "organizationId"); | ||
| List<UUID> ids = immutableIds(knowledgeAssetIds, "knowledgeAssetIds"); | ||
| if (ids.isEmpty()) { | ||
| return List.of(); | ||
| } | ||
| return List.copyOf(assets.findActiveAuthorizationScopes( | ||
| tenantId, | ||
| ids)); | ||
| } | ||
|
|
||
| @Override | ||
| public List<KnowledgeCatalogItem> findCurrentCatalogItems( | ||
| UUID organizationId, | ||
| Collection<UUID> authorizedKnowledgeAssetIds) { | ||
| UUID tenantId = Objects.requireNonNull(organizationId, "organizationId"); | ||
| List<UUID> ids = immutableIds( | ||
| authorizedKnowledgeAssetIds, | ||
| "authorizedKnowledgeAssetIds"); | ||
| if (ids.isEmpty()) { | ||
| return List.of(); | ||
| } | ||
| return List.copyOf(versions.findCurrentCatalogItems( | ||
| tenantId, | ||
| ids)); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<KnowledgeCatalogItem> findCurrentCatalogItem( | ||
| UUID organizationId, | ||
| UUID knowledgeAssetId, | ||
| UUID knowledgeVersionId) { | ||
| return versions.findCurrentCatalogItem( | ||
| Objects.requireNonNull(organizationId, "organizationId"), | ||
| Objects.requireNonNull(knowledgeAssetId, "knowledgeAssetId"), | ||
| Objects.requireNonNull(knowledgeVersionId, "knowledgeVersionId")); | ||
| } | ||
|
|
||
| @Override | ||
| public Optional<KnowledgeCatalogItem> findCurrentCatalogItemByVersion( | ||
| UUID organizationId, | ||
| UUID knowledgeVersionId, | ||
| Collection<UUID> authorizedKnowledgeAssetIds) { | ||
| UUID tenantId = Objects.requireNonNull(organizationId, "organizationId"); | ||
| UUID versionId = Objects.requireNonNull(knowledgeVersionId, "knowledgeVersionId"); | ||
| List<UUID> ids = immutableIds( | ||
| authorizedKnowledgeAssetIds, | ||
| "authorizedKnowledgeAssetIds"); | ||
| if (ids.isEmpty()) { | ||
| return Optional.empty(); | ||
| } | ||
| return versions.findCurrentCatalogItemByVersion( | ||
| tenantId, | ||
| versionId, | ||
| ids); | ||
| } | ||
|
|
||
| private static List<UUID> immutableIds( | ||
| Collection<UUID> ids, | ||
| String name) { | ||
| return List.copyOf(Objects.requireNonNull(ids, name)); | ||
| } | ||
| } |
35 changes: 35 additions & 0 deletions
35
core/src/main/java/com/orgmemory/core/knowledge/asset/KnowledgeAssetRetrievalQuery.java
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,35 @@ | ||
| package com.orgmemory.core.knowledge.asset; | ||
|
|
||
| import java.util.Collection; | ||
| import java.util.List; | ||
| import java.util.Optional; | ||
| import java.util.UUID; | ||
|
|
||
| /** | ||
| * Asset-owned read boundary for permission-aware retrieval and catalog federation. | ||
| * | ||
| * <p>Implementations enforce organization ownership plus the active/current lifecycle predicates | ||
| * represented by each method. | ||
| */ | ||
| public interface KnowledgeAssetRetrievalQuery { | ||
|
|
||
| boolean exists(UUID organizationId, UUID knowledgeAssetId); | ||
|
|
||
| List<KnowledgeAssetAuthorizationScope> findActiveAuthorizationScopes( | ||
| UUID organizationId, | ||
| Collection<UUID> knowledgeAssetIds); | ||
|
|
||
| List<KnowledgeCatalogItem> findCurrentCatalogItems( | ||
| UUID organizationId, | ||
| Collection<UUID> authorizedKnowledgeAssetIds); | ||
|
|
||
| Optional<KnowledgeCatalogItem> findCurrentCatalogItem( | ||
| UUID organizationId, | ||
| UUID knowledgeAssetId, | ||
| UUID knowledgeVersionId); | ||
|
|
||
| Optional<KnowledgeCatalogItem> findCurrentCatalogItemByVersion( | ||
| UUID organizationId, | ||
| UUID knowledgeVersionId, | ||
| Collection<UUID> authorizedKnowledgeAssetIds); | ||
| } |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.