From 51af8be317cccd4669c1ad8e20483a2aec6b84ec Mon Sep 17 00:00:00 2001 From: pfurio Date: Fri, 21 Feb 2025 15:58:23 +0100 Subject: [PATCH] catalog: add missing CLINICAL resource to archive collections,#TASK-6445 --- .../catalog/db/mongodb/AuthorizationMongoDBAdaptor.java | 3 +++ .../catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java | 4 ++++ 2 files changed, 7 insertions(+) diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/AuthorizationMongoDBAdaptor.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/AuthorizationMongoDBAdaptor.java index ce8690d2c5..d160c9f6d6 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/AuthorizationMongoDBAdaptor.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/AuthorizationMongoDBAdaptor.java @@ -1203,6 +1203,9 @@ private MongoDBCollection getArchiveCollection(Enums.Resource resource) throws C return dbAdaptorFactory.getCatalogFamilyDBAdaptor().getArchiveFamilyCollection(); case WORKFLOW: return dbAdaptorFactory.getWorkflowDBAdaptor().getArchiveCollection(); + case CLINICAL: + case CLINICAL_ANALYSIS: + return dbAdaptorFactory.getClinicalAnalysisDBAdaptor().getArchiveCollection(); default: throw new CatalogDBException("Unexpected resource '" + resource + "' parameter received."); } diff --git a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java index 00fc2b1473..15a3a02cc2 100644 --- a/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java +++ b/opencga-catalog/src/main/java/org/opencb/opencga/catalog/db/mongodb/ClinicalAnalysisMongoDBAdaptor.java @@ -107,6 +107,10 @@ protected MongoDBCollection getCollection() { return clinicalCollection; } + public MongoDBCollection getArchiveCollection() { + return archiveClinicalCollection; + } + static void fixCommentsForRemoval(ObjectMap parameters) { if (parameters.get(COMMENTS.key()) == null) { return;