Merge pull request #111 from harena-lab/development

Improvements: New pagination for case lists. Clearance check before case update

src/adonisjs/app/Controllers/Http/GroupController.js

@@ -2,13 +2,14 @@
 
 const Group = use('App/Models/Group')
 const User = use('App/Models/v1/User')
+const UsersGroup = use('App/Models/v1/UsersGroup')
 
 const Database = use('Database')
 const uuidv4 = require('uuid/v4')
 
 class GroupController {
 
-  async store ({ request, response }) {
+  async store ({ request, response, auth }) {
     const trx = await Database.beginTransaction()
     try {
 
@@ -20,6 +21,9 @@ class GroupController {
 
       trx.commit()
 
+      const user = await User.find(auth.user.id)
+      await user.groups().attach(group.id)
+
       return response.json(group)
     } catch (e) {
       trx.rollback()
@@ -33,36 +37,137 @@ class GroupController {
   async linkUser ({ request, auth, response }) {
     try {
       const { userId, groupId } = request.post()
-
       const user = await User.find(userId)
+      const canLinkUser = await UsersGroup
+        .query()
+        .where('user_id', auth.user.id)
+        .where('group_id', groupId)
+        .first()
+      if(canLinkUser && user){
+        await user.groups().attach(groupId)
+        return response.json(user.username + ' successfully added to the group!')
+      }else if(!canLinkUser){
+        return response.status(500).json('Error. You must be part of the group to be able to add another user.')
+      }else{
+        return response.status(500).json('Error. Could not find the user to be added into the group.')
+      }
 
-      await user.groups().attach(groupId)
+    } catch (e) {
+      console.log(e)
+      return response.status(e.status).json({ message: e.toString() })
+    }
+  }
+
+
+  async listCases ({ request, response, auth }) {
+    try {
+      const groupId = request.input('groupId')
+      if(await Group.find(groupId)){
+        var itemOffset = 0
+        const itemLimit = request.input('nItems') || 20
+        if (request.input('page') && request.input('page') < 1)
+          itemOffset = 0
+        else
+          itemOffset = request.input('page') - 1 || 0
+
+        var totalPages = null
+
+        let countCases = await Database
+          .from('cases')
+          .leftJoin('permissions', 'cases.id', 'permissions.table_id')
+          .join('users_groups')
+          .join('users', 'cases.author_id','users.id')
+          .join('institutions', 'users.institution_id', 'institutions.id')
+          .where('permissions.entity', 'group')
+          .where('permissions.subject', groupId)
+          .countDistinct('cases.id as cases')
+
+
+        totalPages = Math.ceil(countCases[0]['cases'] / itemLimit)
+
+        if(itemOffset >= totalPages)
+          itemOffset = 0
+
+        const result = await Database
+          .select([ 'cases.id', 'cases.title','cases.description', 'cases.language', 'cases.domain',
+          'cases.specialty', 'cases.keywords', 'cases.complexity', 'cases.original_date',
+          'cases.author_grade', 'cases.published', 'users.username',
+          'institutions.title AS institution', 'institutions.acronym AS institution_acronym',
+          'institutions.country AS institution_country', 'cases.created_at'])
+          .distinct('cases.id')
+          .from('cases')
+          .leftJoin('permissions', 'cases.id', 'permissions.table_id')
+          .join('users_groups')
+          .join('users', 'cases.author_id','users.id')
+          .join('institutions', 'users.institution_id', 'institutions.id')
+          .where('permissions.entity', 'group')
+          .where('permissions.subject', groupId)
+          .orderBy('cases.created_at', 'desc')
+          .offset(itemOffset * itemLimit)
+          .limit(itemLimit)
+
+
+        return response.json(result)
+      }else{
+        return response.status(500).json('Error. Could not find selected group.')
+      }
 
-      return response.json('user successfully added to the group')
     } catch (e) {
       console.log(e)
       return response.status(e.status).json({ message: e.toString() })
     }
   }
 
+  async listUsers ({ request, auth, response }) {
+    try {
+      const groupId = request.input('groupId')
+      if(await Group.find(groupId)){
+        const result = await Database
+          .select('user_id','group_id','groups.title as group_title')
+          .from('users_groups')
+          .join('groups','users_groups.group_id','groups.id')
+          .where ('users_groups.group_id', groupId)
+
+        return response.json(result)
+      }
+      else {
+        return response.status(500).json('Error. Could not find selected group.')
+      }
+    } catch (e) {
+      console.log(e)
+      return response.status(e.status).json({ message: e.toString() })
+    }
 
-  async listCases ({ request, response }) {
+
+  }
+
+  async removeUser ({ request, auth, response }){
     try {
+      const userId = request.input('userId')
       const groupId = request.input('groupId')
+      const user = await User.find(userId)
 
-      const result = await Database
-        .select([ 'cases.id', 'cases.title','description', 'users.username'])
-        .from('cases')
-        .leftJoin('permissions', 'cases.id', 'permissions.case_id')
-        .where('entity', 'group')
-        .where('subject', groupId)
-        .where('clearance', 'read')
-        .leftJoin('users_cases', 'cases.id', 'users_cases.case_id')
-        .leftJoin('users', 'users.id', 'users_cases.user_id')
-
-      return response.json(result)
+      const canRemoveUser = await UsersGroup
+        .query()
+        .where('user_id', auth.user.id)
+        .where('group_id', groupId)
+        .first()
+      const isInGroup = await UsersGroup
+        .query()
+        .where('user_id', user.id)
+        .where('group_id', groupId)
+        .first()
+      if(canRemoveUser && user && isInGroup){
+        await user.groups().detach(groupId)
+        return response.json(user.username + ' successfully removed from the group!')
+      }else if(!canRemoveUser){
+        return response.status(500).json('Error. You must be part of the group to be able to remove another user.')
+      }else{
+        return response.status(500).json('Error. Could not find the user to be removed from the group.')
+      }
     } catch (e) {
       console.log(e)
+      return response.status(e.status).json({ message: e.toString() })
     }
   }
 }

src/adonisjs/app/Controllers/Http/v1/ArtifactController.js

@@ -94,8 +94,16 @@ class ArtifactController {
 
       return response.json(bodyMessage)
     } catch (e) {
+      console.log('============ Artifact catch error')
       console.log(e)
-      return response.status(e.status).json({ message: e.message })
+      switch (e.message) {
+        case 'dest already exists.':
+          return response.status(500).json({ message: 'Could not upload artifact, id already exists.' })
+          break;
+        default:
+          return response.status(e.status).json({ message: e.message })
+      }
+
     }
   }