Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Stage -> Prod Sync (January 2025 Release) #730

Merged
merged 71 commits into from
Jan 29, 2025
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
71 commits
Select commit Hold shift + click to select a range
974b0b4
In-progress
amber-emmes Aug 22, 2024
1c96446
Merge branch 'dev' into mocha-testing
amber-emmes Sep 10, 2024
6e6a608
WIP: Additional tests added, functions tested directly
amber-emmes Sep 24, 2024
b1c785c
Merge branch 'dev' into mocha-testing
amber-emmes Sep 25, 2024
3981450
WIP
amber-emmes Sep 27, 2024
d821762
Merge branch 'dev' into mocha-testing
amber-emmes Sep 30, 2024
c82ce13
WIP
amber-emmes Oct 7, 2024
d0bdb70
Successful oauth token generation
amber-emmes Oct 9, 2024
304650e
Merge branch 'dev' into mocha-testing
amber-emmes Nov 27, 2024
ed38ca4
WIP: working through checkDerivedVariables tests
amber-emmes Dec 18, 2024
cd4a4f0
refactor
anthonypetersen Dec 30, 2024
5ee1dbe
Merge pull request #709 from NCI-C4CP/error-update
anthonypetersen Dec 30, 2024
052e73f
Merge branch 'dev' into mocha-testing
amber-emmes Jan 2, 2025
d95cd66
Fixed sn issue where checkDerivedVariables was not appropriately awai…
amber-emmes Jan 6, 2025
110dba8
Merge pull request #710 from NCI-C4CP/1185-fix
amber-emmes Jan 6, 2025
1cbaa10
updateParticipantData API - update error scopes
JoeArmani Jan 9, 2025
df571e3
Merge pull request #713 from NCI-C4CP/updateParticipantData-error-scope
JoeArmani Jan 9, 2025
c14fa0e
code updates
anthonypetersen Jan 14, 2025
dc0eafa
updates
anthonypetersen Jan 14, 2025
b47f354
Merge pull request #717 from NCI-C4CP/code-scanning-1
anthonypetersen Jan 14, 2025
eab13b1
Merge pull request #718 from NCI-C4CP/dev
anthonypetersen Jan 14, 2025
07c9c1b
Revert "Dev -> Stage Sync (Code Scan Fix)"
anthonypetersen Jan 14, 2025
ac91a99
Merge pull request #719 from NCI-C4CP/revert-718-dev
anthonypetersen Jan 14, 2025
d92c7dc
updates
anthonypetersen Jan 14, 2025
ffec9c6
trying to fix code scan error
anthonypetersen Jan 14, 2025
658c35e
trying to fix code scan error
anthonypetersen Jan 14, 2025
50b7764
WIP
amber-emmes Jan 15, 2025
bf6f757
Merge branch 'dev' into mocha-testing
amber-emmes Jan 15, 2025
9142fc1
Tests now cleaned up and in runnable form with instructions; 1062 and…
amber-emmes Jan 16, 2025
8b0fb9e
User reset now preserves PO box and physical address info
amber-emmes Jan 16, 2025
3d00094
Console log removed
amber-emmes Jan 16, 2025
d9181ec
Uncommented code in notification.js inadvertently committed
amber-emmes Jan 16, 2025
25f616c
Addressed comments
amber-emmes Jan 17, 2025
1d8bcf4
Merge pull request #720 from NCI-C4CP/mocha-testing
amber-emmes Jan 17, 2025
48320fe
Update first sign in timestamp and sign-up handling
JoeArmani Jan 17, 2025
a9df300
fix comment typos
JoeArmani Jan 17, 2025
5071095
updates
anthonypetersen Jan 21, 2025
ffefa34
add await to endpoints
JoeArmani Jan 21, 2025
5305b75
Merge pull request #721 from NCI-C4CP/pins-tokens-sign-in-time
JoeArmani Jan 21, 2025
65d9c88
undo
anthonypetersen Jan 21, 2025
75ab6c3
update query
anthonypetersen Jan 22, 2025
9c8e03a
modularized
anthonypetersen Jan 22, 2025
59b1359
Merge pull request #716 from NCI-C4CP/roi-pipeline
anthonypetersen Jan 22, 2025
82695f1
bug
anthonypetersen Jan 22, 2025
7b72d3b
Merge pull request #722 from NCI-C4CP/roi-pipeline
anthonypetersen Jan 22, 2025
8fb0929
updates
anthonypetersen Jan 22, 2025
623f761
Merge pull request #723 from NCI-C4CP/roi-pipeline
anthonypetersen Jan 22, 2025
16d7683
debug
anthonypetersen Jan 22, 2025
54a070d
Merge pull request #724 from NCI-C4CP/roi-pipeline
anthonypetersen Jan 22, 2025
514f308
debug
anthonypetersen Jan 22, 2025
83bcb84
testing
anthonypetersen Jan 22, 2025
a67ab48
undo
anthonypetersen Jan 22, 2025
83be28c
moving return
anthonypetersen Jan 22, 2025
0a59631
dev
anthonypetersen Jan 22, 2025
8e62041
debug
anthonypetersen Jan 22, 2025
f79c8c0
moving ret
anthonypetersen Jan 22, 2025
c6b0ff3
update
anthonypetersen Jan 22, 2025
d474c76
removing / updating console logs
anthonypetersen Jan 23, 2025
45eea69
Add a route to get the physical activity report
bransteitterbr Jan 23, 2025
0328629
Merge branch 'dev' into roi-physact
bransteitterbr Jan 23, 2025
2bf73fa
Prevents overwriting of additional biospecimen-related keys on partic…
amber-emmes Jan 23, 2025
66e7159
Home mouthwash kit now defaults to physical address if provided at al…
amber-emmes Jan 23, 2025
9f7b91d
Merge pull request #726 from NCI-C4CP/1062-followup
amber-emmes Jan 23, 2025
4d06937
Removed functions.config call
amber-emmes Jan 23, 2025
6c91c17
Removed testing code
bransteitterbr Jan 23, 2025
e59181c
Merge pull request #727 from NCI-C4CP/1174-followup
amber-emmes Jan 23, 2025
dce028f
Changed error messages per 1067 clarifications
amber-emmes Jan 23, 2025
cdca13d
Merge pull request #728 from NCI-C4CP/1067-followup
amber-emmes Jan 23, 2025
9fbef47
Merge pull request #725 from NCI-C4CP/roi-physact
bransteitterbr Jan 24, 2025
6baaf08
Merge branch 'stage' into dev
anthonypetersen Jan 27, 2025
5715d5f
Merge pull request #729 from NCI-C4CP/dev
anthonypetersen Jan 27, 2025
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
30 changes: 30 additions & 0 deletions config/dev/physicalActivityROI.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
steps:

- name: 'gcr.io/cloud-builders/gcloud'
args: [
'functions',
'deploy',
'physicalActivityROI',
'--trigger-http',
'--runtime=${_RUNTIME}',
'--timeout=${_TIMEOUT}',
'--source=${_SOURCE}',
'--env-vars-file=${_VARIABLES}'
]

- name: 'gcr.io/cloud-builders/gcloud'
args: [
'functions',
'add-iam-policy-binding',
'physicalActivityROI',
'--member=${_MEMBER}',
'--role=${_ROLE}'
]

substitutions:
_SOURCE: https://source.developers.google.com/projects/nih-nci-dceg-connect-dev/repos/github_nci-c4cp_connectfaas/moveable-aliases/dev
_RUNTIME: nodejs20
_ROLE: roles/cloudfunctions.invoker
_TIMEOUT: 120s
_VARIABLES: config/dev/.env.yaml
_MEMBER: allUsers
30 changes: 30 additions & 0 deletions config/prod/physicalActivityROI.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
steps:

- name: 'gcr.io/cloud-builders/gcloud'
args: [
'functions',
'deploy',
'physicalActivityROI',
'--trigger-http',
'--runtime=${_RUNTIME}',
'--timeout=${_TIMEOUT}',
'--source=${_SOURCE}',
'--env-vars-file=${_VARIABLES}'
]

- name: 'gcr.io/cloud-builders/gcloud'
args: [
'functions',
'add-iam-policy-binding',
'physicalActivityROI',
'--member=${_MEMBER}',
'--role=${_ROLE}'
]

substitutions:
_SOURCE: https://source.developers.google.com/projects/nih-nci-dceg-connect-prod-6d04/repos/github_nci-c4cp_connectfaas
_RUNTIME: nodejs20
_ROLE: roles/cloudfunctions.invoker
_TIMEOUT: 120s
_VARIABLES: config/dev/.env.yaml
_MEMBER: allUsers
30 changes: 30 additions & 0 deletions config/stage/physicalActivityROI.yaml
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
steps:

- name: 'gcr.io/cloud-builders/gcloud'
args: [
'functions',
'deploy',
'physicalActivityROI',
'--trigger-http',
'--runtime=${_RUNTIME}',
'--timeout=${_TIMEOUT}',
'--source=${_SOURCE}',
'--env-vars-file=${_VARIABLES}'
]

- name: 'gcr.io/cloud-builders/gcloud'
args: [
'functions',
'add-iam-policy-binding',
'physicalActivityROI',
'--member=${_MEMBER}',
'--role=${_ROLE}'
]

substitutions:
_SOURCE: https://source.developers.google.com/projects/nih-nci-dceg-connect-stg-5519/repos/github_nci-c4cp_connectfaas/moveable-aliases/stage
_RUNTIME: nodejs20
_ROLE: roles/cloudfunctions.invoker
_TIMEOUT: 120s
_VARIABLES: config/dev/.env.yaml
_MEMBER: allUsers
9 changes: 8 additions & 1 deletion index.js
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const {onRequest} = require("firebase-functions/v2/https");
const { getToken } = require('./utils/validation');
const { getToken, validateUsersEmailPhone } = require('./utils/validation');
const { getFilteredParticipants, getParticipants, identifyParticipant } = require('./utils/submission');
const { submitParticipantsData, updateParticipantData, getBigQueryData } = require('./utils/sites');
const { getParticipantNotification, sendScheduledNotifications } = require('./utils/notifications');
Expand All @@ -11,6 +11,7 @@ const { importToBigQuery, firestoreExport, exportNotificationsToBucket, importNo
const { participantDataCleanup } = require('./utils/participantDataCleanup');
const { webhook } = require('./utils/webhook');
const { heartbeat } = require('./utils/heartbeat');
const { physicalActivity } = require('./utils/reports');

// API End-Points for Sites

Expand All @@ -20,6 +21,8 @@ exports.participantsEligibleForIncentive = eligibleForIncentive;

exports.getParticipantToken = getToken;

exports.validateUsersEmailPhone = validateUsersEmailPhone;

exports.getFilteredParticipants = getFilteredParticipants;

exports.getParticipants = getParticipants;
Expand Down Expand Up @@ -76,3 +79,7 @@ exports.webhook = webhook;
// End-Points for Public Heartbeat

exports.heartbeat = heartbeat;

// End-Points for Return of Information

exports.physicalActivity = physicalActivity;
Loading
Loading