add uploadToWikidata for google and trove

okerekechinweotito · okerekechinweotito · commit 414677dea59c · 2024-01-27T12:55:25.000+01:00
diff --git a/bull/commons-queue/consumer.js b/bull/commons-queue/consumer.js
@@ -1,7 +1,11 @@
 const config = require("../../utils/bullconfig");
 const CommonsQueue = config.getNewQueue("commons-queue");
 const winston = require("winston");
-const { downloadFile, uploadToCommons } = require("../../utils/helper");
+const {
+  downloadFile,
+  uploadToCommons,
+  uploadToWikiData,
+} = require("../../utils/helper");
 const logger = winston.loggers.get("defaultLogger");
 
 CommonsQueue.process(async (job, done) => {
@@ -36,9 +40,26 @@ CommonsQueue.process(async (job, done) => {
     return done(null, true);
     // return done(new Error(`uploadToCommons: ${commonsResponse}`));
   }
-  process.emit(`commonsJobComplete:${job.id}`, {
-    status: true,
-    value: commonsResponse,
-  });
+  const wikiDataResponse = await uploadToWikiData(
+    job.data.metadata,
+    commonsResponse.filename
+  );
+  if (wikiDataResponse !== 404) {
+    process.emit(`commonsJobComplete:${job.id}`, {
+      status: true,
+      value: {
+        commons: commonsResponse,
+        wikidata: wikiDataResponse,
+      },
+    });
+  } else {
+    process.emit(`commonsJobComplete:${job.id}`, {
+      status: true,
+      value: {
+        commons: commonsResponse,
+        wikidata: 404,
+      },
+    });
+  }
   return done(null, true);
 });
diff --git a/bull/google-books-queue/consumer.js b/bull/google-books-queue/consumer.js
@@ -95,6 +95,10 @@ GoogleBooksQueue.process((job, done) => {
           }
           done(new Error(errorMessage));
         } else {
+          job.progress({
+            step: "Upload To IA",
+            value: `(${100}%)`,
+          });
           if (
             job.data.isUploadCommons !== "true" &&
             job.data.isEmailNotification !== "true"
@@ -121,7 +125,11 @@ GoogleBooksQueue.process((job, done) => {
                   step: "Upload to Wikimedia Commons",
                   value: `(${100}%)`,
                   wikiLinks: {
-                    commons: await commonsResponse.value.filename,
+                    commons: await commonsResponse.value.commons.filename,
+                    wikidata:
+                      (await commonsResponse.value.wikidata) !== 404
+                        ? await commonsResponse.value.wikidata
+                        : 404,
                   },
                 });
                 if (job.data.isEmailNotification === "true") {
diff --git a/bull/trove-queue/consumer.js b/bull/trove-queue/consumer.js
@@ -103,6 +103,16 @@ TroveQueue.process((job, done) => {
                 }
                 done(new Error(errorMessage));
               } else {
+                job.progress({
+                  step: "Upload To IA",
+                  value: `(${100}%)`,
+                });
+                if (
+                  isEmailNotification !== "true" &&
+                  job.data.details.isUploadCommons !== "true"
+                ) {
+                  done(null, true);
+                }
                 if (
                   isEmailNotification === "true" &&
                   job.data.details.isUploadCommons !== "true"
@@ -124,17 +134,25 @@ TroveQueue.process((job, done) => {
                       if (commonsResponse.status === true) {
                         job.progress({
                           step: "Upload to Wikimedia Commons",
-                          value: `(100%)`,
+                          value: `(${100}%)`,
                           wikiLinks: {
-                            commons: await commonsResponse.value.filename,
+                            commons: await commonsResponse.value.commons
+                              .filename,
+                            wikidata:
+                              (await commonsResponse.value.wikidata) !== 404
+                                ? await commonsResponse.value.wikidata
+                                : 404,
                           },
                         });
                         if (job.data.isEmailNotification === "true") {
                           const commonsLink = `https://commons.wikimedia.org/wiki/File:${commonsResponse.value.filename}`;
                           EmailProducer(
                             userName,
                             name,
-                            { archiveLink: trueURI, commonsLink: commonsLink },
+                            {
+                              archiveLink: trueURI,
+                              commonsLink: commonsLink,
+                            },
                             { archive: true, commons: true }
                           );
                         }
diff --git a/components/ShowJobInformation.js b/components/ShowJobInformation.js
@@ -144,10 +144,10 @@ const ShowJobInformation = (props) => {
           </CardActions>
 
           <CardActions sx={{ marginTop: "-15px" }}>
-            {data.wikimedia_links !== "Not Integrated" ? (
+            {data.wikimedia_links.commons !== "Not Integrated" ? (
               <Link
                 passHref
-                href={`https://commons.wikimedia.org/wiki/File:${data.wikimedia_links}`}
+                href={`https://commons.wikimedia.org/wiki/File:${data.wikimedia_links.commons}`}
               >
                 <Button
                   sx={styles.button}
@@ -160,6 +160,23 @@ const ShowJobInformation = (props) => {
               </Link>
             ) : null}
           </CardActions>
+          <CardActions sx={{ marginTop: "-15px" }}>
+            {data.wikimedia_links.wikidata !== "Not Integrated" ? (
+              <Link
+                passHref
+                href={`https://www.wikidata.org/wiki/${data.wikimedia_links.wikidata}`}
+              >
+                <Button
+                  sx={styles.button}
+                  target="_blank"
+                  size="large"
+                  color="primary"
+                >
+                  View on Wikidata
+                </Button>
+              </Link>
+            ) : null}
+          </CardActions>
         </Card>
       </div>
     );
diff --git a/server.js b/server.js
@@ -169,14 +169,21 @@ app
               ),
               uploadStatus: {
                 uploadLink:
-                  job.progress().step.includes("Upload To IA (100%)") && trueURI
+                  (job.progress().step.includes("Upload To IA") ||
+                    job.progress().step.includes("Upload to Wikimedia")) &&
+                  trueURI
                     ? trueURI
                     : "",
                 isUploaded: jobState === "completed" ? true : false,
               },
-              wikimedia_links: job.progress().wikiLinks?.commons
-                ? job.progress().wikiLinks.commons
-                : "Not Integrated",
+              wikimedia_links: {
+                commons: job.progress().wikiLinks?.commons
+                  ? job.progress().wikiLinks.commons
+                  : "Not Integrated",
+                wikidata: job.progress().wikiLinks?.wikidata
+                  ? job.progress().wikiLinks.wikidata
+                  : "Not Integrated",
+              },
             };
             res.send(
               Object.assign(
diff --git a/utils/helper.js b/utils/helper.js
