Quellcode durchsuchen

Call transferAttachments

Taichi Masuyama vor 3 Jahren
Ursprung
Commit
cda01f9ec9
1 geänderte Dateien mit 11 neuen und 3 gelöschten Zeilen
  1. 11 3
      packages/app/src/server/service/g2g-transfer.ts

+ 11 - 3
packages/app/src/server/service/g2g-transfer.ts

@@ -193,7 +193,7 @@ export class G2GTransferPusherService implements Pusher {
         // TODO: refresh transfer key per 1 hour
         // TODO: refresh transfer key per 1 hour
         // post each attachment file data to receiver
         // post each attachment file data to receiver
         try {
         try {
-          this.doTransferAttachment(tk, attachment, fileStream);
+          await this.doTransferAttachment(tk, attachment, fileStream);
         }
         }
         catch (errs) {
         catch (errs) {
           logger.error(`Error occured when uploading attachment(ID=${attachment.id})`, errs);
           logger.error(`Error occured when uploading attachment(ID=${attachment.id})`, errs);
@@ -214,8 +214,6 @@ export class G2GTransferPusherService implements Pusher {
   }
   }
 
 
   public async startTransfer(tk: TransferKey, user: any, collections: string[], optionsMap: any): Promise<void> {
   public async startTransfer(tk: TransferKey, user: any, collections: string[], optionsMap: any): Promise<void> {
-    const { appUrl, key } = tk;
-
     let zipFileStream: ReadStream;
     let zipFileStream: ReadStream;
     try {
     try {
       const shouldEmit = false;
       const shouldEmit = false;
@@ -255,6 +253,16 @@ export class G2GTransferPusherService implements Pusher {
       // TODO: socker.emit(failed_to_transfer);
       // TODO: socker.emit(failed_to_transfer);
       return;
       return;
     }
     }
+
+    try {
+      await this.transferAttachments(tk);
+    }
+    catch (err) {
+      logger.error(err);
+      return;
+    }
+
+    return;
   }
   }
 
 
   /**
   /**