Merge branch 'master' into beta-new

Author: dr3

functions/utilities/getTypeSafeUser.js

@@ -30,6 +30,13 @@ const validateBoolean = (value) => {
     return null
 }
 
+const validateStringArray = (value) => {
+    if(Array.isArray(value)) {
+        return value.filter(s => typeof s === 'string' && s);
+    }
+    return null
+}
+
 const getGuardianEmails = (user) => {
     try {
       return [...new Set([user?.guardianEmail, ...(user?.emails?.filter(e => e?.type === 'guardian').map(e => e?.email) || [])])].filter(s => typeof s === 'string' && s)   
@@ -39,6 +46,15 @@ const getGuardianEmails = (user) => {
     }
 }
 
+const getAdditionalStudentEmails = (user) => {
+    try {
+      return [...new Set([...(user?.emails?.filter(e => e?.type === 'student').map(e => e?.email) || [])])].filter(s => typeof s === 'string' && s)   
+    } catch (error) {
+        console.error('Error getting student emails:', error);
+        return [];
+    }
+}
+
 // This data gets passed through Graphql
 // As firebase data is set client side, it can't always be trusted
 // If a value is wrong type, it will be set to null
@@ -51,15 +67,15 @@ const getTypeSafeUser = (user) => {
         uid: validateString(user.uid),
         first: validateString(user.first),
         last: validateString(user.last),
-        teacherCode: validateString(user.teacherCode),
+        teacherCode: null, // deprecated - use teacherCodes array instead
         code: validateString(user.code),
         level: validateString(user.level),
         birthMonth: validateNumber(user.birthMonth),
         birthYear: validateNumber(user.birthYear),
         schoolName: validateString(user.schoolName),
         phoneNumber: validateString(user.phoneNumber),
         postCode: validateString(user.postCode),
-        guardianEmail: validateString(user.guardianEmail),
+        guardianEmail: null, // deprecated - use guardianEmails array instead
         guardianEmails: getGuardianEmails(user),
         privacy: user.privacy,
         privacyDebug: user.privacyDebug,
@@ -75,6 +91,16 @@ const getTypeSafeUser = (user) => {
         acceptedEuclidTerms: validateBoolean(user.acceptedEuclidTerms),
         euclidEnrolYearGroup: validateString(user.euclidEnrolYearGroup),
         euclidEnrolTimestamp: validateNumber(user.euclidEnrolTimestamp),
+
+        teacherCodes: validateStringArray(user.teacherCode),
+        additionalStudentEmails: getAdditionalStudentEmails(user),
+        ethnicity: validateString(user.ethnicity),
+        country: validateString(user.country),
+        ukCountry: validateString(user.ukCountry),
+        homeEducated: validateBoolean(user.homeEducated),
+        homeEducatedConfirm: validateBoolean(user.homeEducatedConfirm),
+        schoolEmail: validateString(user.schoolEmail),
+
         privacyDebug: {
             firstSeen: validateNumber(user[firstSeenKey]),
             latestTouch: validateNumber(user[latestTouchKey]),