method to force time and person of verb issue #3

Author: lopezjuanma96

functions/handlers.js

@@ -1,7 +1,7 @@
-async function handleType(obj, sentence, langRef, src, defaults){
+async function handleType(obj, sentence, langRef, src, defaults, forces){
     switch (obj.type){
         case 'VERB':
-            obj = await handleVERB(obj, sentence, langRef, src, defaults);
+            obj = await handleVERB(obj, sentence, langRef, src, defaults, forces);
             break;
         case 'NOUN':
             obj = await handleNOUN(obj, sentence, langRef, src, defaults);
@@ -18,7 +18,7 @@ async function handleType(obj, sentence, langRef, src, defaults){
     }
 }
 
-async function handleVERB(obj, sentence, langRef, src, defaults){
+async function handleVERB(obj, sentence, langRef, src, defaults, forces){
     //HERE: we are joining prepositions into the previous verb
     let prepIndex = obj.types.findIndex(t => t === 'PREP')
     while (prepIndex >= 0) {
@@ -30,17 +30,21 @@ async function handleVERB(obj, sentence, langRef, src, defaults){
     obj.meta.PERSON = defaults.PERSON;
 
     const childrenSUBJ = obj.children.filter(c => c.type === 'SUBJ' || c.type === 'NOUN') //HERE: check if include NOUN here is ok
-    if (childrenSUBJ.length > 1) {
+    if (forces.PERSON){
+        obj.meta.PERSON = forces.PERSON;
+    } else if (childrenSUBJ.length > 1) {
         const childrenSUBJpersons = childrenSUBJ.map(c => sentence[c.position].meta.PERSON)
         const personsPluralsSn = await langRef.child(`PERSONS/PLURALS`).get() //if there's more than one subj token, recall the personPlurals
         const personsPlurals = personsPluralsSn.val() || {};
-        const foundPerson = personsPlurals.find(person => ( childrenSUBJpersons.includes(person[0]) || childrenSUBJpersons.includes(person[1])));
+        const foundPerson = personsPlurals.find(person => childrenSUBJpersons.includes(person[0]) || childrenSUBJpersons.includes(person[1]));
         obj.meta.PERSON = foundPerson[1];
     } else if (childrenSUBJ.length === 1) obj.meta.PERSON = sentence[childrenSUBJ[0].position].meta.PERSON || obj.meta.PERSON;
 
     obj.meta.TIME = defaults.TIME;
     const childrenADV = obj.children.filter(c => c.type === 'ADV')
-    if (childrenADV.length > 1) {
+    if (forces.TIME){
+        obj.meta.TIME = forces.TIME;
+    } else if (childrenADV.length > 1) {
         const sortedChildrenADV = childrenADV.sort((a, b) => Math.abs(a.position - obj.position) - Math.abs(b.position - obj.position))
         for (childADV of sortedChildrenADV) {
             if (sentence[childADV.position].meta.TIME) {

functions/methods.js

@@ -134,12 +134,12 @@ async function parseDependencies(wordList, headlessList, language){ //Algorithm
 
 const { handleType } = require('./handlers.js')
 
-async function handleSentence(sentence, language, src = 'static'){
+async function handleSentence(sentence, language, forces, src = 'static'){
     const defaultsSn = await rt.ref(`${language}/DEFAULTS`).get()
     const defaults = defaultsSn.val() || {};
     const langRef = rt.ref(language)
 
-    for (obj of sentence) await handleType(obj, sentence, langRef, src, defaults);
+    for (obj of sentence) await handleType(obj, sentence, langRef, src, defaults, forces);
 
     return sentence;
 }

functions/routing.js

@@ -1,5 +1,5 @@
 const express = require('express');
-const { error } = require("firebase-functions/lib/logger");
+const { log, error } = require("firebase-functions/lib/logger");
 
 const { 
     addLexiconData, 
@@ -45,9 +45,10 @@ app.post('/', allowCors, (req, res) => {
         res.status(400).send({err: 'Wrong request body, missing properties words and/or types'})
         return;
     }
+    const forces = {...req.query}
     prepareSentence(body.words, body.types, body.props || {}, body.language || 'en')
     .then(prepared => parseDependencies(prepared, [], body.language || 'en'))
-    .then(([parsed, headless]) => handleSentence(parsed, body.language || 'en'))
+    .then(([parsed, headless]) => handleSentence(parsed, body.language || 'en', forces))
     .then(handled => res.status(200).json({sentence: handled}))
     .catch((err) => {
         error(`Error at parsing: ${err.message}`);
@@ -89,9 +90,11 @@ app.post('/realise', allowCors, (req, res) => {
         res.status(400).send({err: 'Wrong request body, missing properties words and/or types'})
         return;
     }
+    log(body)
+    const forces = {...req.query}
     prepareSentence(body.words, body.types, body.props || {}, body.language || 'en')
     .then(prepared => parseDependencies(prepared, [], body.language || 'en'))
-    .then(([parsed, headless]) => handleSentence(parsed, body.language || 'en'))
+    .then(([parsed, headless]) => handleSentence(parsed, body.language || 'en', forces))
     .then(handled => realiseSentence(handled, body.language || 'en'))
     .then(realised => res.status(200).json({sentence: realised}))
     .catch((err) => {