diff --git a/functions/callableFunctions/cancelAssessments.js b/functions/callableFunctions/assessments/cancelAssessments.js similarity index 74% rename from functions/callableFunctions/cancelAssessments.js rename to functions/callableFunctions/assessments/cancelAssessments.js index 652190ffc..0ba088769 100644 --- a/functions/callableFunctions/cancelAssessments.js +++ b/functions/callableFunctions/assessments/cancelAssessments.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initAssessments from '../actions/assessments.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initAssessments from '../../actions/assessments.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { cancelAssessments } = initAssessments(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/assessments/index.js b/functions/callableFunctions/assessments/index.js new file mode 100644 index 000000000..1d6a81e8b --- /dev/null +++ b/functions/callableFunctions/assessments/index.js @@ -0,0 +1,11 @@ +import initialiseAssessments from './initialiseAssessments.js'; +import cancelAssessments from './cancelAssessments.js'; +import resetAssessments from './resetAssessments.js'; +import sendAssessmentRequests from './sendAssessmentRequests.js'; + +export { + cancelAssessments, + initialiseAssessments, + resetAssessments, + sendAssessmentRequests +}; diff --git a/functions/callableFunctions/initialiseAssessments.js b/functions/callableFunctions/assessments/initialiseAssessments.js similarity index 76% rename from functions/callableFunctions/initialiseAssessments.js rename to functions/callableFunctions/assessments/initialiseAssessments.js index d440392f1..07c45ca47 100644 --- a/functions/callableFunctions/initialiseAssessments.js +++ b/functions/callableFunctions/assessments/initialiseAssessments.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initAssessments from '../actions/assessments.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initAssessments from '../../actions/assessments.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { initialiseAssessments } = initAssessments(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/resetAssessments.js b/functions/callableFunctions/assessments/resetAssessments.js similarity index 76% rename from functions/callableFunctions/resetAssessments.js rename to functions/callableFunctions/assessments/resetAssessments.js index a7d939868..aa6ae0630 100644 --- a/functions/callableFunctions/resetAssessments.js +++ b/functions/callableFunctions/assessments/resetAssessments.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initAssessments from '../actions/assessments.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initAssessments from '../../actions/assessments.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { resetAssessments } = initAssessments(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendAssessmentRequests.js b/functions/callableFunctions/assessments/sendAssessmentRequests.js similarity index 76% rename from functions/callableFunctions/sendAssessmentRequests.js rename to functions/callableFunctions/assessments/sendAssessmentRequests.js index 42f9b31d0..6164f75ba 100644 --- a/functions/callableFunctions/sendAssessmentRequests.js +++ b/functions/callableFunctions/assessments/sendAssessmentRequests.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initAssessments from '../actions/assessments.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initAssessments from '../../actions/assessments.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { sendAssessmentRequests } = initAssessments(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/notifications/index.js b/functions/callableFunctions/notifications/index.js new file mode 100644 index 000000000..06a96b98c --- /dev/null +++ b/functions/callableFunctions/notifications/index.js @@ -0,0 +1,19 @@ +import processNotificationsNow from './processNotifications.js'; +import sendApplicationReminders from './sendApplicationReminders.js'; +import sendAssessmentReminders from './sendAssessmentReminders.js'; +import sendCandidateFormNotifications from './sendCandidateFormNotifications.js'; +import sendCharacterCheckRequests from './sendCharacterCheckRequests.js'; +import sendPublishedFeedbackReportNotifications from './sendPublishedFeedbackReportNotifications.js'; +import sendSmsVerificationCode from './sendSmsVerificationCode.js'; +import testAssessmentNotification from './testAssessmentNotification.js'; + +export { + processNotificationsNow, + sendApplicationReminders, + sendAssessmentReminders, + sendCandidateFormNotifications, + sendCharacterCheckRequests, + sendPublishedFeedbackReportNotifications, + sendSmsVerificationCode, + testAssessmentNotification +}; diff --git a/functions/callableFunctions/processNotifications.js b/functions/callableFunctions/notifications/processNotifications.js similarity index 68% rename from functions/callableFunctions/processNotifications.js rename to functions/callableFunctions/notifications/processNotifications.js index b8265b253..301f10d6f 100644 --- a/functions/callableFunctions/processNotifications.js +++ b/functions/callableFunctions/notifications/processNotifications.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { db, firebase } from '../shared/admin.js'; -import initNotifications from '../actions/notifications.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { db, firebase } from '../../shared/admin.js'; +import initNotifications from '../../actions/notifications.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { processNotifications } = initNotifications(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendApplicationReminders.js b/functions/callableFunctions/notifications/sendApplicationReminders.js similarity index 67% rename from functions/callableFunctions/sendApplicationReminders.js rename to functions/callableFunctions/notifications/sendApplicationReminders.js index 1b982b1ed..e249a6789 100644 --- a/functions/callableFunctions/sendApplicationReminders.js +++ b/functions/callableFunctions/notifications/sendApplicationReminders.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initApplications from '../actions/applications/applications.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initApplications from '../../actions/applications/applications.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { sendApplicationReminders } = initApplications(config, firebase, db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendAssessmentReminders.js b/functions/callableFunctions/notifications/sendAssessmentReminders.js similarity index 72% rename from functions/callableFunctions/sendAssessmentReminders.js rename to functions/callableFunctions/notifications/sendAssessmentReminders.js index f846a23ec..b245a6f71 100644 --- a/functions/callableFunctions/sendAssessmentReminders.js +++ b/functions/callableFunctions/notifications/sendAssessmentReminders.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initAssessments from '../actions/assessments.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initAssessments from '../../actions/assessments.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { sendAssessmentReminders } = initAssessments(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendCandidateFormNotifications.js b/functions/callableFunctions/notifications/sendCandidateFormNotifications.js similarity index 74% rename from functions/callableFunctions/sendCandidateFormNotifications.js rename to functions/callableFunctions/notifications/sendCandidateFormNotifications.js index 816a0c6ab..dab091cd0 100644 --- a/functions/callableFunctions/sendCandidateFormNotifications.js +++ b/functions/callableFunctions/notifications/sendCandidateFormNotifications.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initApplications from '../actions/applications/applications.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initApplications from '../../actions/applications/applications.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { sendCandidateFormNotifications } = initApplications(config, firebase, db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendCharacterCheckRequests.js b/functions/callableFunctions/notifications/sendCharacterCheckRequests.js similarity index 74% rename from functions/callableFunctions/sendCharacterCheckRequests.js rename to functions/callableFunctions/notifications/sendCharacterCheckRequests.js index c00e299b3..7ca11c1e6 100644 --- a/functions/callableFunctions/sendCharacterCheckRequests.js +++ b/functions/callableFunctions/notifications/sendCharacterCheckRequests.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initApplications from '../actions/applications/applications.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initApplications from '../../actions/applications/applications.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { sendCharacterCheckRequests } = initApplications(config, firebase, db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendPublishedFeedbackReportNotifications.js b/functions/callableFunctions/notifications/sendPublishedFeedbackReportNotifications.js similarity index 78% rename from functions/callableFunctions/sendPublishedFeedbackReportNotifications.js rename to functions/callableFunctions/notifications/sendPublishedFeedbackReportNotifications.js index 8e9fa8932..cccc94135 100644 --- a/functions/callableFunctions/sendPublishedFeedbackReportNotifications.js +++ b/functions/callableFunctions/notifications/sendPublishedFeedbackReportNotifications.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import initApplications from '../actions/applications/applications.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initApplications from '../../actions/applications/applications.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { sendPublishedFeedbackReportNotifications } = initApplications(config, firebase, db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/sendSmsVerificationCode.js b/functions/callableFunctions/notifications/sendSmsVerificationCode.js similarity index 65% rename from functions/callableFunctions/sendSmsVerificationCode.js rename to functions/callableFunctions/notifications/sendSmsVerificationCode.js index d7f6ad25d..ffa9d1edb 100644 --- a/functions/callableFunctions/sendSmsVerificationCode.js +++ b/functions/callableFunctions/notifications/sendSmsVerificationCode.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import initVerification from '../actions/candidates/verification.js'; -import { checkArguments } from '../shared/helpers.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import initVerification from '../../actions/candidates/verification.js'; +import { checkArguments } from '../../shared/helpers.js'; const { checkFunctionEnabled } = initServiceSettings(db); const { sendSmsCode } = initVerification(config, firebase, db); diff --git a/functions/callableFunctions/testAssessmentNotification.js b/functions/callableFunctions/notifications/testAssessmentNotification.js similarity index 73% rename from functions/callableFunctions/testAssessmentNotification.js rename to functions/callableFunctions/notifications/testAssessmentNotification.js index f5c84bb74..91c0d00d8 100644 --- a/functions/callableFunctions/testAssessmentNotification.js +++ b/functions/callableFunctions/notifications/testAssessmentNotification.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initAssessments from '../actions/assessments.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initAssessments from '../../actions/assessments.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { testAssessmentNotification } = initAssessments(config, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/customReport.js b/functions/callableFunctions/reports/customReport.js similarity index 62% rename from functions/callableFunctions/customReport.js rename to functions/callableFunctions/reports/customReport.js index 648a21b04..3f7c904e1 100644 --- a/functions/callableFunctions/customReport.js +++ b/functions/callableFunctions/reports/customReport.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import { auth } from '../shared/admin.js'; -import config from '../shared/config.js'; -import { firebase, db } from '../shared/admin.js'; -import initCustomReport from '../actions/exercises/customReport.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { auth } from '../../shared/admin.js'; +import config from '../../shared/config.js'; +import { firebase, db } from '../../shared/admin.js'; +import initCustomReport from '../../actions/exercises/customReport.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { customReport } = initCustomReport(config, firebase, db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/exportSccSummaryReport.js b/functions/callableFunctions/reports/exportSccSummaryReport.js similarity index 80% rename from functions/callableFunctions/exportSccSummaryReport.js rename to functions/callableFunctions/reports/exportSccSummaryReport.js index 90c2bf144..9981a8975 100644 --- a/functions/callableFunctions/exportSccSummaryReport.js +++ b/functions/callableFunctions/reports/exportSccSummaryReport.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import { firebase, db, auth } from '../shared/admin.js'; -import initExportSccSummaryReport from '../actions/exercises/sccSummaryReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initExportSccSummaryReport from '../../actions/exercises/sccSummaryReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { exportSccSummaryReport } = initExportSccSummaryReport(firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateAgencyReport.js b/functions/callableFunctions/reports/generateAgencyReport.js similarity index 78% rename from functions/callableFunctions/generateAgencyReport.js rename to functions/callableFunctions/reports/generateAgencyReport.js index 40bf2b74a..351ff6c22 100644 --- a/functions/callableFunctions/generateAgencyReport.js +++ b/functions/callableFunctions/reports/generateAgencyReport.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import { firebase, db, auth } from '../shared/admin.js'; -import initGenerateAgencyReport from '../actions/exercises/generateAgencyReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initGenerateAgencyReport from '../../actions/exercises/generateAgencyReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateAgencyReport } = initGenerateAgencyReport(firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateDeploymentReport.js b/functions/callableFunctions/reports/generateDeploymentReport.js similarity index 76% rename from functions/callableFunctions/generateDeploymentReport.js rename to functions/callableFunctions/reports/generateDeploymentReport.js index d1256a7c6..515f74012 100644 --- a/functions/callableFunctions/generateDeploymentReport.js +++ b/functions/callableFunctions/reports/generateDeploymentReport.js @@ -1,11 +1,11 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import initGenerateDeploymentReport from '../actions/exercises/generateDeploymentReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initGenerateDeploymentReport from '../../actions/exercises/generateDeploymentReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateDeploymentReport } = initGenerateDeploymentReport(config, firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateDiversityData.js b/functions/callableFunctions/reports/generateDiversityData.js similarity index 79% rename from functions/callableFunctions/generateDiversityData.js rename to functions/callableFunctions/reports/generateDiversityData.js index 2511358a0..05877939e 100644 --- a/functions/callableFunctions/generateDiversityData.js +++ b/functions/callableFunctions/reports/generateDiversityData.js @@ -1,8 +1,8 @@ import functions from 'firebase-functions'; -import { firebase, db } from '../shared/admin.js'; -import initGenerateDiversityData from '../actions/exercises/generateDiversityData.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db } from '../../shared/admin.js'; +import initGenerateDiversityData from '../../actions/exercises/generateDiversityData.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateDiversityData } = initGenerateDiversityData(firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/generateDiversityReport.js b/functions/callableFunctions/reports/generateDiversityReport.js similarity index 77% rename from functions/callableFunctions/generateDiversityReport.js rename to functions/callableFunctions/reports/generateDiversityReport.js index 65d6ca5b7..b612e90e0 100644 --- a/functions/callableFunctions/generateDiversityReport.js +++ b/functions/callableFunctions/reports/generateDiversityReport.js @@ -1,12 +1,12 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import initGenerateDiversityReport from '../actions/exercises/generateDiversityReport.js'; -import initGenerateDiversityData from '../actions/exercises/generateDiversityData.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initGenerateDiversityReport from '../../actions/exercises/generateDiversityReport.js'; +import initGenerateDiversityData from '../../actions/exercises/generateDiversityData.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateDiversityReport } = initGenerateDiversityReport(config, firebase, db); const { generateDiversityData } = initGenerateDiversityData(firebase, db); diff --git a/functions/callableFunctions/generateHandoverReport.js b/functions/callableFunctions/reports/generateHandoverReport.js similarity index 77% rename from functions/callableFunctions/generateHandoverReport.js rename to functions/callableFunctions/reports/generateHandoverReport.js index 6e72afb7e..cefc2770a 100644 --- a/functions/callableFunctions/generateHandoverReport.js +++ b/functions/callableFunctions/reports/generateHandoverReport.js @@ -1,11 +1,11 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import initGenerateHandoverReport from '../actions/exercises/generateHandoverReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initGenerateHandoverReport from '../../actions/exercises/generateHandoverReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateHandoverReport } = initGenerateHandoverReport(firebase, config, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateOutreachReport.js b/functions/callableFunctions/reports/generateOutreachReport.js similarity index 75% rename from functions/callableFunctions/generateOutreachReport.js rename to functions/callableFunctions/reports/generateOutreachReport.js index 46e3fd4a9..10fb00971 100644 --- a/functions/callableFunctions/generateOutreachReport.js +++ b/functions/callableFunctions/reports/generateOutreachReport.js @@ -1,12 +1,12 @@ import functions from 'firebase-functions'; -import config from '../shared/config.js'; -import { firebase, db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initGenerateOutreachReport from '../actions/exercises/generateOutreachReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import config from '../../shared/config.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initGenerateOutreachReport from '../../actions/exercises/generateOutreachReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateOutreachReport } = initGenerateOutreachReport(config, firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateReasonableAdjustmentsReport.js b/functions/callableFunctions/reports/generateReasonableAdjustmentsReport.js similarity index 77% rename from functions/callableFunctions/generateReasonableAdjustmentsReport.js rename to functions/callableFunctions/reports/generateReasonableAdjustmentsReport.js index f2abc144a..778130aaf 100644 --- a/functions/callableFunctions/generateReasonableAdjustmentsReport.js +++ b/functions/callableFunctions/reports/generateReasonableAdjustmentsReport.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import { firebase, db, auth } from '../shared/admin.js'; -import initGenerateReasonableAdjustmentsReport from '../actions/exercises/generateReasonableAdjustmentsReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initGenerateReasonableAdjustmentsReport from '../../actions/exercises/generateReasonableAdjustmentsReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateReasonableAdjustmentsReport } = initGenerateReasonableAdjustmentsReport(firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateSccSummaryReport.js b/functions/callableFunctions/reports/generateSccSummaryReport.js similarity index 80% rename from functions/callableFunctions/generateSccSummaryReport.js rename to functions/callableFunctions/reports/generateSccSummaryReport.js index 1c7bb51a2..ccdb43763 100644 --- a/functions/callableFunctions/generateSccSummaryReport.js +++ b/functions/callableFunctions/reports/generateSccSummaryReport.js @@ -1,10 +1,10 @@ import functions from 'firebase-functions'; -import { firebase, db, auth } from '../shared/admin.js'; -import initGenerateSccSummaryReport from '../actions/exercises/sccSummaryReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import initGenerateSccSummaryReport from '../../actions/exercises/sccSummaryReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateSccSummaryReport } = initGenerateSccSummaryReport(firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/generateStatutoryConsultationReport.js b/functions/callableFunctions/reports/generateStatutoryConsultationReport.js similarity index 76% rename from functions/callableFunctions/generateStatutoryConsultationReport.js rename to functions/callableFunctions/reports/generateStatutoryConsultationReport.js index 335dc56dc..ca623e493 100644 --- a/functions/callableFunctions/generateStatutoryConsultationReport.js +++ b/functions/callableFunctions/reports/generateStatutoryConsultationReport.js @@ -1,11 +1,11 @@ import functions from 'firebase-functions'; -import { firebase, db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initGenerateStatutoryConsultationReport from '../actions/exercises/generateStatutoryConsultationReport.js'; -import { getDocument } from '../shared/helpers.js'; -import initLogEvent from '../actions/logs/logEvent.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initGenerateStatutoryConsultationReport from '../../actions/exercises/generateStatutoryConsultationReport.js'; +import { getDocument } from '../../shared/helpers.js'; +import initLogEvent from '../../actions/logs/logEvent.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { generateStatutoryConsultationReport } = initGenerateStatutoryConsultationReport(firebase, db); const { logEvent } = initLogEvent(firebase, db, auth); diff --git a/functions/callableFunctions/reports/index.js b/functions/callableFunctions/reports/index.js new file mode 100644 index 000000000..7d18130b2 --- /dev/null +++ b/functions/callableFunctions/reports/index.js @@ -0,0 +1,27 @@ +import customReport from './customReport.js'; +import exportSccSummaryReport from './exportSccSummaryReport.js'; +import generateAgencyReport from './generateAgencyReport.js'; +import generateDeploymentReport from './generateDeploymentReport.js'; +import generateDiversityData from './generateDiversityData.js'; +import generateDiversityReport from './generateDiversityReport.js'; +import generateHandoverReport from './generateHandoverReport.js'; +import generateOutreachReport from './generateOutreachReport.js'; +import generateReasonableAdjustmentsReport from './generateReasonableAdjustmentsReport.js'; +import generateSccSummaryReport from './generateSccSummaryReport.js'; +import generateStatutoryConsultationReport from './generateStatutoryConsultationReport.js'; +import targetedOutreachReport from './targetedOutreachReport.js'; + +export { + customReport, + exportSccSummaryReport, + generateAgencyReport, + generateDeploymentReport, + generateDiversityData, + generateDiversityReport, + generateHandoverReport, + generateOutreachReport, + generateReasonableAdjustmentsReport, + generateSccSummaryReport, + generateStatutoryConsultationReport, + targetedOutreachReport +}; diff --git a/functions/callableFunctions/targetedOutreachReport.js b/functions/callableFunctions/reports/targetedOutreachReport.js similarity index 70% rename from functions/callableFunctions/targetedOutreachReport.js rename to functions/callableFunctions/reports/targetedOutreachReport.js index 510c4b4ff..92f9e4264 100644 --- a/functions/callableFunctions/targetedOutreachReport.js +++ b/functions/callableFunctions/reports/targetedOutreachReport.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initTargetedOutreachReport from '../actions/exercises/targetedOutreachReport.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initTargetedOutreachReport from '../../actions/exercises/targetedOutreachReport.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { targetedOutreachReport } = initTargetedOutreachReport(firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/tasks/index.js b/functions/callableFunctions/tasks/index.js new file mode 100644 index 000000000..da0cebb5f --- /dev/null +++ b/functions/callableFunctions/tasks/index.js @@ -0,0 +1,7 @@ +import createTask from './createTask.js'; +import updateTask from './updateTask.js'; + +export { + createTask, + updateTask +}; diff --git a/functions/callableFunctions/adminCreateUserRole.js b/functions/callableFunctions/users/adminCreateUserRole.js similarity index 71% rename from functions/callableFunctions/adminCreateUserRole.js rename to functions/callableFunctions/users/adminCreateUserRole.js index 9ad3b166d..62368fe14 100644 --- a/functions/callableFunctions/adminCreateUserRole.js +++ b/functions/callableFunctions/users/adminCreateUserRole.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { adminCreateUserRole } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminDisableNewUser.js b/functions/callableFunctions/users/adminDisableNewUser.js similarity index 71% rename from functions/callableFunctions/adminDisableNewUser.js rename to functions/callableFunctions/users/adminDisableNewUser.js index 2f6642e48..d16149fca 100644 --- a/functions/callableFunctions/adminDisableNewUser.js +++ b/functions/callableFunctions/users/adminDisableNewUser.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { disableNewUser } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminDisableUser.js b/functions/callableFunctions/users/adminDisableUser.js similarity index 71% rename from functions/callableFunctions/adminDisableUser.js rename to functions/callableFunctions/users/adminDisableUser.js index 409b028b0..0de86eb48 100644 --- a/functions/callableFunctions/adminDisableUser.js +++ b/functions/callableFunctions/users/adminDisableUser.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { toggleDisableUser } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminGetUserRoles.js b/functions/callableFunctions/users/adminGetUserRoles.js similarity index 74% rename from functions/callableFunctions/adminGetUserRoles.js rename to functions/callableFunctions/users/adminGetUserRoles.js index d245f3b2f..1ca113fed 100644 --- a/functions/callableFunctions/adminGetUserRoles.js +++ b/functions/callableFunctions/users/adminGetUserRoles.js @@ -1,7 +1,7 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; +import { db, auth } from '../../shared/admin.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const { adminGetUserRoles } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminGetUsers.js b/functions/callableFunctions/users/adminGetUsers.js similarity index 73% rename from functions/callableFunctions/adminGetUsers.js rename to functions/callableFunctions/users/adminGetUsers.js index 13ce1c666..7432f28ec 100644 --- a/functions/callableFunctions/adminGetUsers.js +++ b/functions/callableFunctions/users/adminGetUsers.js @@ -1,7 +1,7 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; +import { db, auth } from '../../shared/admin.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const { adminGetUsers } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminSetDefaultRole.js b/functions/callableFunctions/users/adminSetDefaultRole.js similarity index 71% rename from functions/callableFunctions/adminSetDefaultRole.js rename to functions/callableFunctions/users/adminSetDefaultRole.js index bc9fb96bf..ed34d3bff 100644 --- a/functions/callableFunctions/adminSetDefaultRole.js +++ b/functions/callableFunctions/users/adminSetDefaultRole.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { adminSetDefaultRole } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminSetUserRole.js b/functions/callableFunctions/users/adminSetUserRole.js similarity index 71% rename from functions/callableFunctions/adminSetUserRole.js rename to functions/callableFunctions/users/adminSetUserRole.js index 0cfbeff75..8b66902af 100644 --- a/functions/callableFunctions/adminSetUserRole.js +++ b/functions/callableFunctions/users/adminSetUserRole.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const { adminSetUserRole } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminSyncUserRolePermissions.js b/functions/callableFunctions/users/adminSyncUserRolePermissions.js similarity index 72% rename from functions/callableFunctions/adminSyncUserRolePermissions.js rename to functions/callableFunctions/users/adminSyncUserRolePermissions.js index d9d48b2d4..1a3e84374 100644 --- a/functions/callableFunctions/adminSyncUserRolePermissions.js +++ b/functions/callableFunctions/users/adminSyncUserRolePermissions.js @@ -1,8 +1,8 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { adminSyncUserRolePermissions } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/adminUpdateUserRole.js b/functions/callableFunctions/users/adminUpdateUserRole.js similarity index 76% rename from functions/callableFunctions/adminUpdateUserRole.js rename to functions/callableFunctions/users/adminUpdateUserRole.js index 8beff12c3..956b9d1c2 100644 --- a/functions/callableFunctions/adminUpdateUserRole.js +++ b/functions/callableFunctions/users/adminUpdateUserRole.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUserRoles from '../actions/userRoles.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUserRoles from '../../actions/userRoles.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { adminUpdateUserRole } = initUserRoles(db, auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/checkEnabledUserByEmail.js b/functions/callableFunctions/users/checkEnabledUserByEmail.js similarity index 65% rename from functions/callableFunctions/checkEnabledUserByEmail.js rename to functions/callableFunctions/users/checkEnabledUserByEmail.js index 304006ee6..c1dfbf8da 100644 --- a/functions/callableFunctions/checkEnabledUserByEmail.js +++ b/functions/callableFunctions/users/checkEnabledUserByEmail.js @@ -1,8 +1,8 @@ import functions from 'firebase-functions'; -import { auth, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initCheckEnabledUserByEmail from '../actions/candidates/checkEnabledUserByEmail.js'; -import initServiceSettings from '../shared/serviceSettings.js'; +import { auth, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initCheckEnabledUserByEmail from '../../actions/candidates/checkEnabledUserByEmail.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const checkEnabledUserByEmail = initCheckEnabledUserByEmail(auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/createUser.js b/functions/callableFunctions/users/createUser.js similarity index 74% rename from functions/callableFunctions/createUser.js rename to functions/callableFunctions/users/createUser.js index b7d9091e3..b6df12594 100644 --- a/functions/callableFunctions/createUser.js +++ b/functions/callableFunctions/users/createUser.js @@ -1,8 +1,8 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUsers from '../actions/users.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUsers from '../../actions/users.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const { createUser } = initUsers(auth, db); diff --git a/functions/callableFunctions/deleteUsers.js b/functions/callableFunctions/users/deleteUsers.js similarity index 74% rename from functions/callableFunctions/deleteUsers.js rename to functions/callableFunctions/users/deleteUsers.js index 054250453..6439dfc62 100644 --- a/functions/callableFunctions/deleteUsers.js +++ b/functions/callableFunctions/users/deleteUsers.js @@ -1,8 +1,8 @@ import functions from 'firebase-functions'; -import { db, auth } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; -import initUsers from '../actions/users.js'; +import { db, auth } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; +import initUsers from '../../actions/users.js'; const { deleteUsers } = initUsers(auth, db); diff --git a/functions/callableFunctions/ensureEmailVerified.js b/functions/callableFunctions/users/ensureEmailVerified.js similarity index 100% rename from functions/callableFunctions/ensureEmailVerified.js rename to functions/callableFunctions/users/ensureEmailVerified.js diff --git a/functions/callableFunctions/generateSignInWithEmailLink.js b/functions/callableFunctions/users/generateSignInWithEmailLink.js similarity index 73% rename from functions/callableFunctions/generateSignInWithEmailLink.js rename to functions/callableFunctions/users/generateSignInWithEmailLink.js index c8a327578..84fa3c25b 100644 --- a/functions/callableFunctions/generateSignInWithEmailLink.js +++ b/functions/callableFunctions/users/generateSignInWithEmailLink.js @@ -1,8 +1,8 @@ import functions from 'firebase-functions'; -import { auth, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUsers from '../actions/users.js'; -import initServiceSettings from '../shared/serviceSettings.js'; +import { auth, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUsers from '../../actions/users.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const users = initUsers(auth, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/getUserByEmail.js b/functions/callableFunctions/users/getUserByEmail.js similarity index 72% rename from functions/callableFunctions/getUserByEmail.js rename to functions/callableFunctions/users/getUserByEmail.js index 3fd5c50e6..0e75f7a57 100644 --- a/functions/callableFunctions/getUserByEmail.js +++ b/functions/callableFunctions/users/getUserByEmail.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { auth, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initGetUserByEmail from '../actions/candidates/getUserByEmail.js'; +import { auth, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initGetUserByEmail from '../../actions/candidates/getUserByEmail.js'; const getUserByEmail = initGetUserByEmail(auth); -import initServiceSettings from '../shared/serviceSettings.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const { checkFunctionEnabled } = initServiceSettings(db); export default functions.region('europe-west2').https.onCall(async (data, context) => { diff --git a/functions/callableFunctions/getUserEmailByID.js b/functions/callableFunctions/users/getUserEmailByID.js similarity index 72% rename from functions/callableFunctions/getUserEmailByID.js rename to functions/callableFunctions/users/getUserEmailByID.js index c63a7ee90..31feb6f7e 100644 --- a/functions/callableFunctions/getUserEmailByID.js +++ b/functions/callableFunctions/users/getUserEmailByID.js @@ -1,9 +1,9 @@ import functions from 'firebase-functions'; -import { auth, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initGetUserEmailByID from '../actions/candidates/getUserEmailByID.js'; -import initServiceSettings from '../shared/serviceSettings.js'; -import { PERMISSIONS, hasPermissions } from '../shared/permissions.js'; +import { auth, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initGetUserEmailByID from '../../actions/candidates/getUserEmailByID.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; +import { PERMISSIONS, hasPermissions } from '../../shared/permissions.js'; const getUserEmailByID = initGetUserEmailByID(auth); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/users/index.js b/functions/callableFunctions/users/index.js new file mode 100644 index 000000000..a491346ec --- /dev/null +++ b/functions/callableFunctions/users/index.js @@ -0,0 +1,37 @@ +import adminCreateUserRole from './adminCreateUserRole.js'; +import adminDisableNewUser from './adminDisableNewUser.js'; +import adminDisableUser from './adminDisableUser.js'; +//import adminGetUserRoles from './callableFunctions/adminGetUserRoles.js'; +//import adminGetUsers from './callableFunctions/adminGetUsers.js'; +import adminSetDefaultRole from './adminSetDefaultRole.js'; +import adminSetUserRole from './adminSetUserRole.js'; +import adminSyncUserRolePermissions from './adminSyncUserRolePermissions.js'; +import adminUpdateUserRole from './adminUpdateUserRole.js'; +import checkEnabledUserByEmail from './checkEnabledUserByEmail.js'; +//import createUser from './callableFunctions/createUser.js'; +import deleteUsers from './deleteUsers.js'; +import ensureEmailVerified from './callableFunctions/ensureEmailVerified.js'; +import generateSignInWithEmailLink from './generateSignInWithEmailLink.js'; +//import getUserByEmail from './callableFunctions/getUserByEmail.js'; +import getUserEmailByID from './getUserEmailByID.js'; +import updateEmailAddress from './updateEmailAddress.js'; + +export { + adminCreateUserRole, + adminDisableNewUser, + adminDisableUser, + //adminGetUserRoles, + //adminGetUsers, + adminSetDefaultRole, + adminSetUserRole, + adminSyncUserRolePermissions, + adminUpdateUserRole, + checkEnabledUserByEmail, + //createUser, + deleteUsers, + ensureEmailVerified, + generateSignInWithEmailLink, + //getUserByEmail, + getUserEmailByID, + updateEmailAddress +}; diff --git a/functions/callableFunctions/updateEmailAddress.js b/functions/callableFunctions/users/updateEmailAddress.js similarity index 70% rename from functions/callableFunctions/updateEmailAddress.js rename to functions/callableFunctions/users/updateEmailAddress.js index 743cf5c15..51c33bd6b 100644 --- a/functions/callableFunctions/updateEmailAddress.js +++ b/functions/callableFunctions/users/updateEmailAddress.js @@ -1,9 +1,9 @@ -import config from '../shared/config.js'; +import config from '../../shared/config.js'; import functions from 'firebase-functions'; -import { auth, firebase, db } from '../shared/admin.js'; -import { checkArguments } from '../shared/helpers.js'; -import initUpdateEmailAddress from '../actions/candidates/updateEmailAddress.js'; -import initServiceSettings from '../shared/serviceSettings.js'; +import { auth, firebase, db } from '../../shared/admin.js'; +import { checkArguments } from '../../shared/helpers.js'; +import initUpdateEmailAddress from '../../actions/candidates/updateEmailAddress.js'; +import initServiceSettings from '../../shared/serviceSettings.js'; const updateEmailAddress = initUpdateEmailAddress(config, auth, firebase, db); const { checkFunctionEnabled } = initServiceSettings(db); diff --git a/functions/callableFunctions/virusScan/index.js b/functions/callableFunctions/virusScan/index.js new file mode 100644 index 000000000..e27531824 --- /dev/null +++ b/functions/callableFunctions/virusScan/index.js @@ -0,0 +1,9 @@ +import scanFile from './scanFile.js'; +import scanAllFiles from './scanAllFiles.js'; +import verifyFileChecksum from './verifyFileChecksum.js'; + +export { + scanFile, + scanAllFiles, + verifyFileChecksum +}; diff --git a/functions/callableFunctions/scanAllFiles.js b/functions/callableFunctions/virusScan/scanAllFiles.js similarity index 100% rename from functions/callableFunctions/scanAllFiles.js rename to functions/callableFunctions/virusScan/scanAllFiles.js diff --git a/functions/callableFunctions/scanFile.js b/functions/callableFunctions/virusScan/scanFile.js similarity index 100% rename from functions/callableFunctions/scanFile.js rename to functions/callableFunctions/virusScan/scanFile.js diff --git a/functions/callableFunctions/verifyFileChecksum.js b/functions/callableFunctions/virusScan/verifyFileChecksum.js similarity index 100% rename from functions/callableFunctions/verifyFileChecksum.js rename to functions/callableFunctions/virusScan/verifyFileChecksum.js diff --git a/functions/index.js b/functions/index.js index 051a6b5d5..614ae4564 100644 --- a/functions/index.js +++ b/functions/index.js @@ -29,77 +29,38 @@ import onSettingsUpdate from './backgroundFunctions/onSettingsUpdate.js'; // Callable import getApplicationData from './callableFunctions/getApplicationData.js'; -import generateDiversityReport from './callableFunctions/generateDiversityReport.js'; -import generateDiversityData from './callableFunctions/generateDiversityData.js'; -import generateOutreachReport from './callableFunctions/generateOutreachReport.js'; import flagApplicationIssuesForExercise from './callableFunctions/flagApplicationIssuesForExercise.js'; -import initialiseAssessments from './callableFunctions/initialiseAssessments.js'; -import cancelAssessments from './callableFunctions/cancelAssessments.js'; -import resetAssessments from './callableFunctions/resetAssessments.js'; -import testAssessmentNotification from './callableFunctions/testAssessmentNotification.js'; -import sendAssessmentRequests from './callableFunctions/sendAssessmentRequests.js'; -import sendAssessmentReminders from './callableFunctions/sendAssessmentReminders.js'; -import generateSignInWithEmailLink from './callableFunctions/generateSignInWithEmailLink.js'; import initialiseApplicationRecords from './callableFunctions/initialiseApplicationRecords.js'; -import sendApplicationReminders from './callableFunctions/sendApplicationReminders.js'; -import sendCharacterCheckRequests from './callableFunctions/sendCharacterCheckRequests.js'; -import sendCandidateFormNotifications from './callableFunctions/sendCandidateFormNotifications.js'; import enableCharacterChecks from './callableFunctions/enableCharacterChecks.js'; import initialiseMissingApplicationRecords from './callableFunctions/initialiseMissingApplicationRecords.js'; -import exportExerciseData from './callableFunctions/exportExerciseData.js'; -import targetedOutreachReport from './callableFunctions/targetedOutreachReport.js'; //import transferHandoverData from './callableFunctions/transferHandoverData.js'; import exportApplicationContactsData from './callableFunctions/exportApplicationContactsData.js'; import exportApplicationEligibilityIssues from './callableFunctions/exportApplicationEligibilityIssues.js'; -import generateHandoverReport from './callableFunctions/generateHandoverReport.js'; -import generateDeploymentReport from './callableFunctions/generateDeploymentReport.js'; -import generateReasonableAdjustmentsReport from './callableFunctions/generateReasonableAdjustmentsReport.js'; -import generateAgencyReport from './callableFunctions/generateAgencyReport.js'; -import generateStatutoryConsultationReport from './callableFunctions/generateStatutoryConsultationReport.js'; import logEvent from './callableFunctions/logEvent.js'; -import scanFile from './callableFunctions/scanFile.js'; -import scanAllFiles from './callableFunctions/scanAllFiles.js'; import exportApplicationCharacterIssues from './callableFunctions/exportApplicationCharacterIssues.js'; -import getUserEmailByID from './callableFunctions/getUserEmailByID.js'; -//import getUserByEmail from './callableFunctions/getUserByEmail.js'; -import updateEmailAddress from './callableFunctions/updateEmailAddress.js'; -import ensureEmailVerified from './callableFunctions/ensureEmailVerified.js'; -//import adminGetUsers from './callableFunctions/adminGetUsers.js'; -//import adminGetUserRoles from './callableFunctions/adminGetUserRoles.js'; -import adminDisableUser from './callableFunctions/adminDisableUser.js'; -import adminCreateUserRole from './callableFunctions/adminCreateUserRole.js'; -import adminUpdateUserRole from './callableFunctions/adminUpdateUserRole.js'; -import adminSetUserRole from './callableFunctions/adminSetUserRole.js'; -import adminSetDefaultRole from './callableFunctions/adminSetDefaultRole.js'; -import adminDisableNewUser from './callableFunctions/adminDisableNewUser.js'; -import adminSyncUserRolePermissions from './callableFunctions/adminSyncUserRolePermissions.js'; -//import createUser from './callableFunctions/createUser.js'; -import deleteUsers from './callableFunctions/deleteUsers.js'; -import customReport from './callableFunctions/customReport.js'; import refreshApplicationCounts from './callableFunctions/refreshApplicationCounts.js'; import createTestApplications from './callableFunctions/createTestApplications.js'; import deleteApplications from './callableFunctions/deleteApplications.js'; //import createTestUsers from './callableFunctions/createTestUsers.js'; //import deleteTestUsers from './callableFunctions/deleteTestUsers.js'; -import createTask from './callableFunctions/tasks/createTask.js'; -import updateTask from './callableFunctions/tasks/updateTask.js'; import verifyRecaptcha from './callableFunctions/verifyRecaptcha.js'; -import processNotificationsNow from './callableFunctions/processNotifications.js'; -import checkEnabledUserByEmail from './callableFunctions/checkEnabledUserByEmail.js'; +import verifySmsVerificationCode from './callableFunctions/verifySmsVerificationCode.js'; +import verifySlackUser from './callableFunctions/verifySlackUser.js'; import extractDocumentContent from './callableFunctions/extractDocumentContent.js'; import updateUserCustomClaims from './callableFunctions/updateUserCustomClaims.js'; import createZenhubIssue from './callableFunctions/createZenhubIssue.js'; import exportApplicationCommissionerConflicts from './callableFunctions/exportApplicationCommissionerConflicts.js'; -import verifySlackUser from './callableFunctions/verifySlackUser.js'; -import sendPublishedFeedbackReportNotifications from './callableFunctions/sendPublishedFeedbackReportNotifications.js'; import updateApplicationRecordStageStatus from './callableFunctions/updateApplicationRecordStageStatus.js'; import getLatestReleases from './callableFunctions/getLatestReleases.js'; -import verifyFileChecksum from './callableFunctions/verifyFileChecksum.js'; -import sendSmsVerificationCode from './callableFunctions/sendSmsVerificationCode.js'; -import verifySmsVerificationCode from './callableFunctions/verifySmsVerificationCode.js'; -import generateSccSummaryReport from './callableFunctions/generateSccSummaryReport.js'; -import exportSccSummaryReport from './callableFunctions/exportSccSummaryReport.js'; import getMultipleApplicationData from './callableFunctions/getMultipleApplicationData.js'; +import exportExerciseData from './callableFunctions/exportExerciseData.js'; +// (Modular callable functions below) +import * as tasks from './callableFunctions/tasks/index.js'; +import * as users from './callableFunctions/users/index.js'; +import * as assessments from './callableFunctions/assessments/index.js'; +import * as notifications from './callableFunctions/notifications/index.js'; +import * as reports from './callableFunctions/reports/index.js'; +import * as virusScan from './callableFunctions/virusScan/index.js'; // Callable - QTs v2 //import listQualifyingTests from './callableFunctions/qualifyingTests/v2/listQualifyingTests.js'; @@ -141,77 +102,35 @@ export { // Callable getApplicationData, - generateDiversityReport, - generateDiversityData, - generateOutreachReport, flagApplicationIssuesForExercise, - initialiseAssessments, - cancelAssessments, - resetAssessments, - testAssessmentNotification, - sendAssessmentRequests, - sendAssessmentReminders, - generateSignInWithEmailLink, initialiseApplicationRecords, - sendApplicationReminders, - sendCharacterCheckRequests, - sendCandidateFormNotifications, enableCharacterChecks, initialiseMissingApplicationRecords, exportExerciseData, - targetedOutreachReport, - //transferHandoverData, exportApplicationContactsData, exportApplicationEligibilityIssues, - generateHandoverReport, - generateDeploymentReport, - generateReasonableAdjustmentsReport, - generateAgencyReport, - generateStatutoryConsultationReport, logEvent, - scanFile, - scanAllFiles, exportApplicationCharacterIssues, - getUserEmailByID, - //getUserByEmail, - updateEmailAddress, - ensureEmailVerified, - //adminGetUsers, - //adminGetUserRoles, - adminDisableUser, - adminCreateUserRole, - adminUpdateUserRole, - adminSetUserRole, - adminSetDefaultRole, - adminDisableNewUser, - adminSyncUserRolePermissions, - //createUser, - deleteUsers, - customReport, refreshApplicationCounts, createTestApplications, deleteApplications, - //createTestUsers, - //deleteTestUsers, - createTask, - updateTask, verifyRecaptcha, - processNotificationsNow, - checkEnabledUserByEmail, extractDocumentContent, updateUserCustomClaims, createZenhubIssue, exportApplicationCommissionerConflicts, verifySlackUser, - sendPublishedFeedbackReportNotifications, updateApplicationRecordStageStatus, getLatestReleases, - verifyFileChecksum, - sendSmsVerificationCode, verifySmsVerificationCode, getMultipleApplicationData, - generateSccSummaryReport, - exportSccSummaryReport, + // (Modular callable functions below) + tasks, + users, + assessments, + notifications, + reports, + virusScan, // Callable - QTs v2 //listQualifyingTests, diff --git a/nodeScripts/initialiseAssessments.js b/nodeScripts/initialiseAssessments.js index 6a855809d..7352d3cd5 100644 --- a/nodeScripts/initialiseAssessments.js +++ b/nodeScripts/initialiseAssessments.js @@ -12,8 +12,8 @@ const { initialiseAssessments } = initAssessments(config, firebase, db, auth); const main = async () => { return initialiseAssessments({ - exerciseId: 'BpEL3HgHEyHCvDMI5E9s', - applicationId: 's5xUIUNY7imVdNUmM6v0', + exerciseId: 'qsBv15StHEVEp1RY20cS', + applicationId: 'vj0TUX7ufq6UYjYqNZLJ', }); };