Merge pull request #956 from funmusicplace/various-fixes

Various fixes

client/src/components/ManageArtist/ManageArtist.tsx

@@ -80,7 +80,7 @@ const ManageArtist: React.FC<{}> = () => {
             </NavLink>
           </li>
         )}
-        {artist && user?.isAdmin && (
+        {artist && (
           <li>
             <NavLink to="merch">{t("merch")}</NavLink>
           </li>

client/src/components/Merch/MerchView.tsx

@@ -29,7 +29,7 @@ import PublicTrackGroupListing from "components/common/TrackTable/PublicTrackGro
 
 import MerchButtonPopUp from "./MerchButtonPopUp";
 
-function TrackGroup() {
+function MerchView() {
   const { t } = useTranslation("translation", {
     keyPrefix: "merchDetails",
   });
@@ -208,4 +208,4 @@ function TrackGroup() {
   );
 }
 
-export default TrackGroup;
+export default MerchView;

emails/error-email/html.pug

@@ -0,0 +1,15 @@
+doctype html
+html
+  head
+    block head
+      meta(charset="utf-8")
+      meta(name="viewport", content="width=device-width")
+      meta(http-equiv="X-UA-Compatible", content="IE=edge")
+      meta(name="x-apple-disable-message-reformatting")
+      link(rel="stylesheet", href="style.css", data-inline)
+  body.sans-serif
+    .pa4
+      | There was an error in the application: 
+      | #{error}
+      | Happened at #{time}
+

emails/error-email/subject.pug

@@ -0,0 +1 @@
+= `Error in application`

emails/error-email/text.pug

@@ -0,0 +1,3 @@
+| Error 
+| #{error}
+| time: #{time}

src/jobs/generate-album.ts

@@ -7,6 +7,7 @@ import {
   createBucketIfNotExists,
   finalAudioBucket,
   finalCoversBucket,
+  getBufferFromStorage,
   minioClient,
   trackGroupFormatBucket,
 } from "../utils/minio";
@@ -22,6 +23,7 @@ import {
 } from "@mirlo/prisma/client";
 import filenamify from "filenamify";
 import prisma from "@mirlo/prisma";
+import cover from "../routers/v1/manage/trackGroups/{trackGroupId}/cover";
 
 const {
   MINIO_HOST = "",
@@ -104,11 +106,20 @@ export default async (job: Job) => {
 
       if (trackGroup.cover?.id) {
         logger.info("Adding cover");
-        await minioClient.fGetObject(
+        // await minioClient.fGetObject(
+        //   finalCoversBucket,
+        //   `${trackGroup.cover.id}-x1500.jpg`,
+        //   coverDestination
+        // );
+
+        const { buffer } = await getBufferFromStorage(
+          minioClient,
           finalCoversBucket,
-          `${trackGroup.cover.id}-x1500.jpg`,
-          coverDestination
+          `${trackGroup.cover.id}-x1500.jpg`
         );
+        if (buffer) {
+          await fsPromises.writeFile(coverDestination, buffer);
+        }
       }
 
       await new Promise((resolve, reject) => {

src/jobs/queue-worker.ts

@@ -150,7 +150,7 @@ export async function cleanUpFilesQueue() {
     cleanUpOldFilesJob,
     workerOptions
   );
-  logger.info("Move Files From Minio to BackBlaze worker started");
+  logger.info("clean up old files worker started");
 
   worker.on("completed", (job: any) => {
     logger.info("completed:clean-up-old-files");
@@ -170,17 +170,17 @@ export async function moveFilesToBackBlazeWorker() {
     moveFilesToBackblazeJob,
     workerOptions
   );
-  logger.info("Clean Up Files worker started");
+  logger.info("Move Files to Backblaze worker started");
 
   worker.on("completed", (job: any) => {
-    logger.info("completed:clean-up-old-files");
+    logger.info("completed:move-file-to-backblaze");
   });
 
   worker.on("failed", (job: any, err: any) => {
-    logger.error("failed:clean-up-old-files", err);
+    logger.error("failed:move-file-to-backblaze", err);
   });
 
   worker.on("error", (err: any) => {
-    logger.error("error:clean-up-old-files", err);
+    logger.error("error:move-file-to-backblaze", err);
   });
 }

src/jobs/send-mail.ts

@@ -4,6 +4,7 @@ import sendgrid from "nodemailer-sendgrid";
 import Email from "email-templates";
 import { logger } from "../logger";
 import { Job } from "bullmq";
+import Mail from "nodemailer/lib/mailer";
 
 const viewsDir = path.join(__dirname, "../emails");
 
@@ -15,11 +16,25 @@ const transport: Transporter = !!process.env.SENDGRID_API_KEY
     )
   : ({ jsonTransport: true } as unknown as Transporter);
 
-/**
- * Cleanup incoming folder and more (later)
- */
+export const sendErrorEmail = async (error: unknown) => {
+  sendMail({
+    data: {
+      template: "error-email",
+      message: {
+        to: "[email protected]",
+      },
+      locals: { error: JSON.stringify(error), time: new Date().toDateString() },
+    },
+  });
+};
 
-export const sendMail = async (job: Job) => {
+export const sendMail = async (job: {
+  data: {
+    template: string;
+    message: Mail.Options;
+    locals: { [key: string]: any };
+  };
+}) => {
   logger.info(`sendMail: sending: ${job.data.template}`);
   try {
     const email = new Email({

src/queues/moving-files-to-backblaze.ts

@@ -3,6 +3,7 @@ import { REDIS_CONFIG } from "../config/redis";
 import logger from "../logger";
 import { getObjectList, minioClient, uploadWrapper } from "../utils/minio";
 import { sleep } from "../jobs/optimize-image";
+import { sendErrorEmail } from "../jobs/send-mail";
 
 const queueOptions = {
   prefix: "mirlo",
@@ -53,7 +54,7 @@ export const startMovingFiles = async (bucketName: string) => {
           fileName: file.name,
         },
         {
-          delay: i * 1500,
+          delay: i * 2000,
         }
       );
     } catch (e) {
@@ -73,7 +74,8 @@ export const moveFilesToBackblazeJob = async (job: Job) => {
     await uploadWrapper(bucketName, fileName, stream);
   } catch (e) {
     console.error(e);
-    logger.error("Error moving file");
+    sendErrorEmail(e);
+    logger.error(`Error moving file ${bucketName}/${fileName}`);
   }
   logger.info(`done transfering ${bucketName}/${fileName}`);
 };