#537 - Pass org to associate new users with during bulk upload

Author: callmekatootie

README.md

@@ -12,7 +12,7 @@
 There are two apps involved - a front end build using create react app and a backend which is a nodejs api
 
 When working locally, you will run the following commands (after setting the necessary environment variables):
- 
+
 - npm install
 - cd client && npm install
 - cd .. && npm run dev

client/src/components/Upload/index.jsx

@@ -10,6 +10,7 @@ import Progress from "./Progress";
 
 import config from "../../config";
 import api from "../../services/api";
+import { getSingleOrg } from "../../services/user-org";
 
 const STATES = {
   INITIAL: "INITIAL",
@@ -41,6 +42,7 @@ export default function Upload({ templateId }) {
     const data = new FormData();
 
     data.append("upload", file);
+    data.append("organizationId", getSingleOrg());
 
     setState({
       type: STATES.UPLOADING,

docs/swagger.yaml

@@ -111,6 +111,11 @@ paths:
         description: "The excel file that needs to be processed"
         required: true
         type: "file"
+      - name: "organizationId"
+        in: "formData"
+        description: "The organization id to associate any new users with"
+        required: true
+        type: "string"
       responses:
         "200":
           description: "Success"
@@ -263,6 +268,9 @@ definitions:
           type: "string"
           description: "If status is `failed`, then this field will contain information\
             \ on why the processing failed"
+        organizationId:
+          type: "string"
+          description: "The organization id to associate new users with"
     - $ref: "#/definitions/AuditFields"
   Skill:
     allOf:

src/controllers/UploadController.js

@@ -9,7 +9,7 @@ const service = require('../services/UploadService')
  * @param {Object} res the response
  */
 async function uploadEntity (req, res) {
-  const result = await service.create(req.authUser, req.file)
+  const result = await service.create(req.authUser, req.file, req.body)
   res.send(result)
 }
 

src/models/Upload.js

@@ -24,6 +24,10 @@ const schema = new Schema({
     type: String,
     required: true
   },
+  organizationId: {
+    type: String,
+    required: true
+  },
   created: {
     type: String,
     required: true

src/services/UploadService.js

@@ -26,10 +26,11 @@ getEntity.schema = {
 
 /**
  * Create upload.
- * @param {Object} data the data to create upload
+ * @param {Object} upload the file to upload
+ * @param {String} data the related data of the upload
  * @returns {Object} the created upload
  */
-async function create (authUser, upload) {
+async function create (authUser, upload, data) {
   const id = uuid()
   // upload file to s3 under uploads folder
   const objectKey = await helper.uploadToS3(config.UPLOAD_S3_BUCKET, upload, `uploads/${id}`)
@@ -40,6 +41,7 @@ async function create (authUser, upload) {
     objectKey,
     status: 'pending',
     info: '',
+    organizationId: data.organizationId,
     created: currDate,
     updated: currDate,
     createdBy: authUser.handle || authUser.sub,
@@ -60,7 +62,10 @@ async function create (authUser, upload) {
 
 create.schema = {
   authUser: Joi.object().required(),
-  upload: Joi.object().required()
+  upload: Joi.object().required(),
+  data: Joi.object().keys({
+    organizationId: Joi.string().required()
+  })
 }
 
 /**