Use correct collection for metap functions

Author: naglepuff

nmdc_server/ingest/all.py

@@ -225,7 +225,7 @@ def load(db: Session, function_limit=None, skip_annotation=False):
             ),
             pipeline.load_mp_analysis,
             WorkflowActivityTypeEnum.metaproteomic_analysis.value,
-            annotations=mongodb["functional_annotation_agg"],
+            annotations=mongodb["metap_gene_function_aggregation"],
             function_limit=function_limit,
         )
         db.commit()

nmdc_server/ingest/pipeline.py

@@ -88,7 +88,7 @@ def load_mp_analysis(db: Session, obj: Dict[str, Any], **kwargs) -> LoadObjectRe
 
     query = annotations.find(
         {
-            "was_generated_by": pipeline.id,
+            "metaproteomic_analysis_id": pipeline.id,
             "gene_function_id": {
                 "$regex": gene_regex,
             },
@@ -97,7 +97,7 @@ def load_mp_analysis(db: Session, obj: Dict[str, Any], **kwargs) -> LoadObjectRe
         no_cursor_timeout=True,
         projection={
             "_id": False,
-            "was_generated_by": True,
+            "metaproteomic_analysis_id": True,
             "count": True,
             "gene_function_id": True,
             "best_protein": True,