small fixes

dmp-api.ts

@@ -4,8 +4,8 @@ import { v4 as uuidv4 } from "uuid";
 export function getToken() {
   return axios
     .post(`${process.env.DMP_HOST}/tokens`, {
-      email: "albert.einstein@example.com",
-      password: "password",
+      email: process.env.INGESTOR_EMAIL,
+      password: process.env.INGESTOR_PASSWORD,
     })
     .then(function (response) {
       axios.defaults.headers.common[
@@ -103,7 +103,7 @@ export function createQuestionnarie(proposalId: string) {
       name: `${proposalId}-DMP`,
       packageId: `${process.env.PACKAGE_ID}`,
       sharing: "RestrictedQuestionnaire",
-      tagUuids: ["302b1584-a7a2-4d9c-9770-eee990b002ec"],
+      tagUuids: [process.env.DMP_TAG], // Here I am using the Horizon 2020 template tag
       templateId: null,
       visibility: "PrivateQuestionnaire",
     })
@@ -127,7 +127,7 @@ export function createUser(
       lastName,
       firstName,
       role: "researcher",
-      password: "password",
+      password: "password", // this should be connected to your identity access solution instead of hardcoded
       affiliation,
     })
     .then(function (response) {

docker-compose.yml

@@ -73,10 +73,13 @@ services:
     image: "middleware"
     environment:
       DMP_HOST: "http://dsw-server:3000"
+      DMP_TAG: "302b1584-a7a2-4d9c-9770-eee990b002ec"
       RABBITMQ_HOST: "rabbitmq"
       RABBITMQ_USER: "guest"
       RABBITMQ_PASSWORD: "guest"
       PACKAGE_ID: "myorg:panosc-expands:2.0.6"
+      INGESTOR_EMAIL: "albert.einstein@example.com"
+      INGESTOR_PASSWORD: "password"
     depends_on:
       - rabbitmq
       - dsw-server

index.ts

@@ -27,14 +27,12 @@ async function start() {
 
   rabbitMq.listenOnBroadcast(async (type, message: unknown) => {
     console.log(type, message);
-    let userUuid = "";
-    let questionnaireUuid = "";
 
     if (type === "PROPOSAL_CREATED") {
       let acceptMessage = message as ProposalAcceptedMessage;
 
-      userUuid = await addUser(acceptMessage);
-      questionnaireUuid = await addDMP(acceptMessage, userUuid);
+      let userUuid = await addUser(acceptMessage);
+      await addDMP(acceptMessage, userUuid);
     } else if (type === "PROPOSAL_UPDATED") {
       await new Promise((resolve) => setTimeout(resolve, 5000, [])); // This is hacky but for the moment needed as a search right after a create will not find the DMP
       let acceptMessage = message as ProposalAcceptedMessage;
@@ -57,16 +55,27 @@ async function start() {
           }
           // Here is the place we can fetch and add calculations for instruments
           if (answer.questionId === "selection_from_options_instrument") {
+            console.log(answer.answer);
+            // @ts-ignore: Unreachable code error
+            console.log(instrumentInformation[answer.answer[0]].static);
             await changeQuestionAnswers(
-              questionnaireUuid,
-              instrumentInformation.NMX
+              questionnaireUuid, // @ts-ignore: Unreachable code error
+              instrumentInformation[answer.answer[0]].static
             );
 
             //Here we could do a simple lookup based on instrument and time allocated for a proposal
+            const days = parseInt(
+              answers.find((ans) => ans.questionId === "days_at_instrument")!
+                .answer
+            );
             await changeQuestionAnswer(
               questionnaireUuid,
               mapping.data_size,
-              "20 Gigabytes"
+              `${
+                // @ts-ignore: Unreachable code error
+                instrumentInformation[answer.answer[0]].dailyGigabyteIndex *
+                days
+              } Gigabytes`
             );
           }
         });

instrumentInformation.json

@@ -1,5 +1,6 @@
 {
-    "NMX": [
+    "NMX":{ 
+    "static" : [
     {
         "_comment": "File Formats",
         "path": "a3e9d35d-1835-4117-9ea8-13bf29a48241.f1a1e194-72db-46d4-b979-fb47527279ee", 
@@ -40,5 +41,8 @@
         },
         "type": "SetReplyEvent"
     }
-]
+],
+"dailyGigabyteIndex": 5
+}
+
 }