Skip to content

Commit

Permalink
revert "refactor (case list): improving query"
Browse files Browse the repository at this point in the history
  • Loading branch information
@HeitorMatt
HeitorMatt committed Apr 28, 2021
1 parent a8e2fe9 commit 840214a
Show file tree
Hide file tree
Showing 2 changed files with 7 additions and 8 deletions.
8 changes: 4 additions & 4 deletions src/adonisjs/app/Controllers/Http/v1/CategoryController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ class CategoryController {
.join('properties', 'properties.id', 'case_properties.property_id')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('cases.category_id', category.id)
Expand Down Expand Up @@ -145,6 +144,7 @@ class CategoryController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand Down Expand Up @@ -178,7 +178,6 @@ class CategoryController {
.join('properties', 'properties.id', 'case_properties.property_id')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('cases.category_id', category.id)
Expand Down Expand Up @@ -213,6 +212,7 @@ class CategoryController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand All @@ -233,7 +233,6 @@ class CategoryController {
.from('cases')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('cases.category_id', category.id)
Expand Down Expand Up @@ -266,6 +265,7 @@ class CategoryController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand Down Expand Up @@ -293,7 +293,6 @@ class CategoryController {
.from('cases')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('cases.category_id', category.id)
Expand Down Expand Up @@ -326,6 +325,7 @@ class CategoryController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand Down
7 changes: 3 additions & 4 deletions src/adonisjs/app/Controllers/Http/v1/UserController.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -219,7 +219,6 @@ class UserController {
.join('properties', 'properties.id', 'case_properties.property_id')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('properties.title', propertyFilter)
Expand Down Expand Up @@ -253,6 +252,7 @@ class UserController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand Down Expand Up @@ -290,7 +290,6 @@ class UserController {
.join('properties', 'properties.id', 'case_properties.property_id')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('properties.title', propertyFilter)
Expand Down Expand Up @@ -324,6 +323,7 @@ class UserController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand All @@ -344,7 +344,6 @@ class UserController {
.from('cases')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('cases.published', '>=', publishedFilter)
Expand Down Expand Up @@ -376,6 +375,7 @@ class UserController {
this
.where('permissions.entity', 'group')
.whereRaw('permissions.subject = users_groups.group_id')
.where('users_groups.user_id', user.id)
})
})
.where('permissions.clearance', '>=', clearance)
Expand Down Expand Up @@ -407,7 +407,6 @@ class UserController {
.from('cases')
.leftJoin('permissions', 'cases.id', 'permissions.table_id')
.join('users_groups')
.where('users_groups.user_id', user.id)
.join('users', 'cases.author_id','users.id')
.join('institutions', 'users.institution_id', 'institutions.id')
.where('cases.published', '>=', publishedFilter)
Expand Down

0 comments on commit 840214a

Please sign in to comment.