Refactor before and afterTemplate

Author: ThomasNickerson

api-js/src/affiliation/loaders/load-affiliation-connections-by-org-id.js

@@ -6,6 +6,7 @@ export const loadAffiliationConnectionsByOrgId =
   ({ query, userKey, cleanseInput, i18n }) =>
   async ({ orgId, after, before, first, last, orderBy, search }) => {
     let afterTemplate = aql``
+    let afterVar = aql``
     if (typeof after !== 'undefined') {
       const { id: afterId } = fromGlobalId(cleanseInput(after))
       if (typeof orderBy === 'undefined') {
@@ -17,12 +18,13 @@ export const loadAffiliationConnectionsByOrgId =
         } else {
           afterTemplateDirection = aql`<`
         }
-
+        
+        afterVar = aql`LET afterVar = DOCUMENT(users, PARSE_IDENTIFIER(DOCUMENT(affiliations, ${afterId})._to).key)`
         let affiliationField, documentField
         /* istanbul ignore else */
         if (orderBy.field === 'user-username') {
           affiliationField = aql`DOCUMENT(users, PARSE_IDENTIFIER(affiliation._to).key).userName`
-          documentField = aql`DOCUMENT(users, PARSE_IDENTIFIER(DOCUMENT(affiliations, ${afterId})._to).key).userName`
+          documentField = aql`afterVar.userName`
         }
 
         afterTemplate = aql`
@@ -34,6 +36,7 @@ export const loadAffiliationConnectionsByOrgId =
     }
 
     let beforeTemplate = aql``
+    let beforeVar = aql``
     if (typeof before !== 'undefined') {
       const { id: beforeId } = fromGlobalId(cleanseInput(before))
       if (typeof orderBy === 'undefined') {
@@ -46,11 +49,13 @@ export const loadAffiliationConnectionsByOrgId =
           beforeTemplateDirection = aql`>`
         }
 
+        beforeVar = aql`LET beforeVar = DOCUMENT(users, PARSE_IDENTIFIER(DOCUMENT(affiliations, ${beforeId})._to).key)`
+
         let affiliationField, documentField
         /* istanbul ignore else */
         if (orderBy.field === 'user-username') {
           affiliationField = aql`DOCUMENT(users, PARSE_IDENTIFIER(affiliation._to).key).userName`
-          documentField = aql`DOCUMENT(users, PARSE_IDENTIFIER(DOCUMENT(affiliations, ${beforeId})._to).key).userName`
+          documentField = aql`beforeVar.userName`
         }
 
         beforeTemplate = aql`
@@ -194,6 +199,9 @@ export const loadAffiliationConnectionsByOrgId =
 
       ${userSearchQuery}
 
+      ${afterVar}
+      ${beforeVar}
+
       LET affiliationKeys = (
         FOR v, e IN 1..1 OUTBOUND ${orgId} affiliations 
           ${userIdFilter}