Current tenant is now retrieved from injected 'currentTenant' bean. If it's null then tenant parameter supplied in the method call is used

Author: goeh

grails-app/services/grails/plugins/selection/repo/SelectionRepositoryService.groovy

@@ -24,6 +24,8 @@ class SelectionRepositoryService {
 
     static transactional = true
 
+    def currentTenant
+
     /**
      * List selections stored in the repository.
      *
@@ -38,15 +40,16 @@ class SelectionRepositoryService {
      * @return a list of selections matching the parameters. Each list entry is a Map with selection properties
      */
     List<Map<String, Object>> list(String location, String username = null, Long tenant = null) {
+        Long tenantId = currentTenant?.get() ?: tenant
         SelectionRepository.createCriteria().list([sort: 'name', order: 'asc']) {
             eq('location', location)
             if (username) {
                 eq('username', username)
             } else {
                 isNull('username')
             }
-            if (tenant != null) {
-                eq('tenantId', tenant)
+            if (tenantId != null) {
+                eq('tenantId', tenantId)
             }
         }.collect {[id: it.id, name: it.name, description: it.description, uri:it.uri]}
     }
@@ -62,6 +65,10 @@ class SelectionRepositoryService {
         if (!s) {
             throw new IllegalArgumentException("No selection found with id [$id]")
         }
+        def tenant = currentTenant?.get()
+        if(tenant != null && tenant != s.tenantId) {
+            throw new IllegalArgumentException("No selection found with id [$id]")
+        }
         s.uri
     }
 
@@ -77,6 +84,7 @@ class SelectionRepositoryService {
      * @return a selection URI suitable for retrieving/invoking the persisted selection
      */
     URI put(URI selection, String location, String username, String name, String description = null, Long tenant = null) {
+        Long tenantId = currentTenant?.get() ?: tenant
         // Try to find persistent selection.
         def s = SelectionRepository.createCriteria().get() {
             eq('location', location)
@@ -86,14 +94,14 @@ class SelectionRepositoryService {
             } else {
                 isNull('username')
             }
-            if (tenant != null) {
-                eq('tenantId', tenant)
+            if (tenantId != null) {
+                eq('tenantId', tenantId)
             }
         }
 
         if (!s) {
             // Create new persistent selection
-            s = new SelectionRepository(tenantId: tenant, location: location, username: username, name: name)
+            s = new SelectionRepository(tenantId: tenantId, location: location, username: username, name: name)
         }
 
         // Update URI and description.
@@ -114,6 +122,10 @@ class SelectionRepositoryService {
         if (!s) {
             throw new IllegalArgumentException("No selection found with id [$id]")
         }
+        def tenant = currentTenant?.get()
+        if(tenant != null && tenant != s.tenantId) {
+            throw new IllegalArgumentException("No selection found with id [$id]")
+        }
         s.delete()
     }
 }

test/integration/grails/plugins/selection/repo/SelectionRepositoryServiceTests.groovy

@@ -2,8 +2,10 @@ package grails.plugins.selection.repo
 
 import test.TestEntity
 
+import java.util.concurrent.atomic.AtomicLong
+
 /**
- * Tests for SelectionStorageService
+ * Tests for SelectionRepositoryService
  */
 class SelectionRepositoryServiceTests extends GroovyTestCase {
 
@@ -38,15 +40,26 @@ class SelectionRepositoryServiceTests extends GroovyTestCase {
 
     void testTenants() {
         // Store same selection under 5 different tenants.
-        5.times {tenant ->
-            selectionRepositoryService.put(new URI("gorm://testEntity/list?name=A*"), "testEntity", "joe.user", "Joe's private A people", null, tenant)
+        (1..5).each { tenant ->
+            assert selectionRepositoryService.put(new URI("gorm://testEntity/list?name=A*"), "testEntity", "joe.user", "Joe's private A people", null, tenant)
         }
 
         // Each tenant should only se it's own selection.
-        5.times {tenant ->
+        (1..5).each { tenant ->
             assert selectionRepositoryService.list("testEntity", "joe.user", tenant).size() == 1
         }
 
+        selectionRepositoryService.currentTenant = new AtomicLong()
+
+        try {
+            (1..5).each { tenant ->
+                selectionRepositoryService.currentTenant.set(tenant)
+                assert selectionRepositoryService.list("testEntity", "joe.user").size() == 1
+            }
+        } finally {
+            selectionRepositoryService.currentTenant = null
+        }
+
         assert selectionRepositoryService.list("testEntity", "joe.user").size() == 5
     }
 }