Merge pull request #1567 from CVEProject/emathew/1540-rework-registryOrg-getAllOrgs

Resolves issues 1540/1541, Migrate RegistryOrg get functions to use baseOrg/

Author: david-rocca

src/controller/org.controller/org.controller.js

@@ -28,7 +28,7 @@ async function getOrgs (req, res, next) {
     options.page = req.ctx.query.page ? parseInt(req.ctx.query.page) : CONSTANTS.PAGINATOR_PAGE // if 'page' query parameter is not defined, set 'page' to the default page value
 
     try {
-      returnValue = await repo.getAllOrgs(options, !req.useRegistry)
+      returnValue = await repo.getAllOrgs({ ...options, session }, !req.useRegistry)
     } finally {
       await session.endSession()
     }

src/controller/registry-org.controller/registry-org.controller.js

@@ -2,7 +2,6 @@ const mongoose = require('mongoose')
 const logger = require('../../middleware/logger')
 const { getConstants } = require('../../constants')
 const RegistryOrg = require('../../model/registry-org')
-const RegistryUser = require('../../model/registry-user')
 const errors = require('./error')
 const error = new errors.RegistryOrgControllerError()
 const validateUUID = require('uuid').validate
@@ -21,7 +20,10 @@ const validateUUID = require('uuid').validate
  */
 async function getAllOrgs (req, res, next) {
   try {
+    const session = await mongoose.startSession()
+    const repo = req.ctx.repositories.getBaseOrgRepository()
     const CONSTANTS = getConstants()
+    let returnValue
 
     // temporary measure to allow tests to work after fixing #920
     // tests required changing the global limit to force pagination
@@ -32,29 +34,15 @@ async function getAllOrgs (req, res, next) {
     const options = CONSTANTS.PAGINATOR_OPTIONS
     options.sort = { short_name: 'asc' }
     options.page = req.ctx.query.page ? parseInt(req.ctx.query.page) : CONSTANTS.PAGINATOR_PAGE // if 'page' query parameter is not defined, set 'page' to the default page value
-    const repo = req.ctx.repositories.getRegistryOrgRepository()
-    const agt = setAggregateOrgObj({})
-    const pg = await repo.aggregatePaginate(agt, options)
-
-    await RegistryOrg.populateOverseesAndReportsTo(pg.itemsList)
-    await RegistryUser.populateUsers(pg.itemsList)
-    await RegistryUser.populateAdditionalContactUsers(pg.itemsList)
-    await RegistryUser.populateAdmins(pg.itemsList)
-    // Update UUIDS to objects
-
-    const payload = { orgs: pg.itemsList }
-
-    if (pg.itemCount >= CONSTANTS.PAGINATOR_OPTIONS.limit) {
-      payload.totalCount = pg.itemCount
-      payload.itemsPerPage = pg.itemsPerPage
-      payload.pageCount = pg.pageCount
-      payload.currentPage = pg.currentPage
-      payload.prevPage = pg.prevPage
-      payload.nextPage = pg.nextPage
+
+    try {
+      returnValue = await repo.getAllOrgs({ ...options, session })
+    } finally {
+      await session.endSession()
     }
 
-    logger.info({ uuid: req.ctx.uuid, message: 'The org information was sent to the secretariat user.' })
-    return res.status(200).json(payload)
+    logger.info({ uuid: req.ctx.uuid, message: 'The orgs were sent to the user.' })
+    return res.status(200).json(returnValue)
   } catch (err) {
     next(err)
   }
@@ -74,36 +62,39 @@ async function getAllOrgs (req, res, next) {
  */
 async function getOrg (req, res, next) {
   try {
-    const repo = req.ctx.repositories.getRegistryOrgRepository()
+    const session = await mongoose.startSession()
+    const repo = req.ctx.repositories.getBaseOrgRepository()
     // User passed in parameter to filter for
     const identifier = req.ctx.params.identifier
-    const orgShortName = req.ctx.org
-    const isSecretariat = await repo.isSecretariat(orgShortName)
-    const org = await repo.findOneByShortName(orgShortName)
-    let requestingUserOrgIdentifier = orgShortName
-    let agt = setAggregateOrgObj({ short_name: identifier })
-
-    if (validateUUID(identifier)) {
-      requestingUserOrgIdentifier = org.UUID
-      agt = setAggregateOrgObj({ UUID: identifier })
-    }
+    const requesterOrgShortName = req.ctx.org
+    const identifierIsUUID = validateUUID(identifier)
+    let returnValue
 
-    if (requestingUserOrgIdentifier !== identifier && !isSecretariat) {
-      logger.info({ uuid: req.ctx.uuid, message: identifier + ' organization can only be viewed by the users of the same organization or the Secretariat.' })
-      return res.status(403).json(error.notSameOrgOrSecretariat())
-    }
+    try {
+      session.startTransaction()
+      const requesterOrg = await repo.findOneByShortName(requesterOrgShortName, { session })
+      const requesterOrgIdentifier = identifierIsUUID ? requesterOrg.UUID : requesterOrgShortName
+      const isSecretariat = await repo.isSecretariat(requesterOrg, { session })
 
-    let result = await repo.aggregate(agt)
-    result = result.length > 0 ? result[0] : null
-    // TODO: We need real error messages here pls and thanks
+      if (requesterOrgIdentifier !== identifier && !isSecretariat) {
+        logger.info({ uuid: req.ctx.uuid, message: identifier + ' organization can only be viewed by the users of the same organization or the Secretariat.' })
+        return res.status(403).json(error.notSameOrgOrSecretariat())
+      }
 
-    if (!result) {
+      returnValue = await repo.getOrg(identifier, identifierIsUUID, { session })
+    } catch (error) {
+      await session.abortTransaction()
+      throw error
+    } finally {
+      await session.endSession()
+    }
+    if (!returnValue) { // an empty result can only happen if the requestor is the Secretariat
       logger.info({ uuid: req.ctx.uuid, message: identifier + ' organization does not exist.' })
       return res.status(404).json(error.orgDne(identifier, 'identifier', 'path'))
     }
 
-    logger.info({ uuid: req.ctx.uuid, message: identifier + ' org was sent to the user.', org: result })
-    return res.status(200).json(result)
+    logger.info({ uuid: req.ctx.uuid, message: identifier + ' organization was sent to the user.', org: returnValue })
+    return res.status(200).json(returnValue)
   } catch (err) {
     next(err)
   }