Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
import com.orgmemory.core.assetregistry.api.AssetRole;
import com.orgmemory.core.assetregistry.api.AssetType;
import com.orgmemory.core.assetregistry.api.AssetUnavailableException;
import com.orgmemory.core.assetregistry.AssetAuthorizationConvergenceService;
import com.orgmemory.core.assetregistry.authorization.AssetAuthorizationConvergenceService;
import com.orgmemory.core.assetregistry.AssetAvailability;
import com.orgmemory.core.assetregistry.AssetCatalogSort;
import com.orgmemory.core.assetregistry.AssetDeliveryService;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.orgmemory.worker.authorization;

import com.orgmemory.core.assetregistry.AssetAuthorizationConvergenceService;
import com.orgmemory.core.assetregistry.authorization.AssetAuthorizationConvergenceService;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
import org.springframework.boot.autoconfigure.condition.ConditionalOnProperty;
Expand Down

This file was deleted.

This file was deleted.

Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
package com.orgmemory.core.assetregistry;

import com.orgmemory.core.assetregistry.api.AssetType;
import jakarta.persistence.LockModeType;
import java.util.Collection;
import java.util.List;
import java.util.Optional;
import java.util.UUID;
import org.springframework.data.domain.Page;
import org.springframework.data.domain.Pageable;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.Repository;
import org.springframework.data.repository.query.Param;

interface AssetRepository extends JpaRepository<Asset, UUID> {
interface AssetCatalogReadModelRepository extends Repository<AssetDraft, UUID> {

String CATALOG_FROM_AND_PREDICATES = """
from Asset asset
Expand Down Expand Up @@ -109,22 +106,6 @@ like concat('%', :query, '%')
asset.id asc
""";

Optional<Asset> findByIdAndOrganizationId(UUID id, UUID organizationId);

@Lock(LockModeType.PESSIMISTIC_WRITE)
@Query("""
select asset
from Asset asset
where asset.id = :id
and asset.organizationId = :organizationId
""")
Optional<Asset> findForUpdate(
@Param("id") UUID id,
@Param("organizationId") UUID organizationId);

Optional<Asset> findByOrganizationIdAndNamespaceAndSlug(
UUID organizationId, String namespace, String slug);

@Query("""
select new com.orgmemory.core.assetregistry.AssetSummary(
asset.id,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,23 @@

import java.util.Optional;
import java.util.UUID;
import jakarta.persistence.LockModeType;
import org.springframework.data.jpa.repository.JpaRepository;
import org.springframework.data.jpa.repository.Lock;
import org.springframework.data.jpa.repository.Query;
import org.springframework.data.repository.query.Param;

interface AssetDraftRepository extends JpaRepository<AssetDraft, UUID> {

Optional<AssetDraft> findByAssetIdAndOrganizationId(UUID assetId, UUID organizationId);

@Lock(LockModeType.PESSIMISTIC_WRITE)
@Query("""
select draft from AssetDraft draft
where draft.assetId = :assetId
and draft.organizationId = :organizationId
""")
Optional<AssetDraft> findForUpdate(
@Param("assetId") UUID assetId,
@Param("organizationId") UUID organizationId);
Comment thread
coderabbitai[bot] marked this conversation as resolved.
}
Loading