Fix problem with tenantId part of Composite identifier (#451)

* Fix problem with tenantId part of Composite identifier

Fixes #450

* add multitenant with composite

Co-authored-by: Sergio del Amo <[email protected]>

Author: puneetbehl

examples/grails-data-service/grails-app/conf/application.yml

@@ -1,3 +1,8 @@
+grails:
+    gorm:
+        multiTenancy:
+            mode: DISCRIMINATOR
+            tenantResolverClass: org.grails.datastore.mapping.multitenancy.web.SessionTenantResolver
 ---
 grails:
     profile: rest-api

examples/grails-data-service/grails-app/domain/example/MultitenantBook.groovy

@@ -0,0 +1,15 @@
+package example
+
+import grails.gorm.MultiTenant
+
+// Issue: https://github.com/grails/gorm-hibernate5/issues/450
+// Pr: https://github.com/grails/gorm-hibernate5/pull/451
+class MultitenantBook implements MultiTenant<MultitenantBook>, Serializable {
+    String id
+    String tenantId
+    String title
+
+    static mapping  = {
+        id composite: ['id', 'tenantId']
+    }
+}

grails-datastore-gorm-hibernate5/src/main/groovy/org/grails/orm/hibernate/cfg/GrailsDomainBinder.java

@@ -1443,7 +1443,7 @@ protected void addMultiTenantFilterIfNecessary(
                 mappings.addFilterDefinition(new FilterDefinition(
                         GormProperties.TENANT_IDENTITY,
                         filterCondition,
-                        Collections.singletonMap(GormProperties.TENANT_IDENTITY, persistentClass.getProperty(tenantId.getName()).getType())
+                        Collections.singletonMap(GormProperties.TENANT_IDENTITY, getProperty(persistentClass, tenantId.getName()).getType())
                 ));
             }
         }