Skip to content

Graduation year #6

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

Open
sethgaglione wants to merge 2 commits into
base: develop
Choose a base branch
from
Open

Graduation year #6

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5a4685d
Added graduation years
sethgaglione Jul 16, 2020
4c88378
Added Graduation Years
sethgaglione Jul 16, 2020
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
72 changes: 38 additions & 34 deletions models/Metric.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,45 +7,49 @@ const Metric = {
type: Relationship,
ref: 'Year',
},
hackers: { type: Integer },
projects: { type: Integer },
hackers: { type: Integer },
projects: { type: Integer },
majors: {
type: Relationship,
ref: 'Major',
many: true,
},
gender_F: { type: Integer },
gender_M: { type: Integer },
gender_NB: { type: Integer },
gender_N: { type: Integer },
race_WC: { type: Integer },
race_API: { type: Integer },
race_H: { type: Integer },
race_BAA: { type: Integer },
race_AIAN: { type: Integer },
race_N: { type: Integer },
levelOfStudy_HS: { type: Integer },
levelOfStudy_TS: { type: Integer },
levelOfStudy_UU: { type: Integer },
levelOfStudy_GU: { type: Integer },
levelOfStudy_N: { type: Integer },
diet_VT: { type: Integer },
diet_VE: { type: Integer },
diet_L: { type: Integer },
diet_G: { type: Integer },
diet_NA: { type: Integer },
diet_H: { type: Integer },
diet_K: { type: Integer },
diet_O: { type: Integer },
diet_N: { type: Integer },
shirt_XS: { type: Integer },
shirt_S: { type: Integer },
shirt_M: { type: Integer },
shirt_L: { type: Integer },
shirt_XL: { type: Integer },
shirt_XXL: { type: Integer },
firstTimeHackers: { type: Integer },
uniqueHackers: { type: Text },
gender_F: { type: Integer },
gender_M: { type: Integer },
gender_NB: { type: Integer },
gender_N: { type: Integer },
race_WC: { type: Integer },
race_API: { type: Integer },
race_H: { type: Integer },
race_BAA: { type: Integer },
race_AIAN: { type: Integer },
race_N: { type: Integer },
levelOfStudy_HS: { type: Integer },
levelOfStudy_TS: { type: Integer },
levelOfStudy_UU: { type: Integer },
levelOfStudy_GU: { type: Integer },
levelOfStudy_N: { type: Integer },
diet_VT: { type: Integer },
diet_VE: { type: Integer },
diet_L: { type: Integer },
diet_G: { type: Integer },
diet_NA: { type: Integer },
diet_H: { type: Integer },
diet_K: { type: Integer },
diet_O: { type: Integer },
diet_N: { type: Integer },
shirt_XS: { type: Integer },
shirt_S: { type: Integer },
shirt_M: { type: Integer },
shirt_L: { type: Integer },
shirt_XL: { type: Integer },
shirt_XXL: { type: Integer },
graduationYear_Freshman: { type: Integer },
graduationYear_Sophomore: { type: Integer },
graduationYear_Junior: { type: Integer },
graduationYear_Senior: { type: Integer },
firstTimeHackers: { type: Integer },
uniqueHackers: { type: Text },
},
};

Expand Down
1 change: 1 addition & 0 deletions resolvers/uploadYear.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,6 +68,7 @@ const uploadYear = async (_, { year, projects, data }) => {
helpers.populateIndependents(metrics.levelOfStudy, hacker.levelOfStudy);
helpers.populateIndependents(metrics.diet, hacker.diet);
helpers.populateIndependents(metrics.shirt, hacker.shirt);
helpers.populateGraduationYear(metrics, hacker, year);
});

// eslint-disable-next-line no-console
Expand Down
27 changes: 26 additions & 1 deletion resolvers/utils/helpers.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -106,4 +106,29 @@ function populateMajors(metrics, hacker) {
}
}

module.exports = { populateIndependents, populateFirstTimeHackers, populateMajors };
/**
* Called for each individual hacker to update graduation year values
*
* @param {object} metrics
* @param {object} hacker
* @param {object} year
*/
function populateGraduationYear(metrics, hacker, year) {
//Check to see if there is a graduation year
//Also check to see if hacker is an undergraduate or in techschool
if (hacker.graduation &&
hacker.levelOfStudy === "Undergraduate University" ||
hacker.levelOfStudy === "Tech School") {
if (+year + +3 === +hacker.graduation) {
Copy link
Contributor

@s-fletcher s-fletcher Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is +year just parsing it into an integer? I've seen that in your code and never really understood it.

metrics.graduationYear.freshman++;
} else if (+year + +2 === +hacker.graduation) {
metrics.graduationYear.sophomore++;
} else if (+year + +1 === +hacker.graduation) {
metrics.graduationYear.junior++;
} else if (+year === +hacker.graduation) {
metrics.graduationYear.senior++;
}
}
}

module.exports = { populateIndependents, populateFirstTimeHackers, populateMajors, populateGraduationYear };
6 changes: 6 additions & 0 deletions resolvers/utils/metricsTemplate.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,12 @@ const metricsTemplate = {
'trades': [],
'other': [],
},
graduationYear: {
Copy link
Contributor

@s-fletcher s-fletcher Jul 16, 2020

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

🔥

'freshman': 0,
'sophomore': 0,
'junior': 0,
'senior': 0,
},
};

module.exports = metricsTemplate;