more clean up, more comments, plus fixed a bug in the generation of ddKeys in dd2queries.js

punkish · punkish · commit 6e72fb3dace2 · 2020-04-27T09:43:16.000+02:00
diff --git a/api/v2/lib/dd2queries.js b/api/v2/lib/dd2queries.js
@@ -119,11 +119,14 @@ const calcQuery = function(ddKeys, queryGroup, query, queryObject, matchTables,
     const offset = queryObject.offset || query.offset || 0;
     
     if (matchTables.length) {
+
         tables.push(...matchTables);
     }
 
     if (queryGroup !== 'taxonStats' && queryGroup !== 'related') {
+
         if (addedConstraint.length) {
+
             constraint.push(...addedConstraint);
         }
     }
@@ -134,11 +137,13 @@ const calcQuery = function(ddKeys, queryGroup, query, queryObject, matchTables,
     // now, figure out the sort params, if applicable
     let [sortcol, sortdir] = ['', ''];
     if (queryObject.sortBy && Object.keys(sortBy).length) {
+
         [sortcol, sortdir] = calcSortParams(sortBy, queryObject);
         sql += ` ORDER BY ${sortcol} ${sortdir}`;
     }
 
     if (group && Object.keys(group).length) {
+
         sql += ` GROUP BY ${group.join(' ')}`;
     }
 
@@ -180,7 +185,11 @@ const getDdKeys = function() {
                     table: f.table || false,
                     resourceId: f.resourceId ? f.plaziName : false
                 }
+            }
+
+            if (f.resourceId) {
 
+                byResourceIds[resource] = f.plaziName
             }
 
         }
@@ -219,13 +228,11 @@ const dd2queries = function(queryObject) {
     const doGroups = ['essential'];
 
     if (queryObject[pk]) {
-        console.log(`pk key: ${pk}`);
-        console.log(`pk val: ${queryObject[pk]}`);
-        doGroups.push(...[ 'related', 'taxonStats' ]);
         
+        doGroups.push(...[ 'related', 'taxonStats' ]);
     }
     else {
-        console.log('no pk');
+        
         if (queryObject.facets) doGroups.push('facets');
         if (queryObject.stats) doGroups.push('stats');
     }
diff --git a/api/v2/lib/qparts.js b/api/v2/lib/qparts.js
@@ -215,8 +215,8 @@ const queryParts = {
                     tables: ['materialsCitations'],
                     constraint: [
                         'deleted = 0', 
-                        'latitude != ""', 
-                        'longitude != ""',
+                        "latitude != ''", 
+                        "longitude != ''",
                         'treatmentId = @treatmentId'
                     ],
                     sortBy: {},
@@ -232,7 +232,10 @@ const queryParts = {
                         'thumbnailUri'
                     ],
                     tables: ['figureCitations'],
-                    constraint: ['deleted = 0', 'treatmentId = @treatmentId'],
+                    constraint: [
+                        'deleted = 0', 
+                        'treatmentId = @treatmentId'
+                    ],
                     sortBy: {},
                     group: []
                 }
@@ -444,7 +447,7 @@ const queryParts = {
                         'treatments.id',
                         'treatments.treatmentId AS treatmentId', 
                         'treatmentTitle', 
-                        'authorityName || ". " || authorityYear || ". <i>" || articleTitle || ".</i> " || journalTitle || ", " || journalYear || ", pp. " || pages || ", vol. " || journalVolume || ", issue " || journalIssue AS context'
+                        "authorityName || '. ' || authorityYear || '. <i>' || articleTitle || '.</i> ' || journalTitle || ', ' || journalYear || ', pp. ' || pages || ', vol. ' || journalVolume || ', issue ' || journalIssue AS context"
                     ],
                     tables: [
                         'treatments',
@@ -509,7 +512,7 @@ const queryParts = {
                         'treatments.id',
                         'treatments.treatmentId AS treatmentId', 
                         'treatmentTitle', 
-                        'authorityName || ". " || authorityYear || ". <i>" || articleTitle || ".</i> " || journalTitle || ", " || journalYear || ", pp. " || pages || ", vol. " || journalVolume || ", issue " || journalIssue AS context'
+                        "authorityName || '. ' || authorityYear || '. <i>' || articleTitle || '.</i> ' || journalTitle || ', ' || journalYear || ', pp. ' || pages || ', vol. ' || journalVolume || ', issue ' || journalIssue AS context"
                     ],
                     tables: [
                         'treatments',
@@ -565,7 +568,7 @@ const queryParts = {
                         'treatments.id', 
                         'treatments.treatmentId AS treatmentId', 
                         'treatmentTitle', 
-                        'authorityName || ". " || authorityYear || ". <i>" || articleTitle || ".</i> " || journalTitle || ", " || journalYear || ", pp. " || pages || ", vol. " || journalVolume || ", issue " || journalIssue AS context'
+                        "authorityName || '. ' || authorityYear || '. <i>' || articleTitle || '.</i> ' || journalTitle || ', ' || journalYear || ', pp. ' || pages || ', vol. ' || journalVolume || ', issue ' || journalIssue AS context"
                     ],
                     tables: [
                         'treatments', 
@@ -629,7 +632,7 @@ const queryParts = {
                         'treatments.id', 
                         'treatments.treatmentId AS treatmentId', 
                         'treatmentTitle', 
-                        'authorityName || ". " || authorityYear || ". <i>" || articleTitle || ".</i> " || journalTitle || ", " || journalYear || ", pp. " || pages || ", vol. " || journalVolume || ", issue " || journalIssue AS context'
+                        "authorityName || '. ' || authorityYear || '. <i>' || articleTitle || '.</i> ' || journalTitle || ', ' || journalYear || ', pp. ' || pages || ', vol. ' || journalVolume || ', issue ' || journalIssue AS context"
                     ],
                     tables: [
                         'treatments', 
@@ -726,7 +729,7 @@ const queryParts = {
                         'treatments.id', 
                         'treatments.treatmentId AS treatmentId', 
                         'treatmentTitle', 
-                        'authorityName || ". " || authorityYear || ". <i>" || articleTitle || ".</i> " || journalTitle || ", " || journalYear || ", pp. " || pages || ", vol. " || journalVolume || ", issue " || journalIssue AS context'
+                        "authorityName || '. ' || authorityYear || '. <i>' || articleTitle || '.</i> ' || journalTitle || ', ' || journalYear || ', pp. ' || pages || ', vol. ' || journalVolume || ', issue ' || journalIssue AS context"
                     ],
                     tables: [
                         'treatments', 
diff --git a/api/v2/lib/zenodeo.js b/api/v2/lib/zenodeo.js
@@ -167,13 +167,16 @@ const getOneRecord = function(queryObject) {
 
     // We are done if no records found
     if (! data['num-of-records']) {
+        
         timer = process.hrtime(timer);
         return Utils.dataForDelivery(timer, data, debug);
     }
 
     // more data from beyond the database
     if (queryObject.resource === 'treatments') {
+
         if (queryObject.xml && queryObject.xml === 'true') {
+
             data.records[0].xml = getXml(queryObject.treatmentId);
         }
         
diff --git a/api/v2/utils.js b/api/v2/utils.js
@@ -250,10 +250,21 @@ module.exports = {
     
     halify: function({records, uri, resource, id}) {
         records.forEach(row => {
-            row._links = this.makeSelfLink({
+            // row._links = this.makeLink({
+            //     uri: uri,
+            //     path: resource.toLowerCase(),
+            //     queryString: `${id}=${row[id]}`
+            // })
+            row._links = {};
+            row._links.self = this.makeLink({
                 uri: uri,
-                path: resource.toLowerCase(),
-                queryString: `${id}=${row[id]}`
+                params: { 
+                    path: resource.toLowerCase(),
+                    resourceId: { 
+                        key: id,
+                        val: row[id]
+                    }
+                }
             })
         });
 

Original file line number	Diff line number	Diff line change
`@@ -119,11 +119,14 @@ const calcQuery = function(ddKeys, queryGroup, query, queryObject, matchTables,`
`119`	`119`	`const offset = queryObject.offset \|\| query.offset \|\| 0;`
`120`	`120`
`121`	`121`	`if (matchTables.length) {`
	`122`	`+`
`122`	`123`	`tables.push(...matchTables);`
`123`	`124`	`}`
`124`	`125`
`125`	`126`	`if (queryGroup !== 'taxonStats' && queryGroup !== 'related') {`
	`127`	`+`
`126`	`128`	`if (addedConstraint.length) {`
	`129`	`+`
`127`	`130`	`constraint.push(...addedConstraint);`
`128`	`131`	`}`
`129`	`132`	`}`
`@@ -134,11 +137,13 @@ const calcQuery = function(ddKeys, queryGroup, query, queryObject, matchTables,`
`134`	`137`	`// now, figure out the sort params, if applicable`
`135`	`138`	`let [sortcol, sortdir] = ['', ''];`
`136`	`139`	`if (queryObject.sortBy && Object.keys(sortBy).length) {`
	`140`	`+`
`137`	`141`	`[sortcol, sortdir] = calcSortParams(sortBy, queryObject);`
`138`	`142`	sql += ` ORDER BY ${sortcol} ${sortdir}`;
`139`	`143`	`}`
`140`	`144`
`141`	`145`	`if (group && Object.keys(group).length) {`
	`146`	`+`
`142`	`147`	sql += ` GROUP BY ${group.join(' ')}`;
`143`	`148`	`}`
`144`	`149`
`@@ -180,7 +185,11 @@ const getDdKeys = function() {`
`180`	`185`	`table: f.table \|\| false,`
`181`	`186`	`resourceId: f.resourceId ? f.plaziName : false`
`182`	`187`	`}`
	`188`	`+ }`
	`189`	`+`
	`190`	`+ if (f.resourceId) {`
`183`	`191`
	`192`	`+ byResourceIds[resource] = f.plaziName`
`184`	`193`	`}`
`185`	`194`
`186`	`195`	`}`
`@@ -219,13 +228,11 @@ const dd2queries = function(queryObject) {`
`219`	`228`	`const doGroups = ['essential'];`
`220`	`229`
`221`	`230`	`if (queryObject[pk]) {`
`222`		- console.log(`pk key: ${pk}`);
`223`		- console.log(`pk val: ${queryObject[pk]}`);
`224`		`- doGroups.push(...[ 'related', 'taxonStats' ]);`
`225`	`231`
	`232`	`+ doGroups.push(...[ 'related', 'taxonStats' ]);`
`226`	`233`	`}`
`227`	`234`	`else {`
`228`		`- console.log('no pk');`
	`235`	`+`
`229`	`236`	`if (queryObject.facets) doGroups.push('facets');`
`230`	`237`	`if (queryObject.stats) doGroups.push('stats');`
`231`	`238`	`}`
Original file line number	Diff line number	Diff line change
`@@ -167,13 +167,16 @@ const getOneRecord = function(queryObject) {`
`167`	`167`
`168`	`168`	`// We are done if no records found`
`169`	`169`	`if (! data['num-of-records']) {`
	`170`	`+`
`170`	`171`	`timer = process.hrtime(timer);`
`171`	`172`	`return Utils.dataForDelivery(timer, data, debug);`
`172`	`173`	`}`
`173`	`174`
`174`	`175`	`// more data from beyond the database`
`175`	`176`	`if (queryObject.resource === 'treatments') {`
	`177`	`+`
`176`	`178`	`if (queryObject.xml && queryObject.xml === 'true') {`
	`179`	`+`
`177`	`180`	`data.records[0].xml = getXml(queryObject.treatmentId);`
`178`	`181`	`}`
`179`	`182`