count processed resources

intrahealth · Oct 13, 2020 · 8bd2931 · 8bd2931
1 parent 704155d
commit 8bd2931
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "fhir2es",
-  "version": "1.2.9",
+  "version": "1.3.0",
   "description": "Reads and caches fhir data to elasticsearch",
   "main": "reports.js",
   "scripts": {

diff --git a/reports.js b/reports.js
@@ -839,6 +839,7 @@ class CacheFhirToES {
               this.getImmediateLinks(orderedResources, links, () => {
                 async.eachSeries(orderedResources, (orderedResource, nxtResourceType) => {
                   let processedRecords = []
+                  this.count = 1;
                   let url = URI(this.FHIRBaseURL)
                     .segment(orderedResource.resource)
                     .segment('_history')
@@ -858,6 +859,7 @@ class CacheFhirToES {
                           password: this.FHIRPassword,
                         },
                       }).then(response => {
+                        this.totalResources = response.data.total;
                         url = false;
                         const next = response.data.link.find(
                           link => link.relation === 'next'
@@ -902,10 +904,9 @@ class CacheFhirToES {
   }
 
   processResource(resourceData, orderedResource, reportDetails, processedRecords, callback) {
-    let count = 1
     async.each(resourceData, (data, nxtResource) => {
-      logger.info('processing ' + count + '/' + resourceData.length + ' records of resource ' + orderedResource.resource);
-      count++
+      logger.info('processing ' + this.count + '/' + this.totalResources + ' records of resource ' + orderedResource.resource);
+      this.count++
       if (!data.resource || !data.resource.resourceType) {
         return nxtResource()
       }