refactor: use more Promises, delete contracts directory if already exists

packages/concordia-contracts-provider/src/controllers/download.js

@@ -1,4 +1,4 @@
-import { promises as fs } from 'fs';
+import { promises as fs, constants } from 'fs';
 import path from 'path';
 import { getStorageLocation, getTagsDirectory } from '../utils/storageUtils';
 
@@ -14,13 +14,13 @@ const downloadContracts = async (req, res) => {
   const { params: { hash: identifier } } = req;
   const hashBasedDirectoryPath = getStorageLocation(identifier);
 
-  return fs.access(hashBasedDirectoryPath)
+  return fs.access(hashBasedDirectoryPath, constants.R_OK)
     .then(() => readContractFilesToArray(hashBasedDirectoryPath))
     .catch(() => {
       const tagsDirectory = getTagsDirectory();
 
       return fs
-        .access(tagsDirectory)
+        .access(tagsDirectory, constants.R_OK)
         .then(() => {
           const tagFilePath = path.join(tagsDirectory, identifier);
 

packages/concordia-contracts-provider/src/controllers/upload.js

@@ -1,7 +1,18 @@
 import path from 'path';
-import { promises as fs } from 'fs';
+import { constants, promises as fs } from 'fs';
-import upload from '../middleware/upload';
+import uploadFilesUsingMiddleware from '../middleware/upload';
-import { getTagsDirectory } from '../utils/storageUtils';
+import { getStorageLocation, getTagsDirectory } from '../utils/storageUtils';
+
+const provisionContractsDirectory = (req) => {
+  const { params: { hash } } = req;
+  const contractsPath = getStorageLocation(hash);
+
+  return fs
+    .access(contractsPath, constants.W_OK)
+    .then(() => fs.rmdir(contractsPath, { recursive: true }))
+    .catch(() => Promise.resolve())
+    .then(() => fs.mkdir(contractsPath, { recursive: true }));
+};
 
 const addOrTransferTag = (tag, hash) => {
   const tagsDirectory = getTagsDirectory();
@@ -12,21 +23,22 @@ const addOrTransferTag = (tag, hash) => {
     .then(() => fs.writeFile(tagFilePath, hash, 'utf-8'));
 };
 
-const uploadContracts = async (req, res) => upload(req, res)
+const uploadContracts = async (req, res) => provisionContractsDirectory(req)
-  .then(() => {
+  .then(() => uploadFilesUsingMiddleware(req, res)
-    if (req.files.length <= 0) {
+    .then(() => {
-      return Promise.reject(new Error('You must select at least 1 file.'));
+      if (req.files.length <= 0) {
-    }
+        return Promise.reject(new Error('You must select at least 1 file.'));
+      }
 
-    const { body: { tag } } = req;
+      const { body: { tag } } = req;
-    const { params: { hash } } = req;
+      const { params: { hash } } = req;
 
-    if (tag) {
+      if (tag) {
-      return addOrTransferTag(tag, hash)
+        return addOrTransferTag(tag, hash)
-        .then(() => res.send('Files have been uploaded and tagged.'));
+          .then(() => res.send('Files have been uploaded and tagged.'));
-    }
+      }
 
-    return res.send('Files have been uploaded.');
+      return res.send('Files have been uploaded.');
-  });
+    }));
 
 export default uploadContracts;

packages/concordia-contracts-provider/src/middleware/upload.js

@@ -1,5 +1,4 @@
 import * as util from 'util';
-import * as fs from 'fs';
 import multer from 'multer';
 import { getStorageLocation } from '../utils/storageUtils';
 
@@ -8,7 +7,6 @@ const storage = multer.diskStorage({
     const { params: { hash } } = req;
     const contractsPath = getStorageLocation(hash);
 
-    fs.mkdirSync(contractsPath, { recursive: true });
     callback(null, contractsPath);
   },
   filename: (req, file, callback) => {