fix: surveyingUser failsafe storing all valid values

hopetambala · Dec 14, 2020 · e6e6a3b · e6e6a3b
1 parent 07c61c1
commit e6e6a3b
Show file tree

Hide file tree

Showing 5 changed files with 15 additions and 15 deletions.
diff --git a/domains/DataCollection/Forms/IdentificationForm/index.js b/domains/DataCollection/Forms/IdentificationForm/index.js
@@ -9,20 +9,22 @@ import { postObjectsToClass } from '../../../../services/parse/crud';
 
 import { storeData } from '../../../../modules/async-storage';
 import checkOnlineStatus from '../../../../modules/offline';
-import { generateRandomID } from '../../../../modules/utils';
+import { generateRandomID, isEmpty } from '../../../../modules/utils';
 import { layout } from '../../../../modules/theme';
 import I18n from '../../../../modules/i18n';
 
 import PaperButton from '../../../../components/Button';
 import PaperInputPicker from '../../../../components/FormikFields/PaperInputPicker';
 import yupValidationPicker from '../../../../components/FormikFields/YupValidation';
 
-import { backgroundPostPatient, surveyingUserFailsafe } from './utils';
+import backgroundPostPatient from './utils';
+import surveyingUserFailsafe from '../utils';
+
 import configArray from './config/config';
 
 const IdentificationForm = ({
   scrollViewScroll, setScrollViewScroll,
-  setSelectedForm, setSurveyee, surveyingOrganization
+  setSelectedForm, setSurveyee, surveyingUser, surveyingOrganization
 }) => {
   useEffect(() => {
     const interval = setInterval(() => {
@@ -54,7 +56,7 @@ const IdentificationForm = ({
 
             const formObject = values;
             formObject.surveyingOrganization = surveyingOrganization;
-            formObject.surveyingUser = await surveyingUserFailsafe();
+            formObject.surveyingUser = await surveyingUserFailsafe(surveyingUser, isEmpty);
 
             formObject.latitude = values.location?.latitude || 0;
             formObject.longitude = values.location?.longitude || 0;

diff --git a/domains/DataCollection/Forms/IdentificationForm/utils/index.js b/domains/DataCollection/Forms/IdentificationForm/utils/index.js
@@ -30,9 +30,4 @@ const backgroundPostPatient = () => {
     });
 };
 
-const surveyingUserFailsafe = async () => {
-  const user = await getData('currentUser');
-  return user.username || user.email || user.id || user.firstname || user.lastname;
-};
-
-export { backgroundPostPatient, surveyingUserFailsafe };
+export default backgroundPostPatient;
diff --git a/domains/DataCollection/Forms/SupplementaryForm/index.js b/domains/DataCollection/Forms/SupplementaryForm/index.js
@@ -11,6 +11,7 @@ import { postObjectsToClassWithRelation } from '../../../../services/parse/crud'
 
 import { layout } from '../../../../modules/theme';
 import I18n from '../../../../modules/i18n';
+import { isEmpty } from '../../../../modules/utils';
 
 import PaperInputPicker from '../../../../components/FormikFields/PaperInputPicker';
 import yupValidationPicker from '../../../../components/FormikFields/YupValidation';
@@ -23,7 +24,7 @@ import surveyingUserFailsafe from '../utils';
 import { addSelectTextInputs, vitalsBloodPressue } from './utils';
 
 const SupplementaryForm = ({
-  navigation, selectedForm, setSelectedForm, surveyee, surveyingOrganization,
+  navigation, selectedForm, setSelectedForm, surveyee, surveyingUser, surveyingOrganization,
   customForm
 }) => {
   const [config, setConfig] = useState({});
@@ -56,7 +57,7 @@ const SupplementaryForm = ({
       onSubmit={async (values, actions) => {
         setPhotoFile('Submitted Photo String');
         const formObject = values;
-        formObject.surveyingUser = await surveyingUserFailsafe();
+        formObject.surveyingUser = await surveyingUserFailsafe(surveyingUser, isEmpty);
         formObject.surveyingOrganization = surveyingOrganization;
 
         let formObjectUpdated = addSelectTextInputs(values, formObject);

diff --git a/domains/DataCollection/Forms/utils/index.js b/domains/DataCollection/Forms/utils/index.js
@@ -1,8 +1,10 @@
 import { getData } from '../../../../modules/async-storage';
 
-const surveyingUserFailsafe = async () => {
+const surveyingUserFailsafe = async (defautValue, validationFail) => {
   const user = await getData('currentUser');
-  return user.username || user.email || user.id || user.firstname || user.lastname;
+  const userChecks = [defautValue, user.username, user.email, user.id, user.firstname, user.lastname, 'N/A'];
+  const validIdentifiers = userChecks.filter((uniqueId) => validationFail(uniqueId) === false);
+  return validIdentifiers[0];
 };
 
 export default surveyingUserFailsafe;
diff --git a/modules/utils/index.js b/modules/utils/index.js
@@ -1,4 +1,4 @@
 const generateRandomID = () => Math.random().toString(20).substr(2, 12);
-const isEmpty = (str) => (!str || str.length === 0);
+const isEmpty = (str) => (!str || str === undefined || str.length === 0 || !/\S/.test(str));
 
 export { isEmpty, generateRandomID };