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.

Sign up for GitHub

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

Merge master to dev #452

Merged
merged 3 commits into from
Jan 25, 2025
Merged

Merge master to dev #452

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4359028
fix
kevinxiao27 Jan 25, 2025
4717de3
Merge pull request #451 from ubc-biztech/fix-master
voctory Jan 25, 2025
d3c9742
Update BigTech booth scanning IDs
voctory Jan 25, 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
29 changes: 23 additions & 6 deletions services/interactions/constants.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,16 +20,33 @@ export const WORKSHOP_TWO = "WORKSHOP_TWO";
export const WORKSHOP_TWO_PARTICIPANT = "WORKSHOP_TWO_PARTICIPANT";

export const BIGTECH = [
"amazon",
"aws",
"spotify",
"meta",
"axonify",
"centrefordigitalmedia",
"deloitte",
"electronicarts",
"google",
"slack",
"googlecloud",
"amazon",
"stripe",
"instacart",
"kpmg",
"linusmediagroup",
"mastercard",
"mckinseycompany",
"meta",
"microsoft",
"perplexity"
"oracle",
"pwc",
"rbc",
"samsungelectronics",
"sap",
"shopify",
"slack",
"spotify",
"stripe",
"telus",
"vancity",
"wealthsimple"
];
export const STARTUPS = [
"futurpreneur",
Expand Down
11 changes: 5 additions & 6 deletions services/interactions/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,16 @@ export const handleConnection = async (userID, connID, timestamp) => {
});
}

let profileID =
connProfileData.type === PARTNER
? connProfileData.email
: connProfileData.registrationID;
let profileID = connProfileData.email
? connProfileData.email
: connProfileData.registrationID;

console.log(profileID);

let connData = await db.getOne(profileID, PROFILES_TABLE, {
"eventID;year": CURRENT_EVENT
});

console.log(connData);

if (await isDuplicateRequest(userData.id, connID)) {
return handlerHelpers.createResponse(400, {
message: "Connection has already been made"
Expand Down
Loading