Merge pull request #844 from AtlasOfLivingAustralia/hotfix/4.2.1

added fathom analytics site id and collectory fix

Author: temi

build.gradle

@@ -22,7 +22,7 @@ plugins {
     id 'jacoco'
 }
 
-version "4.2"
+version "4.2.1-SNAPSHOT"
 group "au.org.ala"
 description "Ecodata"
 

grails-app/domain/au/org/ala/ecodata/Hub.groovy

@@ -64,6 +64,9 @@ class Hub {
     /** The URL prefix to use when creating a URL a user can use to download a report */
     String downloadUrlPrefix
 
+    /** Fathom analytics site id for hub specific analytics. If not specified, BioCollect will use the default site id. */
+    String fathomSiteId
+
     AccessManagementOptions accessManagementOptions
 
     static mapping = {
@@ -89,6 +92,7 @@ class Hub {
         emailReplyToAddress nullable: true
         downloadUrlPrefix nullable: true
         accessManagementOptions nullable: true
+        fathomSiteId nullable: true
     }
 
     static embedded = ['mapLayersConfig', 'accessManagementOptions']

grails-app/services/au/org/ala/ecodata/CollectoryService.groovy

@@ -184,10 +184,6 @@ class CollectoryService {
                 }
             }
         }
-        else if (project.dataResourceId) {
-            // clear dataResourceId field
-            projectService.update([dataResourceId: null, dataProviderId: null], project.projectId, false)
-        }
     }
 
     def updateCollectoryEntryForProjects (Boolean isBiocollect) {

scripts/reports/IBSAProjectPublicResources.js

@@ -0,0 +1,15 @@
+
+
+var programs = ["Land Environmental Assessment Data","Department of Water and Environmental Regulation","Environmental Protection Authority","Department of Mines, Industry Regulation and Safety"];
+db.project.find({associatedProgram: {$in: programs}, status: "active"}).forEach(function(project) {
+
+});
+
+var projects = db.project.distinct('projectId', {associatedProgram: {$in: programs}, status:{$ne:'deleted'}});
+print("Project id,Project name,Organisation,Document id,Title,Description,Document type,File size,Content type,URL");
+db.document.find({projectId: {$in: projects}, "public": true, status:{$ne:'deleted'}}).forEach(function(document) {
+    var project = db.project.find({projectId: document.projectId}).next();
+    var path = document.filepath ? document.filepath + "/" : "";
+    var url = "https://biocollect.ala.org.au/document/download/" + path + encodeURIComponent(document.filename);
+    print(document.projectId + ",\"" + project.name.replace('"', '""') + "\",\"" + project.organisationName.replace('"', '""') + "\"," + document.documentId + "," + document.name + ",\"" + (document.description || "").replace('"', '""') + "\"," + document.type + "," + document.filesize + "," + document.contentType + "," + url);
+});

src/test/groovy/au/org/ala/ecodata/CollectoryServiceSpec.groovy

@@ -1,7 +1,6 @@
 package au.org.ala.ecodata
 
 import grails.converters.JSON
-import grails.testing.gorm.DataTest
 import grails.testing.services.ServiceUnitTest
 import org.grails.web.converters.marshaller.json.CollectionMarshaller
 import org.grails.web.converters.marshaller.json.MapMarshaller
@@ -148,7 +147,7 @@ class CollectoryServiceSpec extends Specification implements ServiceUnitTest<Col
 
     }
 
-    void "if previously harvested project is disabled, its dataResourceId should be cleared"() {
+    void "if previously harvested project is disabled, its dataResourceId should not be cleared"() {
         setup:
         String dataResourceId = 'dr1234'
         String projectId = '1234'
@@ -159,7 +158,7 @@ class CollectoryServiceSpec extends Specification implements ServiceUnitTest<Col
 
         then:
         0 * webServiceMock.doPost(_, _)
-        1 * projectService.update(['dataResourceId':null, 'dataProviderId':null], projectId, false)
+        0 * projectService.update(_, _, _)
     }
 
 

src/test/groovy/au/org/ala/ecodata/HubServiceSpec.groovy

@@ -9,12 +9,12 @@ class HubServiceSpec extends MongoSpec implements ServiceUnitTest<HubService>, D
 
     PermissionService permissionService = Mock(PermissionService)
     CommonService commonService = Stub(CommonService)
-    Hub hub = new Hub(urlPath:'test', hubId:'id', status:'active')
+    Hub hub = new Hub(urlPath:'test', hubId:'id', status:'active', fathomSiteId: '123')
 
     void setup() {
         service.permissionService = permissionService
         service.commonService = commonService
-        commonService.toBareMap(_) >> {args -> [urlPath:args[0].urlPath, hubId:args[0].hubId, status:args[0].status]}
+        commonService.toBareMap(_) >> {args -> [urlPath:args[0].urlPath, hubId:args[0].hubId, status:args[0].status, fathomSiteId: args[0].fathomSiteId]}
 
         Hub.findAll().each{it.delete(flush:true)}
         hub.save(failOnError:true, flush:true)
@@ -33,6 +33,7 @@ class HubServiceSpec extends MongoSpec implements ServiceUnitTest<HubService>, D
         then:
         result.urlPath == path
         result.hubId == hub.hubId
+        result.fathomSiteId == hub.fathomSiteId
     }
 
     void "hub permissions will be returned when a hub is queried by URL path"() {