Merge pull request #8 from jrjohnson/write-whole-file

Finish writing all data

handler.js

@@ -16,16 +16,13 @@ module.exports.storeSurvey = async event => {
     destinationStream
   );
 
-  return new Promise(resolve => {
-    console.log(`survey data extracted, writing to S3 bucket ${process.env.BUCKET} ${surveyId}.csv`);
-    const params = {
-      Bucket: process.env.BUCKET,
-      Key: `${surveyId}.csv`,
-      Body: fs.createReadStream(fileName)
-    };
-    s3.upload(params).promise().then(() => {
-      console.log('done!');
-      resolve({ message: `Stored ${surveyId}`, event });
-    });
-  });
+  console.log(`survey data extracted, writing to S3 bucket ${process.env.BUCKET} ${surveyId}.csv`);
+  const params = {
+    Bucket: process.env.BUCKET,
+    Key: `${surveyId}.csv`,
+    Body: fs.createReadStream(fileName)
+  };
+  await s3.upload(params).promise();
+  console.log('done!');
+  return { message: `Stored ${surveyId}`, event };
 };

index.js

@@ -17,5 +17,5 @@ getSurveyResults(
   surveyId,
   destinationStream
 ).then(() => {
-  console.log("done\n\n");
+  console.log("done\n");
 });

src/get-survey-results.js

@@ -50,12 +50,17 @@ async function writeFile(token, url, destinationStream) {
   const entry = await zipFile.readEntry();
   const readStream = await zipFile.openReadStream(entry);
   readStream.pipe(destinationStream);
+  return new Promise(resolve => {
+    destinationStream.on("end", () => {
+      resolve();
+    });
+  });
 }
 
 async function getSurveyResults(token, dataCenter, surveyId, destinationStream) {
   const progressId = await requestResultsToBeBuilt(token, dataCenter, surveyId);
   const fileUrl = await waitForBuildToComplete(token, dataCenter, progressId);
-  return writeFile(token, fileUrl, destinationStream);
+  return await writeFile(token, fileUrl, destinationStream);
 }
 
 exports.getSurveyResults = getSurveyResults;