Skip to content

Commit 58fa886

Browse files
committed
Add school panel and profile complete to export
1 parent 30510ce commit 58fa886

File tree

3 files changed

+20
-18
lines changed

3 files changed

+20
-18
lines changed

functions/index.js

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,7 @@ const functions = require('firebase-functions');
1515
const express = require('express');
1616
const user = require('./utilities/user');
1717
const { countries } = require('./utilities/countries')
18+
const isProfileComplete = require('./utilities/profileComplete');
1819

1920
const PAGES = require('./build/pages.json');
2021
const LEVELS = ['year6', 'year7', 'year8', 'year9', 'year10', 'year11'];
@@ -52,22 +53,6 @@ function letterOrder(a, b) {
5253
return a < b ? -1 : a > b ? 1 : 0;
5354
}
5455

55-
function isProfileComplete(userData) {
56-
if(!userData) return false;
57-
if(!userData.birthMonth) return false;
58-
if(!userData.birthYear) return false;
59-
if(!userData.country) return false;
60-
if(!userData.studentPanelConsidered) return false;
61-
62-
if(!userData.homeEducated) {
63-
if(!userData.schoolEmail) return false;
64-
if (userData.country === 'GB' && !userData.schoolPostcode) return false;
65-
}
66-
67-
return true;
68-
}
69-
70-
7156
// -----------------------------------------------------------------------------
7257
// Set up Express App
7358

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
function isProfileComplete(userData) {
2+
if(!userData) return false;
3+
if(!userData.birthMonth) return false;
4+
if(!userData.birthYear) return false;
5+
if(!userData.country) return false;
6+
if(!userData.studentPanelConsidered) return false;
7+
8+
if(!userData.homeEducated) {
9+
if(!userData.schoolEmail) return false;
10+
if (userData.country === 'GB' && !userData.schoolPostcode) return false;
11+
}
12+
13+
return true;
14+
}
15+
16+
module.exports = isProfileComplete;

scripts/get-users.js

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ const path = require('path');
33
const fb = require('firebase-admin');
44
const serviceAccount = require('../private/service-account.json');
55
const downloadUsers = require('./utils/downloadUsers');
6+
const isProfileComplete = require('../functions/utilities/profileComplete');
67

78
const run = async () => {
89
let users = await downloadUsers();
@@ -11,15 +12,15 @@ const run = async () => {
1112
const accounts = JSON.parse(fs.readFileSync(file)).users;
1213

1314
let teachers = 'email,first,last,schoolName,phoneNumber,postCode,teacherCode,uniqueId\n';
14-
let students = 'email,first,last,level,birthYear,schoolName,teacherCode,guardianEmail,uniqueId,studentReference\n';
15+
let students = 'email,first,last,level,birthYear,schoolName,teacherCode,guardianEmail,uniqueId,studentReference,schoolEmail,studentPanelConsidered,profileComplete\n';
1516

1617
for (let a of accounts) {
1718
const u = users[a.localId];
1819
if (!u) continue;
1920
if (u.code) {
2021
teachers += `"${a.email}","${u.first}","${u.last}","${u.schoolName||''}","${u.phoneNumber||''}","${u.postCode||''}","${u.code||''}","${a.localId||''}"\n`;
2122
} else {
22-
students += `"${a.email}","${u.first}","${u.last}","${u.level||''}","${u.birthYear||''}","${u.schoolName||''}","${u.teacherCode||''}","${u.guardianEmail||''}","${a.localId||''}","${u.userReference||''}"\n`;
23+
students += `"${a.email}","${u.first}","${u.last}","${u.level||''}","${u.birthYear||''}","${u.schoolName||''}","${u.teacherCode||''}","${u.guardianEmail||''}","${a.localId||''}","${u.userReference||''}","${u.schoolEmail||''}","${u.studentPanelConsidered||''}","${isProfileComplete(u) ? 1 : 0}"\n`;
2324
}
2425
}
2526

0 commit comments

Comments
 (0)