opencrvs · Zangetsu101 · Apr 28, 2023 · Apr 28, 2023 · Apr 28, 2023 · Apr 28, 2023
diff --git a/Dockerfile b/Dockerfile
@@ -1,4 +1,4 @@
-FROM node:erbium
+FROM node:gallium-bullseye-slim
 
 # install dependencies
 ADD package.json yarn.lock /src/hearth/

diff --git a/lib/fhir/common.js b/lib/fhir/common.js
@@ -28,8 +28,8 @@ function buildOperationOutcome (severity, code, detailsText, diagnostics) {
     resourceType: 'OperationOutcome',
     issue: [
       {
-        severity: severity,
-        code: code,
+        severity,
+        code,
         details: {
           text: detailsText
         },
@@ -57,7 +57,7 @@ module.exports = exports = (mongo) => {
 
   const buildHTTPOutcome = (httpStatus, severity, code, detailsText, diagnostics) => {
     return {
-      httpStatus: httpStatus,
+      httpStatus,
       resource: buildOperationOutcome(severity, code, detailsText, diagnostics)
     }
   }
@@ -96,9 +96,9 @@ module.exports = exports = (mongo) => {
       doc.meta.security = []
     }
     doc.meta.security.push({
-      system: system,
-      code: code,
-      display: display
+      system,
+      code,
+      display
     })
   }
 
@@ -348,7 +348,7 @@ module.exports = exports = (mongo) => {
      */
     // end jsdoc
 
-    formatResource: formatResource,
+    formatResource,
 
     bundleResults: (type, entries, total, callingUrl) => {
       const url = URI(callingUrl)
@@ -358,7 +358,7 @@ module.exports = exports = (mongo) => {
         meta: {
           lastUpdated: moment().format(dateFormat)
         },
-        type: type,
+        type,
         total: ((total !== null) ? total : entries.length),
         link: [
           {
@@ -408,11 +408,11 @@ module.exports = exports = (mongo) => {
       })
     },
 
-    buildOperationOutcome: buildOperationOutcome,
-    buildHTTPOutcome: buildHTTPOutcome,
+    buildOperationOutcome,
+    buildHTTPOutcome,
     internalServerErrorOutcome: () => buildOperationOutcome('fatal', 'exception', 'Internal server error'),
 
-    isValidReferenceString: isValidReferenceString,
+    isValidReferenceString,
 
     /**
      * Extracts an attachment from a document and stores it seperately, removing it from the document
@@ -540,11 +540,11 @@ module.exports = exports = (mongo) => {
      * @param {Function}  callback  (err, array<String>) with array an list of resources,
      *                              e.g. ['Practitioner/123']
      */
-    lookupPractitionersForOrganization: lookupPractitionersForOrganization,
+    lookupPractitionersForOrganization,
 
     breakTheGlassCategory: 'http://hl7.org/fhir/security-label#break-the-glass',
 
-    addSecurityLabel: addSecurityLabel,
+    addSecurityLabel,
 
     addSubsettedSecurityLabel: (doc) => {
       addSecurityLabel(doc, 'http://hl7.org/fhir/ValueSet/v3-SecurityIntegrityObservationValue', 'SUBSETTED', 'subsetted')
@@ -619,15 +619,15 @@ module.exports = exports = (mongo) => {
         }
       },
 
-      generateID: generateID,
+      generateID,
 
       /**
        * Validate a value as a FHIR id datatype
        *
        * @param  {String} id The value to validate
        * @return {Boolean}
        */
-      validateID: validateID
+      validateID
 
     }
   }

diff --git a/lib/fhir/core.js b/lib/fhir/core.js
@@ -79,14 +79,14 @@ module.exports = (mongo, modules) => {
             }
 
             const c = db.collection(resourceType)
-            c.findOne({ id: id }, (err, resource) => {
+            c.findOne({ id }, (err, resource) => {
               if (err) {
                 return callback(err)
               }
 
               if (!resource) {
                 const c = db.collection(`${resourceType}_history`)
-                c.findOne({ id: id }, (err, resource) => {
+                c.findOne({ id }, (err, resource) => {
                   if (err) {
                     return callback(err)
                   }
@@ -144,7 +144,7 @@ module.exports = (mongo, modules) => {
 
             const c = db.collection(resourceType)
 
-            c.findOne({ id: id, 'meta.versionId': vid }, (err, resource) => {
+            c.findOne({ id, 'meta.versionId': vid }, (err, resource) => {
               if (err) {
                 return callback(err)
               }
@@ -162,7 +162,7 @@ module.exports = (mongo, modules) => {
 
               if (!resource) {
                 const cHistory = db.collection(`${resourceType}_history`)
-                cHistory.findOne({ id: id, 'meta.versionId': vid }, (err, resource) => {
+                cHistory.findOne({ id, 'meta.versionId': vid }, (err, resource) => {
                   if (err) {
                     return callback(err)
                   }
@@ -499,7 +499,7 @@ module.exports = (mongo, modules) => {
                 }
 
                 const location = `/fhir/${resourceType}/${resource.id}/_history/${resource.meta.versionId}`
-                callback(null, { httpStatus: 201, location: location, id: resource.id })
+                callback(null, { httpStatus: 201, location, id: resource.id })
               })
             })
           })
@@ -540,7 +540,7 @@ module.exports = (mongo, modules) => {
             }
             const c = db.collection(resourceType)
 
-            c.findOne({ id: id }, {}, (err, result) => {
+            c.findOne({ id }, {}, (err, result) => {
               if (err) {
                 return callback(err)
               }
@@ -573,7 +573,7 @@ module.exports = (mongo, modules) => {
               }
 
               c.findOneAndReplace({
-                id: id
+                id
               }, resource, options, (err, result) => {
                 if (err) {
                   return callback(err)
@@ -586,7 +586,7 @@ module.exports = (mongo, modules) => {
                     }
 
                     const location = `/fhir/${resourceType}/${resource.id}/_history/${resource.meta.versionId}`
-                    callback(null, { httpStatus: 201, location: location, etag: resource.meta.versionId, id: resource.id })
+                    callback(null, { httpStatus: 201, location, etag: resource.meta.versionId, id: resource.id })
                   })
                 }
 
@@ -609,9 +609,9 @@ module.exports = (mongo, modules) => {
                     const location = `/fhir/${resourceType}/${id}/_history/${resource.meta.versionId}`
                     callback(null, {
                       httpStatus: 200,
-                      location: location,
+                      location,
                       etag: resource.meta.versionId,
-                      id: id
+                      id
                     })
                   })
                 })
@@ -648,13 +648,13 @@ module.exports = (mongo, modules) => {
             }
 
             const c = db.collection(resourceType)
-            c.findOneAndDelete({ id: id }, (err, result) => {
+            c.findOneAndDelete({ id }, (err, result) => {
               if (err) {
                 return callback(err)
               }
 
               if (!result.value) {
-                return callback(null, { httpStatus: 204, id: id })
+                return callback(null, { httpStatus: 204, id })
               }
 
               const historyDoc = result.value
@@ -685,12 +685,12 @@ module.exports = (mongo, modules) => {
                         return handleErrorAndBadRequest(err, badRequest, callback)
                       }
 
-                      callback(null, { httpStatus: 204, id: id })
+                      callback(null, { httpStatus: 204, id })
                     })
                   })
                 })
               } else {
-                cHistory.remove({ id: id }, (err) => {
+                cHistory.remove({ id }, (err) => {
                   if (err) {
                     return callback(err)
                   }
@@ -700,7 +700,7 @@ module.exports = (mongo, modules) => {
                       return handleErrorAndBadRequest(err, badRequest, callback)
                     }
 
-                    callback(null, { httpStatus: 204, id: id })
+                    callback(null, { httpStatus: 204, id })
                   })
                 })
               }

diff --git a/lib/fhir/module-loader.js b/lib/fhir/module-loader.js
@@ -40,7 +40,7 @@ module.exports = exports = (mongo) => {
       })
     },
 
-    getLoadedModules: getLoadedModules
+    getLoadedModules
   }
 }
 

diff --git a/lib/fhir/query-builder.js b/lib/fhir/query-builder.js
@@ -113,7 +113,7 @@ module.exports = (mongo) => {
     }
 
     return {
-      path: path,
+      path,
       condition: conditionalMatch ? conditionalMatch[1] : null // 2nd index - no brackets
     }
   }
@@ -402,6 +402,6 @@ module.exports = (mongo) => {
 
   return {
     private: exposedPrivateFuncsForTesting,
-    buildQuery: buildQuery
+    buildQuery
   }
 }
diff --git a/lib/fhir/query-utils.js b/lib/fhir/query-utils.js
@@ -112,7 +112,7 @@ module.exports = (mongo) => {
      * @param {String}  value The date value to transform
      * @returns {Date}  The transformed date
      */
-    transformDate: transformDate,
+    transformDate,
 
     tokenToSystemValue: (fieldToMatch, token, propertyDefObj) => {
       const match = (fieldToMatch, token) => {
@@ -360,7 +360,7 @@ module.exports = (mongo) => {
       return null
     },
 
-    paramAsReference: paramAsReference,
+    paramAsReference,
 
     /**
      * Build a mongo query clause that allows for date or period searching.

diff --git a/lib/fhir/query-validator.js b/lib/fhir/query-validator.js
@@ -19,8 +19,8 @@ const extensionConf = require('../../config/queryparam-extensions.json')
 
 module.exports = () => {
   return {
-    standardFHIRParams: standardFHIRParams,
-    standardFHIRSearchParams: standardFHIRSearchParams,
+    standardFHIRParams,
+    standardFHIRSearchParams,
 
     validateQueryParams: (resourceType, queryParams, customSupported, callback) => {
       const supportedParams = Object.assign({}, searchParamsMap[resourceType], customSupported, extensionConf[resourceType])

diff --git a/lib/fhir/resources/matching.js b/lib/fhir/resources/matching.js
@@ -58,7 +58,7 @@ module.exports = (mongo) => {
             url: 'http://hl7.org/fhir/StructureDefinition/match-grade',
             valueCode: scoreToString(score)
           },
-          score: score
+          score
         }
       }
       return matchesMap[key]
@@ -210,9 +210,9 @@ module.exports = (mongo) => {
   return {
     name: 'Matching',
 
-    algorithms: algorithms,
-    createEliminateMatchingOnSelfQuery: createEliminateMatchingOnSelfQuery,
-    appendToQuery: appendToQuery,
+    algorithms,
+    createEliminateMatchingOnSelfQuery,
+    appendToQuery,
 
     match: (resourceType, queryResource, count, callback) => {
       const resourceId = queryResource.id
@@ -252,12 +252,12 @@ module.exports = (mongo) => {
                 case 'levenshtein': {
                   const workerContext = {
                     workerName: `mpi_query_${path}`,
-                    resourceType: resourceType,
-                    queryResource: queryResource,
-                    path: path,
-                    algorithm: algorithm,
-                    weight: weight,
-                    discriminatorQuery: discriminatorQuery
+                    resourceType,
+                    queryResource,
+                    path,
+                    algorithm,
+                    weight,
+                    discriminatorQuery
                   }
 
                   promises.push(matchingWorker.startMatchingWorker(workerContext))

diff --git a/lib/fhir/root.js b/lib/fhir/root.js
@@ -53,7 +53,7 @@ module.exports = (mongo, modules, callback) => {
       const pushReverts = (revertType, successStatusArray) => {
         if (successStatusArray.indexOf(outcome.httpStatus) > -1) {
           revert[revertType].push({
-            resourceType: resourceType,
+            resourceType,
             id: outcome.id
           })
         }
@@ -102,7 +102,7 @@ module.exports = (mongo, modules, callback) => {
   }
 
   const processEntry = (baseCtx, entry, revert, isTransaction, callback) => {
-    const parsedUrl = url.parse(entry.request.url, true) // eslint-disable-line node/no-deprecated-api
+    const parsedUrl = url.parse(entry.request.url, true) // eslint-disable-line n/no-deprecated-api
 
     const entryCtx = {
       authenticatedUser: baseCtx.authenticatedUser,

diff --git a/lib/fhir/services/matching-worker/matching-worker.js b/lib/fhir/services/matching-worker/matching-worker.js
@@ -38,6 +38,6 @@ module.exports = (mongo) => {
   }
 
   return {
-    startMatchingWorker: startMatchingWorker
+    startMatchingWorker
   }
 }
diff --git a/lib/fhir/services/terminology-service.js b/lib/fhir/services/terminology-service.js
@@ -38,7 +38,7 @@ module.exports = (mongo) => {
           'codeSystem.system': system,
           'codeSystem.concept': {
             $elemMatch: {
-              code: code
+              code
             }
           }
         }
-Original file line number
+Diff line change
@@ Expand Up / @@ -40,7 +40,7 @@ module.exports = exports = (mongo) => { @@
           })
         },
-        getLoadedModules: getLoadedModules
+        getLoadedModules
       }
     }
@@ Expand Down @@