ha

Author: david-rocca

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

@@ -45,31 +45,19 @@ async function getAllOrgs (req, res, next) {
         returnValue.organizations[i].conversation = conversation?.length ? conversation : undefined
       }
     } catch (error) {
-<<<<<<< HEAD
-=======
-      await session.abortTransaction()
->>>>>>> c41b1faa78a401dd315a7d73264335ce264a8e7c
       // Handle the specific error thrown by BaseOrgRepository.createOrg
       if (error.message && error.message.includes('Unknown Org type requested')) {
         return res.status(400).json({ message: error.message })
       }
-<<<<<<< HEAD
       return res.status(500).json({ catch: 'inner', message: error })
-=======
-      return res.status(500).json({ message: error })
->>>>>>> c41b1faa78a401dd315a7d73264335ce264a8e7c
     } finally {
       await session.endSession()
     }
 
     logger.info({ uuid: req.ctx.uuid, message: 'The orgs were sent to the user.' })
     return res.status(200).json(returnValue)
   } catch (err) {
-<<<<<<< HEAD
     return res.status(500).json({ catch: 'outer', message: err })
-=======
-    return res.status(500).json({ message: err })
->>>>>>> c41b1faa78a401dd315a7d73264335ce264a8e7c
   }
 }