includes and excludes (#49)

* includes and excludes

* refactoring

* enable acr in scratch

* added scratch org support for ACR and person accounts

---------

Co-authored-by: Maciej Ptak <[email protected]>

Author: pgajek2

config/project-scratch-def.json

@@ -1,13 +1,20 @@
 {
   "orgName": "Beyond The Cloud Dev",
   "edition": "Developer",
-  "features": ["EnableSetPasswordInApi"],
+  "features": [
+    "EnableSetPasswordInApi",
+    "ContactsToMultipleAccounts",
+    "PersonAccounts"
+  ],
   "settings": {
     "lightningExperienceSettings": {
       "enableS1DesktopEnabled": true
     },
     "mobileSettings": {
       "enableS1EncryptedStoragePref2": false
+    },
+    "accountSettings": {
+      "enableRelateContactToMultipleAccounts": true
     }
   }
 }

force-app/main/default/classes/SOQL.cls

@@ -190,6 +190,10 @@ public inherited sharing class SOQL implements Queryable {
         Filter notIn(Iterable<Object> iterable); // NOT IN :inList or inSet
         Filter notIn(List<Object> inList); // NOT IN :inList
         Filter notIn(InnerJoin joinQuery); // SOQL.InnerJoin
+        Filter includesAll(Iterable<String> values); // join with ;
+        Filter includesSome(Iterable<String> values); // join with ,
+        Filter excludesAll(Iterable<String> values); // join with ,
+        Filter excludesSome(Iterable<String> values);  // join with ;
 
         Filter removeWhenNull(); // Condition will be removed for value = null
 
@@ -1114,6 +1118,30 @@ public inherited sharing class SOQL implements Queryable {
             return set('NOT IN', joinQuery);
         }
 
+        public Filter includesAll(Iterable<String> iterable) {
+            //Bind expressions can't be used with other clauses, such as INCLUDES.
+            skipBinding = true;
+            return set('INCLUDES', '(\'' + String.join(iterable, ';') + '\')');
+        }
+
+        public Filter includesSome(Iterable<String> iterable) {
+            //Bind expressions can't be used with other clauses, such as INCLUDES.
+            skipBinding = true;
+            return set('INCLUDES', '(\'' + String.join(iterable, '\', \'') + '\')');
+        }
+
+        public Filter excludesAll(Iterable<String> iterable) {
+            //Bind expressions can't be used with other clauses, such as EXCLUDES.
+            skipBinding = true;
+            return set('EXCLUDES', '(\'' + String.join(iterable, '\', \'') + '\')');
+        }
+
+        public Filter excludesSome(Iterable<String> iterable) {
+            //Bind expressions can't be used with other clauses, such as EXCLUDES.
+            skipBinding = true;
+            return set('EXCLUDES', '(\'' + String.join(iterable, ';') + '\')');
+        }
+
         private Filter set(String comperator, Object value) {
             this.value = value;
             this.comperator = comperator;

force-app/main/default/classes/SOQL_Test.cls

@@ -783,6 +783,66 @@ private class SOQL_Test {
         Assert.areEqual(names, binding.get('v1'));
     }
 
+    @IsTest
+    static void inlcudesAll() {
+        // Setup
+        List<String> roles = new List<String>{ 'Business User', 'Decision Maker' };
+
+        // Test
+        SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+            .with(AccountContactRelation.Id)
+            .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).includesAll(roles));
+
+        // Verify
+        String soql = builder.toString();
+        Assert.areEqual('SELECT Id FROM AccountContactRelation WHERE Roles INCLUDES (\'Business User;Decision Maker\')', soql);
+    }
+
+    @IsTest
+    static void inlcudesSome() {
+        // Setup
+        List<String> roles = new List<String>{ 'Executive Sponsor', 'Economic Decision Maker' };
+
+        // Test
+        SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+            .with(AccountContactRelation.Id)
+            .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).includesSome(roles));
+
+        // Verify
+        String soql = builder.toString();
+        Assert.areEqual('SELECT Id FROM AccountContactRelation WHERE Roles INCLUDES (\'Executive Sponsor\', \'Economic Decision Maker\')', soql);
+    }
+
+    @IsTest
+    static void excludesAll() {
+        // Setup
+        List<String> roles = new List<String>{ 'Technical Buyer', 'Economic Buyer' };
+
+        // Test
+        SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+            .with(AccountContactRelation.Id)
+            .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).excludesAll(roles));
+
+        // Verify
+        String soql = builder.toString();
+        Assert.areEqual('SELECT Id FROM AccountContactRelation WHERE Roles EXCLUDES (\'Technical Buyer\', \'Economic Buyer\')', soql);
+    }
+
+    @IsTest
+    static void excludesSome() {
+        // Setup
+        List<String> roles = new List<String>{ 'Evaluator', 'Influencer' };
+
+        // Test
+        SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+            .with(AccountContactRelation.Id)
+            .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).excludesSome(roles));
+
+        // Verify
+        String soql = builder.toString();
+        Assert.areEqual('SELECT Id FROM AccountContactRelation WHERE Roles EXCLUDES (\'Evaluator;Influencer\')', soql);
+    }
+
     @IsTest
     static void isNull() {
         // Test

website/docs/api/soql-filter.md

@@ -587,6 +587,68 @@ SOQL.of(Contact.SObjectType)
     )).toList();
 ```
 
+## multi-select picklist
+
+### includesAll
+
+```sql
+SELECT Id
+FROM AccountContactRelation
+WHERE Roles INCLUDES ('Business User;Decision Maker')
+```
+```apex
+List<String> roles = new List<String>{ 'Business User', 'Decision Maker' };
+
+SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+    .with(AccountContactRelation.Id)
+    .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).includesAll(roles));
+ ```
+
+### includesSome
+
+```sql
+SELECT Id
+FROM AccountContactRelation
+WHERE Roles INCLUDES ('Business User', 'Decision Maker')
+```
+```apex
+List<String> roles = new List<String>{ 'Business User', 'Decision Maker' };
+
+SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+    .with(AccountContactRelation.Id)
+    .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).includesSome(roles));
+ ```
+
+### excludesAll
+
+```sql
+SELECT Id
+FROM AccountContactRelation
+WHERE Roles EXCLUDES ('Business User', 'Decision Maker')
+```
+```apex
+List<String> roles = new List<String>{ 'Business User', 'Decision Maker' };
+
+SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+    .with(AccountContactRelation.Id)
+    .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).excludesAll(roles));
+ ```
+
+### excludesSome
+
+```sql
+SELECT Id
+FROM AccountContactRelation
+WHERE Roles EXCLUDES ('Business User;Decision Maker')
+```
+```apex
+List<String> roles = new List<String>{ 'Business User', 'Decision Maker' };
+
+SOQL builder = SOQL.of(AccountContactRelation.SObjectType)
+    .with(AccountContactRelation.Id)
+    .whereAre(SOQL.Filter.with(AccountContactRelation.Roles).excludesSome(roles));
+ ```
+
 ## additional
 
 ### removeWhenNull