v0.1.3 - Current User Queue bugfix (#14)

jamessimone · web-flow · commit 8d344936f1f9 · 2023-08-22T09:49:28.000-06:00
* Fixes #13 by adding special logic when current user is part of queue * Partial sf cli migration - updated scanner to prevent false positive when using Assert classes * Updating deploy.yml syntax
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
@@ -42,23 +42,12 @@ jobs:
           ref: ${{ github.head_ref }}
 
       - name: 'Setup node'
-        uses: actions/setup-node@v2
+        uses: actions/setup-node@v3
         with:
-          node-version: '14'
+          node-version: '18.17.0'
+          cache: 'npm'
 
-      - name: 'Restore node_modules cache'
-        id: cache-npm
-        uses: actions/cache@v2
-        with:
-          path: node_modules
-          key: npm-${{ hashFiles('**/package-lock.json') }}
-          restore-keys: |
-            npm-${{ env.cache-name }}-
-            npm-
-
-      - name: 'Install NPM'
-        if: steps.cache-npm.outputs.cache-hit != 'true'
-        run: npm ci
+      - run: npm ci
 
       - name: 'Run LWC Unit Tests'
         run: npm run test:lwc
diff --git a/README.md b/README.md
@@ -5,12 +5,12 @@
 
 ## Deployment
 
-<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008fjhyAAA">
+<a href="https://login.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008C6lwAAC">
   <img alt="Deploy to Salesforce"
        src="./media/deploy-package-to-prod.png">
 </a>
 
-<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008fjhyAAA">
+<a href="https://test.salesforce.com/packaging/installPackage.apexp?p0=04t6g000008C6lwAAC">
   <img alt="Deploy to Salesforce Sandbox"
        src="./media/deploy-package-to-sandbox.png">
 </a>
diff --git a/core/classes/AbstractCacheRepo.cls-meta.xml b/core/classes/AbstractCacheRepo.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/FlowRoundRobinAssigner.cls-meta.xml b/core/classes/FlowRoundRobinAssigner.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/FlowRoundRobinAssignerTests.cls-meta.xml b/core/classes/FlowRoundRobinAssignerTests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/IThreadSafeCacheVisitor.cls-meta.xml b/core/classes/IThreadSafeCacheVisitor.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/MockUserAssignmentRepo.cls-meta.xml b/core/classes/MockUserAssignmentRepo.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/QueryAssigner.cls b/core/classes/QueryAssigner.cls
@@ -4,10 +4,8 @@ public without sharing class QueryAssigner implements RoundRobinAssigner.IAssign
 
   public QueryAssigner(String query, String assignmentFieldName) {
     Set<Id> assignmentIds = new Set<Id>();
-    List<SObject> matchingRecords;
-    if (QUERY_TO_RECORDS.containsKey(query)) {
-      matchingRecords = QUERY_TO_RECORDS.get(query);
-    } else {
+    List<SObject> matchingRecords = QUERY_TO_RECORDS.get(query);
+    if (matchingRecords == null) {
       matchingRecords = Database.query(query);
       QUERY_TO_RECORDS.put(query, matchingRecords);
     }
diff --git a/core/classes/QueryAssigner.cls-meta.xml b/core/classes/QueryAssigner.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/RoundRobinAssigner.cls b/core/classes/RoundRobinAssigner.cls
@@ -57,8 +57,14 @@ public without sharing class RoundRobinAssigner implements IThreadSafeCacheVisit
       for (SObject record : records) {
         Id ownerId = (Id) record.get(this.details.ownerField);
         Id nextOwnerId = assignmentIds[nextAssignmentIndex];
-        if (ownerId == null || activeAssignmentIds.contains(ownerId) == false || nextOwnerId == ownerId) {
-          record.put(OWNER_ID, nextOwnerId);
+        if (
+          ownerId == null ||
+          activeAssignmentIds.contains(ownerId) == false ||
+          nextOwnerId == ownerId ||
+          // edge case: the running user is part of the queue
+          ownerId == UserInfo.getUserId()
+        ) {
+          record.put(this.details.ownerField, nextOwnerId);
           cachedAssignment.Index__c = nextOwnerId;
           nextAssignmentIndex = nextAssignmentIndex == assignmentIds.size() - 1 ? 0 : nextAssignmentIndex + 1;
         }
diff --git a/core/classes/RoundRobinAssigner.cls-meta.xml b/core/classes/RoundRobinAssigner.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/RoundRobinAssignerTests.cls-meta.xml b/core/classes/RoundRobinAssignerTests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/RoundRobinRepository.cls-meta.xml b/core/classes/RoundRobinRepository.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/core/classes/RoundRobinRepositoryTests.cls-meta.xml b/core/classes/RoundRobinRepositoryTests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/integration-tests/classes/RoundRobinFlowIntegrationTests.cls-meta.xml b/integration-tests/classes/RoundRobinFlowIntegrationTests.cls-meta.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <status>Active</status>
 </ApexClass>
diff --git a/integration-tests/classes/RoundRobinTriggerIntegrationTest.cls b/integration-tests/classes/RoundRobinTriggerIntegrationTest.cls
@@ -0,0 +1,41 @@
+@IsTest
+private class RoundRobinTriggerIntegrationTest {
+  @IsTest
+  static void currentUserShouldNotTrumpOtherUsersBeforeInsert() {
+    // default owner for records is the current user when not otherwise specified
+    // but that requires special handling when the current user is also part of the
+    // valid pool of assignable users
+    User user = [
+      SELECT Id, FirstName, LastName, Email, Alias, TimeZoneSidKey, LocaleSidKey, EmailEncodingKey, ProfileId, LanguageLocaleKey
+      FROM User
+      WHERE Id = :UserInfo.getUserId()
+    ];
+    User newUser = user.clone();
+    newUser.Username = 'another1' + System.now().getTime() + '@example.com';
+    newUser.IsActive = true;
+    newUser.Email = newUser.Username;
+    insert newUser;
+
+    insert new List<QuickText>{
+      // should be assigned to new user
+      new QuickText(Name = 'One', Message = 'One'),
+      // should be assigned to current user
+      new QuickText(Name = 'Two', Message = 'Two'),
+      // queue is depleted: should be assigned to new user again
+      new QuickText(Name = 'Three', Message = 'Three')
+    };
+
+    List<QuickText> updatedQuickTexts = [SELECT OwnerId, Owner.FirstName FROM QuickText];
+    Integer ownerByNewUserCount = 0;
+    Integer ownerdByMeCount = 0;
+    for (QuickText updatedQuickText : updatedQuickTexts) {
+      if (updatedQuickText.OwnerId == newUser.Id) {
+        ownerByNewUserCount++;
+      } else if (updatedQuickText.OwnerId == UserInfo.getUserId()) {
+        ownerdByMeCount++;
+      }
+    }
+    Assert.areEqual(2, ownerByNewUserCount);
+    Assert.areEqual(1, ownerdByMeCount);
+  }
+}
diff --git a/integration-tests/classes/RoundRobinTriggerIntegrationTest.cls-meta.xml b/integration-tests/classes/RoundRobinTriggerIntegrationTest.cls-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>58.0</apiVersion>
+    <status>Active</status>
+</ApexClass>
diff --git a/integration-tests/flows/Round_Robin_Assign_Leads.flow-meta.xml b/integration-tests/flows/Round_Robin_Assign_Leads.flow-meta.xml
@@ -35,7 +35,7 @@
             </value>
         </inputParameters>
     </actionCalls>
-    <apiVersion>57.0</apiVersion>
+    <apiVersion>58.0</apiVersion>
     <assignments>
         <name>Add_Current_Record_to_Collection</name>
         <label>Add Current Record to Collection</label>
diff --git a/integration-tests/triggers/QuickTextTrigger.trigger b/integration-tests/triggers/QuickTextTrigger.trigger
@@ -0,0 +1,11 @@
+trigger QuickTextTrigger on QuickText(before insert) {
+  RoundRobinAssigner.IAssignmentRepo queryRepo = new QueryAssigner(
+    'SELECT Id FROM User WHERE IsActive = true AND FirstName = \'' +
+    UserInfo.getFirstName() +
+    '\' ORDER BY CreatedDate DESC',
+    'Id'
+  );
+  RoundRobinAssigner.Details assignmentDetails = new RoundRobinAssigner.Details();
+  assignmentDetails.assignmentType = 'quicktext-assignment';
+  new RoundRobinAssigner(queryRepo, assignmentDetails).assignOwners(Trigger.new);
+}
diff --git a/integration-tests/triggers/QuickTextTrigger.trigger-meta.xml b/integration-tests/triggers/QuickTextTrigger.trigger-meta.xml
@@ -0,0 +1,5 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<ApexTrigger xmlns="http://soap.sforce.com/2006/04/metadata">
+  <apiVersion>58.0</apiVersion>
+  <status>Active</status>
+</ApexTrigger>
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
diff --git a/sfdx-project.json b/sfdx-project.json
