fix merge conflict

okerekechinweotito · okerekechinweotito · commit adb11c1b8f57 · 2024-01-27T13:17:09.000+01:00
diff --git a/bull/trove-queue/producer.js b/bull/trove-queue/producer.js
@@ -16,7 +16,8 @@ module.exports = async (
   userName,
   isEmailNotification,
   isUploadCommons,
-  oauthToken
+  oauthToken,
+  commonsMetadata
 ) => {
   const uri = `https://trove.nla.gov.au/newspaper/article/${bookid}`;
   var options = {
@@ -35,6 +36,7 @@ module.exports = async (
   metaData["isEmailNotification"] = isEmailNotification;
   metaData["isUploadCommons"] = isUploadCommons;
   metaData["oauthToken"] = oauthToken;
+  metaData["commonsMetadata"] = commonsMetadata;
 
   const details = {
     details: metaData,
diff --git a/components/Books.js b/components/Books.js
@@ -270,7 +270,7 @@ const Books = () => {
             session.user.name
           }&IAtitle=${IAIdentifier}&isUploadCommons=${isUploadCommons}&oauthToken=${
             session?.accessToken
-          }&isEmailNotification=${isEmailNotification}`;
+          }&isEmailNotification=${isEmailNotification}&commonsMetadata=${commonsMetadata}`;
           fetch(url)
             .then((res) => res.json())
             .then((response) => {
diff --git a/server.js b/server.js
@@ -577,7 +577,8 @@ app
                   userName,
                   isEmailNotification,
                   isUploadCommons,
-                  oauthToken
+                  oauthToken,
+                  commonsMetadata
                 );
               }
             }
