fix: correct way to join attachments with datasets (#2131)

<!--
Follow semantic-release guidelines for the PR title, which is used in
the changelog.

Title should follow the format `<type>(<scope>): <subject>`, where
- Type is one of:
build|chore|ci|docs|feat|fix|perf|refactor|revert|style|test|BREAKING
CHANGE
- Scope (optional) describes the place of the change (eg a particular
milestone) and is usually omitted
- subject should be a non-capitalized one-line description in present
imperative tense and not ending with a period

See
https://github.com/angular/angular.js/blob/master/DEVELOPERS.md#-git-commit-guidelines
for more details.
-->

## Description
<!-- Short description of the pull request -->
Fixes the way a lookup on Attachments from Datasets is done, issue #2130
## Motivation
<!-- Background on use case, changes needed -->

## Fixes
<!-- Please provide a list of the issues fixed by this PR -->

* Bug fixed (#2130)
the lookup structure is now reflecting the attachment's true output dto
## Changes:
<!-- Please provide a list of the changes implemented by this PR -->

* changes made

## Tests included

- [x] Included for each change/fix?
- [ ] Passing? <!-- Merge will not be approved unless tests pass -->

## Documentation
- [ ] swagger documentation updated (required for API changes)
- [ ] official documentation updated

### official documentation info
<!-- If you have updated the official documentation, please provide PR #
and URL of the updated pages -->

Author: sofyalaski

src/datasets/types/dataset-lookup.ts

@@ -50,9 +50,28 @@ export const DATASET_LOOKUP_FIELDS: Record<
   attachments: {
     $lookup: {
       from: "Attachment",
-      localField: "pid",
-      foreignField: "datasetId",
       as: "",
+      let: { pid: "$pid" },
+      pipeline: [
+        {
+          $match: {
+            $expr: {
+              $anyElementTrue: {
+                $map: {
+                  input: "$relationships",
+                  as: "relationship",
+                  in: {
+                    $and: [
+                      { $eq: ["$$relationship.targetId", "$$pid"] },
+                      { $eq: ["$$relationship.targetType", "dataset"] },
+                    ],
+                  },
+                },
+              },
+            },
+          },
+        },
+      ],
     },
   },
   samples: {

test/DatasetV4Access.js

@@ -3,6 +3,7 @@
 
 const utils = require("./LoginUtils");
 const { TestData } = require("./TestData");
+const { v4: uuidv4 } = require("uuid");
 
 let user1Token = null;
 let user2Token = null;
@@ -18,13 +19,15 @@ let origDatablockData1 = {
   ...TestData.OrigDataBlockCorrect1,
   datasetId: null,
 };
+let attachmentId = null;
 
 describe("2700: Datasets v4 access tests", () => {
   before(async () => {
     db.collection("Dataset").deleteMany({});
     db.collection("Proposal").deleteMany({});
     db.collection("Instrument").deleteMany({});
     db.collection("Sample").deleteMany({});
+    db.collection("Attachment").deleteMany({});
 
     accessTokenAdminIngestor = await utils.getToken(appUrl, {
       username: "adminIngestor",
@@ -126,6 +129,31 @@ describe("2700: Datasets v4 access tests", () => {
       .send({ ...TestData.CustomDatasetCorrect })
       .auth(accessTokenAdminIngestor, { type: "bearer" })
       .expect(TestData.EntryCreatedStatusCode);
+
+    const attachment = {
+      ...TestData.AttachmentCorrectV4,
+      relationships: [
+        {
+          targetId: derivedDatasetMinPid,
+          targetType: "dataset",
+        },
+        {
+          targetId: sampleId,
+          targetType: "sample",
+        },
+      ],
+      aid: uuidv4(),
+    };
+
+    await request(appUrl)
+      .post("/api/v4/attachments")
+      .send(attachment)
+      .auth(accessTokenAdminIngestor, { type: "bearer" })
+      .expect(TestData.EntryCreatedStatusCode)
+      .expect("Content-Type", /json/)
+      .then((res) => {
+        attachmentId = res.body.aid;
+      });
   });
 
   async function deleteDataset(item) {
@@ -218,6 +246,7 @@ describe("2700: Datasets v4 access tests", () => {
           "samples",
           "origdatablocks",
           "datablocks",
+          "attachments",
         ],
       };
 
@@ -256,6 +285,13 @@ describe("2700: Datasets v4 access tests", () => {
           const [origdatablock] = firstDataset.origdatablocks;
           origdatablock.should.have.property("_id");
           origdatablock._id.should.be.eq(origDatablockId1);
+
+          firstDataset.should.have.property("attachments");
+          firstDataset.attachments.should.be.a("array");
+          firstDataset.attachments.should.have.length(1);
+          const [attachments] = firstDataset.attachments;
+          attachments.should.have.property("aid");
+          attachments.aid.should.be.eq(attachmentId);
         });
     });
   });