Wait for import res

packages/app/src/server/routes/apiv3/g2g-transfer.ts

@@ -224,21 +224,13 @@ module.exports = (crowi: Crowi): Router => {
      * import
      */
     try {
-      importService.import(collections, importSettingsMap);
+      await importService.import(collections, importSettingsMap);
     }
     catch (err) {
       logger.error(err);
-      return;
+      return res.apiv3Error(new ErrorV3('Failed to import.', 'failed_to_import'), 500);
     }
 
-    // try {
-    //   await g2gTransferReceiverService.receive(file.stream);
-    // }
-    // catch (err) {
-    //   logger.error(err);
-    //   return res.apiv3Err(new ErrorV3('Error occurred while importing transfer data.', 'failed_to_receive'));
-    // }
-
     return res.apiv3({ message: 'Successfully started to receive transfer data.' });
   });
 

packages/app/src/server/service/g2g-transfer.ts

@@ -243,7 +243,7 @@ export class G2GTransferPusherService implements Pusher {
       logger.error(errs);
       if (!Array.isArray(errs)) {
         // TODO: socker.emit(failed_to_transfer);
-        return;
+        throw errs;
       }
 
       const err = errs[0];
@@ -251,7 +251,7 @@ export class G2GTransferPusherService implements Pusher {
 
 
       // TODO: socker.emit(failed_to_transfer);
-      return;
+      throw errs;
     }
 
     try {
@@ -259,7 +259,7 @@ export class G2GTransferPusherService implements Pusher {
     }
     catch (err) {
       logger.error(err);
-      return;
+      throw err;
     }
 
     return;