Skip to content

Commit

Permalink
Merge pull request #452 from ubc-biztech/master
Browse files Browse the repository at this point in the history
Merge master to dev
  • Loading branch information
voctory authored Jan 25, 2025
2 parents a621395 + d3c9742 commit 83228af
Show file tree
Hide file tree
Showing 2 changed files with 28 additions and 12 deletions.
29 changes: 23 additions & 6 deletions services/interactions/constants.js
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
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

0 comments on commit 83228af

Please sign in to comment.