diff --git a/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts b/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts index fee61cb366..0107c5cd8d 100644 --- a/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts +++ b/plugins/catalog-backend/src/next/CatalogProcessingOrchestratorImpl.ts @@ -97,7 +97,7 @@ export class CatalogProcessingOrchestratorImpl async process( request: EntityProcessingRequest, ): Promise { - const { entity, eager, state } = request; + const { entity } = request; const result = await this.processSingleEntity(entity); diff --git a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts index b7e860cce2..b196d63897 100644 --- a/plugins/catalog-backend/src/next/NextCatalogBuilder.ts +++ b/plugins/catalog-backend/src/next/NextCatalogBuilder.ts @@ -269,7 +269,7 @@ export class NextCatalogBuilder { parser, policy, }); - const entitiesCatalog = new NextEntitiesCatalog(dbClient, logger); + const entitiesCatalog = new NextEntitiesCatalog(dbClient); const locationStore = new LocationStoreImpl(db); const dbLocationProvider = new DatabaseLocationProvider(locationStore); diff --git a/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts b/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts index 39d3bf2a63..5bddd47f41 100644 --- a/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts +++ b/plugins/catalog-backend/src/next/NextEntitiesCatalog.ts @@ -14,17 +14,13 @@ * limitations under the License. */ -import { Logger } from 'winston'; import { Knex } from 'knex'; import { DbFinalEntitiesRow } from './Stitcher'; import { EntitiesCatalog } from '../catalog'; import { EntitiesRequest, EntitiesResponse } from '../catalog/types'; export class NextEntitiesCatalog implements EntitiesCatalog { - constructor( - private readonly database: Knex, - private readonly logger: Logger, - ) {} + constructor(private readonly database: Knex) {} async entities(request?: EntitiesRequest): Promise { if (request?.fields) { diff --git a/plugins/catalog-backend/src/next/Stitcher.ts b/plugins/catalog-backend/src/next/Stitcher.ts index 29e7363b80..f79a247b91 100644 --- a/plugins/catalog-backend/src/next/Stitcher.ts +++ b/plugins/catalog-backend/src/next/Stitcher.ts @@ -78,11 +78,7 @@ export class Stitcher { ) .where({ target_entity_id: entity.metadata.uid }) .count({ reference_count: 'target_entity_id' }); - console.log( - 'DEBUG: reference_count_result =', - reference_count_result, - entityId, - ); + if (Number(reference_count_result.reference_count) === 0) { this.logger.debug(`${entityRef} is orphan`); entity.metadata.annotations = { @@ -103,7 +99,6 @@ export class Stitcher { entity.metadata.generation = 1; const etag = generateEntityEtag(entity); entity.metadata.etag = etag; - console.log(JSON.stringify(entity, null, 2)); await tx('final_entities') .insert({ finalized_entity: JSON.stringify(entity),