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

Jump to bottom

Fixed calcSkillMatch #49

Merged
merged 4 commits into from
Nov 2, 2023
Merged

Fixed calcSkillMatch #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
3fcc942
[SBRP-109] TDD Update on calcSkillMatch
simyanyi Oct 27, 2023
c676772
Merge branch 'main' into SBRP-109-code-cleanup
simyanyi Nov 1, 2023
281dc2c
[SBRP-109] TDD Fix calcSkillMatch
simyanyi Nov 1, 2023
774930a
[SBRP-109] Fix calcSkillMatch
simyanyi Nov 1, 2023
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
22 changes: 10 additions & 12 deletions client/src/actions/roleListings.test.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,18 +4,16 @@ import {calcSkillMatch} from "./roleListings";
// create a test script to test the calcSkillMatch function
describe('calcSkillMatch function tests', () => {

it('Should return percentage match of 33%', () => {
const res = [{"rl_id":1,"role_id":1,"rl_desc":"Manages human resources, fostering a positive work environment, handling recruitment, and ensuring compliance with employment laws.","rl_source":1,"rl_open":"2023-09-29T16:00:00.000Z","rl_close":"2023-11-25T16:00:00.000Z","rl_creator":1,"rl_ts_create":"2023-08-01T02:00:00.000Z","location":"Thailand","department":"Human Resources"},{"rl_id":2,"role_id":2,"rl_desc":"Designs and develops technical solutions, contributing to product innovation and solving complex problems.","rl_source":2,"rl_open":"2023-08-25T16:00:00.000Z","rl_close":"2023-11-09T16:00:00.000Z","rl_creator":1,"rl_ts_create":"2023-08-05T01:30:00.000Z","location":"Singapore","department":"IT"},{"rl_id":3,"role_id":5,"rl_desc":"Supports and maintains IT systems, providing technical assistance, troubleshooting, and ensuring smooth operations.","rl_source":7,"rl_open":"2023-09-14T16:00:00.000Z","rl_close":"2023-11-29T16:00:00.000Z","rl_creator":6,"rl_ts_create":"2023-08-10T07:00:00.000Z","location":"Malaysia","department":"IT"},{"rl_id":4,"role_id":2,"rl_desc":"Manage data engineering projects","rl_source":3,"rl_open":"2023-08-13T16:00:00.000Z","rl_close":"2023-08-31T16:00:00.000Z","rl_creator":1,"rl_ts_create":"2023-08-14T00:00:00.000Z","location":"Singapore","department":"Data"},{"rl_id":6,"role_id":3,"rl_desc":"Manage expense tracking and budgeting for 2024","rl_source":3,"rl_open":"2023-10-14T16:00:00.000Z","rl_close":"2023-10-24T16:00:00.000Z","rl_creator":1,"rl_ts_create":null,"location":"Singapore","department":"Finance"}];
const res2 = [{"role_id":1,"role_name":"HR Manager","role_description":"Manage HR department","role_status":"active"},{"role_id":2,"role_name":"Engineering Manager","role_description":"Manage Engineering department","role_status":"active"},{"role_id":3,"role_name":"Finance Staff","role_description":"Work in Finance department","role_status":"inactive"},{"role_id":4,"role_name":"Sales Manager","role_description":"Manage Sales department","role_status":"active"},{"role_id":5,"role_name":"IT Technician","role_description":"Analyze data","role_status":"active"}];
const res3 = [{"role_id":2,"skill_id":1},{"role_id":5,"skill_id":2},{"role_id":1,"skill_id":3},{"role_id":4,"skill_id":3},{"role_id":5,"skill_id":4},{"role_id":2,"skill_id":5},{"role_id":5,"skill_id":5},{"role_id":1,"skill_id":6},{"role_id":2,"skill_id":6},{"role_id":3,"skill_id":6},{"role_id":5,"skill_id":6},{"role_id":3,"skill_id":7},{"role_id":4,"skill_id":8},{"role_id":3,"skill_id":9},{"role_id":1,"skill_id":10},{"role_id":2,"skill_id":11}];
// using staff_id = 3 as test
const res4 = [{"staff_id":3,"skill_id":2,"ss_status":"active"},{"staff_id":3,"skill_id":4,"ss_status":"active"},{"staff_id":3,"skill_id":5,"ss_status":"active"},{"staff_id":3,"skill_id":6,"ss_status":"in-progress"}];
const res6 = [{"skill_id":1,"skill_name":"Java Programming","skill_status":"active"},{"skill_id":2,"skill_name":"Data Analysis","skill_status":"active"},{"skill_id":3,"skill_name":"Communication","skill_status":"active"},{"skill_id":4,"skill_name":"Python Programming","skill_status":"active"},{"skill_id":5,"skill_name":"Data Visualization","skill_status":"active"},{"skill_id":6,"skill_name":"Teamwork","skill_status":"inactive"},{"skill_id":7,"skill_name":"Financial Analysis","skill_status":"active"},{"skill_id":8,"skill_name":"Customer Service","skill_status":"inactive"},{"skill_id":9,"skill_name":"Accounting","skill_status":"active"},{"skill_id":10,"skill_name":"HR management","skill_status":"active"},{"skill_id":11,"skill_name":"C++ Programming","skill_status":"active"}];
const res7 = [{"rl_id":1,"rl_updater":1,"rl_ts_update":"2023-10-13T08:02:37.000Z"},{"rl_id":1,"rl_updater":1,"rl_ts_update":"2023-10-13T08:36:27.000Z"},{"rl_id":1,"rl_updater":1,"rl_ts_update":"2023-10-13T08:37:46.000Z"},{"rl_id":1,"rl_updater":1,"rl_ts_update":"2023-10-13T08:51:43.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:06:15.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:06:44.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:15:30.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:15:42.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:29:32.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:37:08.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:38:01.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:38:12.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:40:23.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:41:06.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:41:55.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:42:16.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:43:06.000Z"},{"rl_id":2,"rl_updater":1,"rl_ts_update":"2023-10-13T06:44:51.000Z"},{"rl_id":2,"rl_updater":6,"rl_ts_update":"2023-10-13T06:44:59.000Z"}];

console.log(res.length);
const result = calcSkillMatch(res, res2, res3, res4, res6, res7);
expect(result[1].skill_match).toBe(33);
it('Should return percentage match of 33%', () => {
// test with rl 2
const rl_details = [{"rl_id":2,"role_id":2,"rl_desc":"Designs and develops technical solutions, contributing to product innovation and solving complex problems.","rl_source":2,"rl_open":"2023-08-25T16:00:00.000Z","rl_close":"2023-11-09T16:00:00.000Z","rl_creator":1,"rl_ts_create":"2023-08-05T01:30:00.000Z","location":"Singapore","department":"IT"}];
const role_skills = [{"role_id":2,"skill_id":1},{"role_id":5,"skill_id":2},{"role_id":1,"skill_id":3},{"role_id":4,"skill_id":3},{"role_id":5,"skill_id":4},{"role_id":2,"skill_id":5},{"role_id":5,"skill_id":5},{"role_id":1,"skill_id":6},{"role_id":2,"skill_id":6},{"role_id":3,"skill_id":6},{"role_id":5,"skill_id":6},{"role_id":3,"skill_id":7},{"role_id":4,"skill_id":8},{"role_id":3,"skill_id":9},{"role_id":1,"skill_id":10},{"role_id":2,"skill_id":11}];

// test with staff 3
const staff_skills = [{"staff_id":3,"skill_id":2,"ss_status":"active"},{"staff_id":3,"skill_id":4,"ss_status":"active"},{"staff_id":3,"skill_id":5,"ss_status":"active"},{"staff_id":3,"skill_id":6,"ss_status":"in-progress"}];
const skill_details = [{"skill_id":1,"skill_name":"Java Programming","skill_status":"active"},{"skill_id":2,"skill_name":"Data Analysis","skill_status":"active"},{"skill_id":3,"skill_name":"Communication","skill_status":"active"},{"skill_id":4,"skill_name":"Python Programming","skill_status":"active"},{"skill_id":5,"skill_name":"Data Visualization","skill_status":"active"},{"skill_id":6,"skill_name":"Teamwork","skill_status":"inactive"},{"skill_id":7,"skill_name":"Financial Analysis","skill_status":"active"},{"skill_id":8,"skill_name":"Customer Service","skill_status":"inactive"},{"skill_id":9,"skill_name":"Accounting","skill_status":"active"},{"skill_id":10,"skill_name":"HR management","skill_status":"active"},{"skill_id":11,"skill_name":"C++ Programming","skill_status":"active"}];
const result = calcSkillMatch(rl_details[0], role_skills, staff_skills, skill_details);
expect(result).toBe(33);
})
})

Expand Down
97 changes: 50 additions & 47 deletions client/src/actions/roleListings.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,56 +25,37 @@ import {
// res4: get skill_id and ss_status from staff_id
// res6: check skill status from skill_id

export const calcSkillMatch = (rl_details: any, role_details: any, role_skills: any, staff_skills: any, skill_details: any, updater_details: any) => {
// get skill match percentage for each role listing
console.log(rl_details)

for (let i = 0; i < rl_details.length; i++) {
let skillMatch = 0;
let skillCount = 0;
for (let j = 0; j < role_skills.length; j++) {
// get role id
if (rl_details[i]["role_id"] === role_skills[j]["role_id"]) {
// check role skill status
for (let k = 0; k < skill_details.length; k++) {
if (role_skills[j]["skill_id"] === skill_details[k]["skill_id"]) {
if (skill_details[k]["skill_status"] === "active") {
skillCount++;
for (let l = 0; l < staff_skills.length; l++) {
if (role_skills[j]["skill_id"] === staff_skills[l]["skill_id"]) {
// check staff skill status
if (staff_skills[l]["ss_status"] === "active") {
skillMatch++;
}
export const calcSkillMatch = (rl_details: any, role_skills: any, staff_skills: any, skill_details: any) => {
// input is 1 rl's detail, all role skills, 1 staff's skills, all skill details
let final = 0;
let skillMatch = 0;
let skillCount = 0;
for (let i = 0; i < role_skills.length; i++) {
// get role skills
if (rl_details.role_id === role_skills[i]["role_id"]) {
// check role skill status
for (let j = 0; j < skill_details.length; j++) {
if (role_skills[i]["skill_id"] === skill_details[j]["skill_id"]) {
if (skill_details[j]["skill_status"] === "active") {
skillCount++;
// iterate through 1 staff's skills
for (let k = 0; k < staff_skills.length; k++) {
if (role_skills[i]["skill_id"] === staff_skills[k]["skill_id"]) {
// check staff skill status
if (staff_skills[k]["ss_status"] === "active") {
skillMatch++;
}
}

}
}
}
}
}
rl_details[i].skill_match = Math.round(skillMatch / skillCount * 100);

for (let j = 0; j < role_details.length; j++) {
if (rl_details[i]["role_id"] === role_details[j]["role_id"]) {
rl_details[i].role_name = role_details[j].role_name;
rl_details[i].role_description = role_details[j].role_description;
rl_details[i].role_status = role_details[j].role_status;
}
}

for (let j = 0; j < updater_details.length; j++) {
for (let i = 0; i < rl_details.length; i++) {
if (updater_details[j]["rl_id"] === rl_details[i]["rl_id"]) {
// will keeo overridding the previous updater name and time until the last one
rl_details[i].rl_updater_id = updater_details[j]["rl_updater"];
rl_details[i].update_time = updater_details[j]["rl_ts_update"];
}
}
}
}
}
return rl_details;
// round to nearest whole numnber
final = Math.round((skillMatch / skillCount) * 100);
return final;
}


Expand All @@ -90,22 +71,43 @@ export const getRoleListings = (id: number) => async (dispatch: (action: ActionT

const date = new Date();


// add role list start and end date to res.data
for (let i = 0; i < res.data.length; i++) {
if (date > new Date(res.data[i]["rl_close"])) {
res.data[i].rl_status = "Closed";
} else {
res.data[i].rl_status = "Open";
}
// add role name, description, and role status to res.data
for (let j = 0; j < res2.data.length; j++) {
if (res.data[i]["role_id"] === res2.data[j]["role_id"]) {
res.data[i].role_name = res2.data[j].role_name;
res.data[i].role_description = res2.data[j].role_description;
res.data[i].role_status = res2.data[j].role_status;
}
}
}
// add updater id, and update time to res.data
for (let j = 0; j < updaterRes.data.length; j++) {
for (let i = 0; i < res.data.length; i++) {
if (updaterRes.data[j]["rl_id"] === res.data[i]["rl_id"]) {
// will keep overridding the previous updater name and time until the last one
res.data[i].rl_updater_id = updaterRes.data[j]["rl_updater"];
res.data[i].update_time = updaterRes.data[j]["rl_ts_update"];
}
}
}

const rl_details = res.data;
const role_details = res2.data;
// const rl_details = res.data;
const role_skills = res3.data;
const staff_skills = res4.data;
const skill_details = res6.data;
const updater_details = updaterRes.data;
res.data = calcSkillMatch(rl_details, role_details, role_skills, staff_skills, skill_details, updater_details);

// add skillmatch to res.data
for (let i = 0; i < res.data.length; i++) {
res.data[i].skill_match = calcSkillMatch(res.data[i], role_skills, staff_skills, skill_details);
}


// application count
for (let i = 0; i < res.data.length; i++) {
Expand All @@ -129,6 +131,7 @@ export const getRoleListings = (id: number) => async (dispatch: (action: ActionT
});
}
}


export const getRoleListing = (id: number) => async (dispatch: (action: ActionType) => void) => {
try {
Expand Down