Merge branch 'dev'

Author: James Cori

src/services/TermsOfUseService.js

@@ -47,8 +47,11 @@ async function getTermsOfUse (currentUser, termsOfUseId, query) {
     }
   ]
   if (userId) {
+    // logger.debug(`Getting Terms for User ${userId}`)
+    
     include.push({
       model: UserTermsOfUseXref,
+      as: 'UserTermsOfUseXrefs',
       where: { userId },
       attributes: ['userId'],
       required: false
@@ -71,6 +74,8 @@ async function getTermsOfUse (currentUser, termsOfUseId, query) {
     delete termsOfUse['UserTermsOfUseXrefs.userId']
   }
 
+  // logger.debug(`Raw Returned Data: ${JSON.stringify(termsOfUse)}`)
+
   return convertRawData(termsOfUse)
 }
 
@@ -462,7 +467,7 @@ async function searchTermsOfUses (criteria) {
 
   const query = {
     order: [['id', 'ASC']],
-    attributes: ['id', 'legacyId', 'title', 'url', 'agreeabilityTypeId'],
+    attributes: ['id', 'legacyId', 'title', 'url', 'agreeabilityTypeId', 'typeId'],
     include,
     where,
     limit: perPage,
@@ -472,7 +477,7 @@ async function searchTermsOfUses (criteria) {
 
   const result = await TermsOfUse.findAll(query)
 
-  logger.debug(`Query: ${JSON.stringify(query)}`)
+  // logger.debug(`Query: ${JSON.stringify(query)}`)
 
   for (const element of result) {
     convertRawData(element, false)