Skip to content

Commit

Permalink
Merge pull request #430 from ubc-biztech/eslint-rule-udpate
Browse files Browse the repository at this point in the history
Eslint Rule Update
  • Loading branch information
kevinxiao27 authored Jan 13, 2025
2 parents 4b714b7 + 2ee4d39 commit 9077115
Show file tree
Hide file tree
Showing 3 changed files with 126 additions and 89 deletions.
1 change: 1 addition & 0 deletions .eslintrc.json
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,7 @@
"array-bracket-newline": ["warn", "consistent"],
"eol-last": ["warn", "always"],
"indent": ["warn", 2],
"no-fallthrough": "warn",
"no-prototype-builtins": "off",
"no-trailing-spaces": ["warn", { "ignoreComments": true }],
"no-unused-vars": ["warn"],
Expand Down
56 changes: 34 additions & 22 deletions services/interactions/handler.js
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,15 @@ import db from "../../lib/db";
import docClient from "../../lib/docClient";
import handlerHelpers from "../../lib/handlerHelpers";
import helpers from "../../lib/handlerHelpers";
import { CURRENT_EVENT } from "./constants";
import { handleBooth, handleConnection, handleWorkshop } from "./helpers";
import { QueryCommand } from "@aws-sdk/lib-dynamodb";
import {
CURRENT_EVENT
} from "./constants";
import {
handleBooth, handleConnection, handleWorkshop
} from "./helpers";
import {
QueryCommand
} from "@aws-sdk/lib-dynamodb";

const CONNECTION = "CONNECTION";
const WORK = "WORKSHOP";
Expand Down Expand Up @@ -37,27 +43,29 @@ export const postInteraction = async (event, ctx, callback) => {
}

const timestamp = new Date().getTime();
const { userID, eventType, eventParam } = data;
const {
userID, eventType, eventParam
} = data;

let response;

switch (eventType) {
case CONNECTION:
response = await handleConnection(userID, eventParam, timestamp);
break;

case WORK:
response = await handleWorkshop(userID, eventParam, timestamp);
break;

case BOOTH:
response = await handleBooth(userID, eventParam, timestamp);
break;

default:
throw handlerHelpers.createResponse(400, {
message: "interactionType argument does not match known case"
});
case CONNECTION:
response = await handleConnection(userID, eventParam, timestamp);
break;

case WORK:
response = await handleWorkshop(userID, eventParam, timestamp);
break;

case BOOTH:
response = await handleBooth(userID, eventParam, timestamp);
break;

default:
throw handlerHelpers.createResponse(400, {
message: "interactionType argument does not match known case"
});
}

callback(null, response);
Expand All @@ -78,7 +86,9 @@ export const getAllConnections = async (event, ctx, callback) => {

const userID = event.pathParameters.id;

const { data: profileData } = await db.getOne(userID, QRS_TABLE, {
const {
data: profileData
} = await db.getOne(userID, QRS_TABLE, {
"eventID;year": CURRENT_EVENT
});

Expand Down Expand Up @@ -117,7 +127,9 @@ export const getAllQuests = async (event, ctx, callback) => {

const userID = event.pathParameters.id;

const { data: profileData } = await db.getOne(userID, QRS_TABLE, {
const {
data: profileData
} = await db.getOne(userID, QRS_TABLE, {
"eventID;year": CURRENT_EVENT
});

Expand Down
158 changes: 91 additions & 67 deletions services/interactions/helpers.js
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
import { QueryCommand, UpdateCommand } from "@aws-sdk/lib-dynamodb";
import {
QueryCommand, UpdateCommand
} from "@aws-sdk/lib-dynamodb";
import {
QRS_TABLE,
CONNECTIONS_TABLE,
Expand Down Expand Up @@ -48,8 +50,12 @@ export const handleConnection = async (userID, connID, timestamp) => {
});
}

let { data: userData, type: userType } = profileData;
let { data: connData, type: connType } = connProfileData;
let {
data: userData, type: userType
} = profileData;
let {
data: connData, type: connType
} = connProfileData;

if (await isDuplicateRequest(userData.registrationID, connID)) {
return handlerHelpers.createResponse(400, {
Expand All @@ -75,39 +81,46 @@ export const handleConnection = async (userID, connID, timestamp) => {
createdAt: timestamp,
...(connData.linkedinURL
? {
linkedinURL: connData.linkedinURL
}
: {}),
linkedinURL: connData.linkedinURL
}
: {
}),
...(connData.fname
? {
fname: connData.fname
}
: {}),
fname: connData.fname
}
: {
}),
...(connData.lname
? {
lname: connData.lname
}
: {}),
lname: connData.lname
}
: {
}),
...(connData.major
? {
major: connData.major
}
: {}),
major: connData.major
}
: {
}),
...(connData.year
? {
year: connData.year
}
: {}),
year: connData.year
}
: {
}),
...(connData.company
? {
company: connData.company
}
: {}),
company: connData.company
}
: {
}),
...(connData.title
? {
title: connData.title
}
: {})
title: connData.title
}
: {
})
};

const connPut = {
Expand All @@ -117,66 +130,73 @@ export const handleConnection = async (userID, connID, timestamp) => {
createdAt: timestamp,
...(userData.linkedinURL
? {
linkedinURL: userData.linkedinURL
}
: {}),
linkedinURL: userData.linkedinURL
}
: {
}),
...(userData.fname
? {
fname: userData.fname
}
: {}),
fname: userData.fname
}
: {
}),
...(userData.lname
? {
lname: userData.lname
}
: {}),
lname: userData.lname
}
: {
}),
...(userData.major
? {
major: userData.major
}
: {}),
major: userData.major
}
: {
}),
...(userData.year
? {
year: userData.year
}
: {}),
year: userData.year
}
: {
}),
...(userData.company
? {
company: userData.company
}
: {}),
company: userData.company
}
: {
}),
...(userData.title
? {
title: userData.title
}
: {})
title: userData.title
}
: {
})
};

const promises = [];
switch (connType) {
case EXEC + EXEC:
promises.push(
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_EXEC_H)
);
case EXEC + EXEC:
promises.push(
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_EXEC_H)
);

case EXEC:
promises.push(
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_EXEC_H)
);
case EXEC:
promises.push(
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_EXEC_H)
);

// case ATTENDEE:
default:
promises.push(
db.put(connPut, CONNECTIONS_TABLE, true),
db.put(userPut, CONNECTIONS_TABLE, true),
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_ONE),
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_FOUR),
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_TEN_H),
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_ONE),
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_FOUR),
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_TEN_H)
);
break;
default:
promises.push(
db.put(connPut, CONNECTIONS_TABLE, true),
db.put(userPut, CONNECTIONS_TABLE, true),
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_ONE),
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_FOUR),
incrementQuestProgress(userData.registrationID, QUEST_CONNECT_TEN_H),
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_ONE),
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_FOUR),
incrementQuestProgress(connData.registrationID, QUEST_CONNECT_TEN_H)
);
break;
}

try {
Expand Down Expand Up @@ -216,7 +236,9 @@ const isDuplicateRequest = async (userID, connID) => {
};

export const handleWorkshop = async (profileID, workshopID, timestamp) => {
const { data } = await db.getOne(profileID, QRS_TABLE, {
const {
data
} = await db.getOne(profileID, QRS_TABLE, {
"eventID;year": CURRENT_EVENT
});

Expand All @@ -240,7 +262,9 @@ export const handleWorkshop = async (profileID, workshopID, timestamp) => {
};

export const handleBooth = async (profileID, boothID, timestamp) => {
const { data } = await db.getOne(profileID, QRS_TABLE, {
const {
data
} = await db.getOne(profileID, QRS_TABLE, {
"eventID;year": CURRENT_EVENT
});

Expand Down

0 comments on commit 9077115

Please sign in to comment.